fix: build

osmosis-labs · Aug 13, 2024 · b483989 · b483989
1 parent c0f3f73
commit b483989
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 47 deletions.
diff --git a/packages/web/instrumentation.ts b/packages/web/instrumentation.ts
@@ -1,10 +1,10 @@
 import { registerOTel } from "@vercel/otel";
 
+import { getOpentelemetryServiceName } from "~/utils/service-name";
+
 export function register() {
   registerOTel({
-    serviceName:
-      process.env.NEXT_PUBLIC_VERCEL_URL ??
-      "fallback-osmosis-frontend-service-name",
+    serviceName: getOpentelemetryServiceName(),
     instrumentationConfig: {
       fetch: {
         propagateContextUrls: ["*"],

diff --git a/packages/web/server/api/trpc.ts b/packages/web/server/api/trpc.ts
@@ -4,15 +4,14 @@ import { type CreateNextContextOptions } from "@trpc/server/adapters/next";
 
 import { AssetLists } from "~/config/generated/asset-lists";
 import { ChainList } from "~/config/generated/chain-list";
+import { getOpentelemetryServiceName } from "~/utils/service-name";
 
 /** tRPC context for Next.js endpoints. */
 export const createNextTrpcContext = (_opts: CreateNextContextOptions) => {
   return createInnerTRPCContext({
     assetLists: AssetLists,
     chainList: ChainList,
-    opentelemetryServiceName:
-      process.env.NEXT_PUBLIC_VERCEL_URL ??
-      "fallback-osmosis-frontend-service-name",
+    opentelemetryServiceName: getOpentelemetryServiceName(),
   });
 };
 
@@ -21,8 +20,6 @@ export const createEdgeTrpcContext = (_opts: FetchCreateContextFnOptions) => {
   return createInnerTRPCContext({
     assetLists: AssetLists,
     chainList: ChainList,
-    opentelemetryServiceName:
-      process.env.NEXT_PUBLIC_VERCEL_URL ??
-      "fallback-osmosis-frontend-service-name",
+    opentelemetryServiceName: getOpentelemetryServiceName(),
   });
 };
diff --git a/packages/web/utils/__tests__/sentry-init.spec.ts b/packages/web/utils/__tests__/sentry-init.spec.ts
diff --git a/packages/web/utils/helpers.ts b/packages/web/utils/helpers.ts
@@ -4,6 +4,7 @@ import { createServerSideHelpers } from "@trpc/react-query/server";
 import { AssetLists } from "~/config/generated/asset-lists";
 import { ChainList } from "~/config/generated/chain-list";
 import { appRouter } from "~/server/api/root-router";
+import { getOpentelemetryServiceName } from "~/utils/service-name";
 
 /**
  * tRPC helpers for SSR queries, useful for data prefetching
@@ -13,6 +14,7 @@ export const trpcHelpers = createServerSideHelpers({
   ctx: {
     assetLists: AssetLists,
     chainList: ChainList,
+    opentelemetryServiceName: getOpentelemetryServiceName(),
   },
   transformer: superjson,
 });
diff --git a/packages/web/utils/sentry-init.ts b/packages/web/utils/sentry-init.ts
diff --git a/packages/web/utils/service-name.ts b/packages/web/utils/service-name.ts
@@ -0,0 +1,6 @@
+export function getOpentelemetryServiceName(): string {
+  return (
+    process.env.NEXT_PUBLIC_VERCEL_URL ??
+    "fallback-osmosis-frontend-service-name"
+  );
+}