Concurrency now per project, use env vars

Author: matt-aitken

apps/webapp/app/env.server.ts

@@ -1212,7 +1212,10 @@ const EnvironmentSchema = z
 
     // Query page concurrency limits
     QUERY_DEFAULT_ORG_CONCURRENCY_LIMIT: z.coerce.number().int().default(3),
-    QUERY_GLOBAL_CONCURRENCY_LIMIT: z.coerce.number().int().default(50),
+    QUERY_GLOBAL_CONCURRENCY_LIMIT: z.coerce.number().int().default(100),
+
+    // Metric widget concurrency limits
+    METRIC_WIDGET_DEFAULT_ORG_CONCURRENCY_LIMIT: z.coerce.number().int().default(30),
 
     EVENTS_CLICKHOUSE_URL: z
       .string()

apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query/route.tsx

@@ -1,4 +1,8 @@
-import { redirect, type ActionFunctionArgs, type LoaderFunctionArgs } from "@remix-run/server-runtime";
+import {
+  redirect,
+  type ActionFunctionArgs,
+  type LoaderFunctionArgs,
+} from "@remix-run/server-runtime";
 import { typedjson, useTypedLoaderData } from "remix-typedjson";
 import { z } from "zod";
 import { QueryEditor } from "~/components/query/QueryEditor";
@@ -89,6 +93,7 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
     isImpersonating: user.isImpersonating,
     organizationSlug,
   });
+
   if (!canAccess) {
     return typedjson(
       {

apps/webapp/app/routes/resources.metric.tsx

@@ -12,6 +12,7 @@ import {
 } from "~/components/metrics/QueryWidget";
 import { useElementVisibility } from "~/hooks/useElementVisibility";
 import { useInterval } from "~/hooks/useInterval";
+import { env } from "~/env.server";
 
 const Scope = z.union([z.literal("environment"), z.literal("organization"), z.literal("project")]);
 
@@ -107,7 +108,7 @@ export const action = async ({ request }: ActionFunctionArgs) => {
     taskIdentifiers,
     queues,
     // Set higher concurrency if many widgets are on screen at once
-    customOrgConcurrencyLimit: 15,
+    customOrgConcurrencyLimit: env.METRIC_WIDGET_DEFAULT_ORG_CONCURRENCY_LIMIT,
   });
 
   if (!queryResult.success) {

apps/webapp/app/services/queryService.server.ts

@@ -138,7 +138,7 @@ export async function executeQuery<TOut extends z.ZodSchema>(
 
   // Acquire concurrency slot
   const acquireResult = await queryConcurrencyLimiter.acquire({
-    key: organizationId,
+    key: projectId,
     requestId,
     keyLimit: orgLimit,
     globalLimit: GLOBAL_CONCURRENCY_LIMIT,