@oneuptime/common 10.8.1 → 11.0.0

package/Types/Trace/TraceRecordingRuleDefinition.ts

@@ -6,6 +6,11 @@ import TraceAggregationType from "./TraceAggregationType";
  * match. Each source is aliased (A, B, C, ...) and referenced from the rule's
  * expression string.
  */
+export interface TraceRecordingRuleAttributeFilter {
+  key: string;
+  value: string;
+}
+
 export interface TraceRecordingRuleSource {
   alias: string;
   aggregationType: TraceAggregationType;
@@ -13,8 +18,16 @@ export interface TraceRecordingRuleSource {
   spanNameRegex?: string;
   spanKind?: string;
   onlyErrors?: boolean;
+  /*
+   * Legacy single attribute filter — superseded by `filterAttributes` but
+   * still honored for rules saved before multi-filter support. Use
+   * TraceRecordingRuleDefinitionUtil.getSourceAttributeFilters to read the
+   * combined set.
+   */
   filterAttributeKey?: string;
   filterAttributeValue?: string;
+  // Multiple attribute equality filters — ANDed (e.g. http.route AND url.host).
+  filterAttributes?: Array<TraceRecordingRuleAttributeFilter>;
 }
 
 /*
@@ -78,6 +91,11 @@ export class TraceRecordingRuleDefinitionUtil {
         label: "p50 Duration (s)",
         description: "Median span duration.",
       },
+      {
+        value: TraceAggregationType.P90DurationSeconds,
+        label: "p90 Duration (s)",
+        description: "90th percentile span duration.",
+      },
       {
         value: TraceAggregationType.P95DurationSeconds,
         label: "p95 Duration (s)",
@@ -112,6 +130,38 @@ export class TraceRecordingRuleDefinitionUtil {
     ];
   }
 
+  /*
+   * Combined attribute filters for a source: the multi-filter array plus the
+   * legacy single pair (deduplicated by key, array entries win).
+   */
+  public static getSourceAttributeFilters(
+    source: TraceRecordingRuleSource,
+  ): Array<TraceRecordingRuleAttributeFilter> {
+    const filters: Array<TraceRecordingRuleAttributeFilter> = [];
+    const seenKeys: Set<string> = new Set<string>();
+
+    for (const filter of source.filterAttributes || []) {
+      if (!filter || typeof filter !== "object") {
+        continue;
+      }
+      const key: string = (filter.key || "").trim();
+      const value: string = (filter.value || "").trim();
+      if (!key || !value || seenKeys.has(key)) {
+        continue;
+      }
+      seenKeys.add(key);
+      filters.push({ key, value });
+    }
+
+    const legacyKey: string = (source.filterAttributeKey || "").trim();
+    const legacyValue: string = (source.filterAttributeValue || "").trim();
+    if (legacyKey && legacyValue && !seenKeys.has(legacyKey)) {
+      filters.push({ key: legacyKey, value: legacyValue });
+    }
+
+    return filters;
+  }
+
   public static getNextAlias(
     sources: Array<TraceRecordingRuleSource> | undefined,
   ): string {
@@ -161,6 +211,12 @@ export class TraceRecordingRuleDefinitionUtil {
     const aliases: Set<string> = new Set<string>();
     for (let i: number = 0; i < sources.length; i++) {
       const source: TraceRecordingRuleSource = sources[i]!;
+
+      // Definitions arrive as JSON (deep links, API writes) — never throw.
+      if (!source || typeof source !== "object") {
+        return `Source #${i + 1}: Invalid source.`;
+      }
+
       const prefix: string = `Source ${source.alias || `#${i + 1}`}: `;
 
       if (!source.alias || !ALIAS_REGEX.test(source.alias)) {
@@ -184,6 +240,24 @@ export class TraceRecordingRuleDefinitionUtil {
       if (hasFilterKey !== hasFilterValue) {
         return `${prefix}Attribute filter needs both a key and a value (or leave both empty).`;
       }
+
+      if (
+        source.filterAttributes !== undefined &&
+        !Array.isArray(source.filterAttributes)
+      ) {
+        return `${prefix}Invalid attribute filters.`;
+      }
+
+      for (const filter of source.filterAttributes || []) {
+        if (!filter || typeof filter !== "object") {
+          return `${prefix}Invalid attribute filter row.`;
+        }
+        const hasKey: boolean = Boolean(filter.key?.trim());
+        const hasValue: boolean = Boolean(filter.value?.trim());
+        if (hasKey !== hasValue) {
+          return `${prefix}Attribute filter needs both a key and a value (or remove the row).`;
+        }
+      }
     }
 
     const expression: string = (definition.expression || "").trim();

package/UI/Components/BulkUpdate/BulkLabelActions.tsx

@@ -208,9 +208,9 @@ function useBulkLabelActions<T extends BaseModel>(
    * modal offers only labels that can really be removed instead of every
    * label in the project.
    */
-  const loadLabelsForSelectedItems: (
+  const loadLabelsForSelectedItems: (items: Array<T>) => Promise<void> = async (
     items: Array<T>,
-  ) => Promise<void> = async (items: Array<T>): Promise<void> => {
+  ): Promise<void> => {
     setIsLoadingRemoveLabels(true);
 
     try {
@@ -259,20 +259,20 @@ function useBulkLabelActions<T extends BaseModel>(
         }
       }
 
-      const options: Array<DropdownOption> = Array.from(
-        labelById.values(),
-      ).map((label: Label) => {
-        const option: DropdownOption = {
-          label: label.name || "",
-          value: label._id?.toString() || "",
-        };
+      const options: Array<DropdownOption> = Array.from(labelById.values()).map(
+        (label: Label) => {
+          const option: DropdownOption = {
+            label: label.name || "",
+            value: label._id?.toString() || "",
+          };
 
-        if (label.color) {
-          option.color = label.color;
-        }
+          if (label.color) {
+            option.color = label.color;
+          }
 
-        return option;
-      });
+          return option;
+        },
+      );
 
       options.sort((a: DropdownOption, b: DropdownOption) => {
         return a.label.localeCompare(b.label);

package/UI/Components/Forms/Fields/FormField.tsx

@@ -40,6 +40,7 @@ import Radio, { RadioValue } from "../../Radio/Radio";
 import { BasicRadioButtonOption } from "../../RadioButtons/BasicRadioButtons";
 import HorizontalRule from "../../HorizontalRule/HorizontalRule";
 import MarkdownEditor from "../../Markdown.tsx/MarkdownEditor";
+import useTranslateValue from "../../../Utils/Translation";
 
 export interface ComponentProps<T extends GenericObject> {
   field: Field<T>;
@@ -61,6 +62,11 @@ const FormField: <T extends GenericObject>(
 ) => ReactElement = <T extends GenericObject>(
   props: ComponentProps<T>,
 ): ReactElement => {
+  const { translateString } = useTranslateValue();
+  const translatedPlaceholder: string | undefined = translateString(
+    props.field.placeholder,
+  );
+
   type onChangeFunction = (value: JSONValue) => void;
 
   const onChange: onChangeFunction = (value: JSONValue): void => {
@@ -337,7 +343,7 @@ const FormField: <T extends GenericObject>(
                 (props.field.defaultValue as any) ||
                 undefined
               }
-              placeholder={props.field.placeholder || undefined}
+              placeholder={translatedPlaceholder || undefined}
             />
           )}
 
@@ -351,7 +357,7 @@ const FormField: <T extends GenericObject>(
                 props.setFieldTouched(props.fieldName, true);
               }}
               tabIndex={index}
-              placeholder={props.field.placeholder || ""}
+              placeholder={translatedPlaceholder || ""}
               initialValue={
                 props.currentValues &&
                 (props.currentValues as any)[props.fieldName]
@@ -371,7 +377,7 @@ const FormField: <T extends GenericObject>(
                 props.setFieldTouched(props.fieldName, true);
               }}
               tabIndex={index}
-              placeholder={props.field.placeholder || ""}
+              placeholder={translatedPlaceholder || ""}
               initialValue={
                 props.currentValues &&
                 (props.currentValues as any)[props.fieldName]
@@ -414,7 +420,7 @@ const FormField: <T extends GenericObject>(
                 labelField={props.field.dropdownModal.labelField}
                 valueField={props.field.dropdownModal.valueField}
                 options={props.field.dropdownOptions || []}
-                placeholder={props.field.placeholder || ""}
+                placeholder={translatedPlaceholder || ""}
                 value={
                   props.currentValues &&
                   (props.currentValues as any)[props.fieldName]
@@ -442,7 +448,7 @@ const FormField: <T extends GenericObject>(
                   FormFieldSchemaType.MultiSelectDropdown
                 }
                 options={props.field.dropdownOptions || []}
-                placeholder={props.field.placeholder || ""}
+                placeholder={translatedPlaceholder || ""}
                 value={
                   props.currentValues &&
                   (props.currentValues as any)[props.fieldName]
@@ -585,7 +591,7 @@ const FormField: <T extends GenericObject>(
                   ? (props.currentValues as any)[props.fieldName]
                   : ""
               }
-              placeholder={props.field.placeholder || ""}
+              placeholder={translatedPlaceholder || ""}
             />
           )}
 
@@ -614,7 +620,7 @@ const FormField: <T extends GenericObject>(
                   ? (props.currentValues as any)[props.fieldName]
                   : ""
               }
-              placeholder={props.field.placeholder || ""}
+              placeholder={translatedPlaceholder || ""}
             />
           )}
 
@@ -637,7 +643,7 @@ const FormField: <T extends GenericObject>(
                   ? (props.currentValues as any)[props.fieldName]
                   : ""
               }
-              placeholder={props.field.placeholder || ""}
+              placeholder={translatedPlaceholder || ""}
             />
           )}
 
@@ -660,7 +666,7 @@ const FormField: <T extends GenericObject>(
                   ? (props.currentValues as any)[props.fieldName]
                   : "",
 
-              placeholder: props.field.placeholder || "",
+              placeholder: translatedPlaceholder || "",
             })}
 
           {(props.field.fieldType === FormFieldSchemaType.HTML ||
@@ -684,7 +690,7 @@ const FormField: <T extends GenericObject>(
                   ? (props.currentValues as any)[props.fieldName]
                   : ""
               }
-              placeholder={props.field.placeholder || ""}
+              placeholder={translatedPlaceholder || ""}
             />
           )}
 
@@ -741,7 +747,7 @@ const FormField: <T extends GenericObject>(
                     ? []
                     : undefined
               }
-              placeholder={props.field.placeholder || ""}
+              placeholder={translatedPlaceholder || ""}
             />
           )}
 
@@ -849,7 +855,7 @@ const FormField: <T extends GenericObject>(
                   ? (props.currentValues as any)[props.fieldName]
                   : props.field.defaultValue || ""
               }
-              placeholder={props.field.placeholder || ""}
+              placeholder={translatedPlaceholder || ""}
             />
           )}
         </div>

package/UI/Components/Input/Input.tsx

@@ -1,5 +1,6 @@
 // Tailwind
 import { Logger } from "../../Utils/Logger";
+import useTranslateValue from "../../Utils/Translation";
 import Icon from "../Icon/Icon";
 import OneUptimeDate from "../../../Types/Date";
 import IconProp from "../../../Types/Icon/IconProp";
@@ -46,6 +47,7 @@ export interface ComponentProps {
 const Input: FunctionComponent<ComponentProps> = (
   props: ComponentProps,
 ): ReactElement => {
+  const { translateString } = useTranslateValue();
   let className: string = "";
 
   if (!props.className) {
@@ -199,7 +201,7 @@ const Input: FunctionComponent<ComponentProps> = (
               ? "1"
               : undefined
           }
-          placeholder={props.placeholder}
+          placeholder={translateString(props.placeholder)}
           className={className}
           onBlur={() => {
             if (props.onBlur) {

package/UI/Components/LogsViewer/LogsViewer.tsx

@@ -466,7 +466,7 @@ const LogsViewer: FunctionComponent<ComponentProps> = (
          * Logs without a service.name are tagged with the projectId
          * (ServiceType.Unknown) and have no Service row. Register a
          * synthetic "Unknown Service" keyed by the projectId so the
-         * serviceId -> name resolution and the serviceId facet render
+         * primaryEntityId -> name resolution and the service facet render
          * "Unknown Service" instead of a raw id. Harmless when no logs
          * are unattributed — nothing resolves against it.
          */
@@ -631,17 +631,17 @@ const LogsViewer: FunctionComponent<ComponentProps> = (
 
     // Resolve human-readable service name to UUID if needed
     if (
-      queryFilter["serviceId"] &&
-      typeof queryFilter["serviceId"] === "string"
+      queryFilter["primaryEntityId"] &&
+      typeof queryFilter["primaryEntityId"] === "string"
     ) {
-      const serviceName: string = queryFilter["serviceId"] as string;
+      const serviceName: string = queryFilter["primaryEntityId"] as string;
       const resolvedId: string | undefined = resolveServiceNameToId(
         serviceName,
         serviceMap,
       );
 
       if (resolvedId) {
-        queryFilter["serviceId"] = resolvedId;
+        queryFilter["primaryEntityId"] = resolvedId;
       }
     }
 
@@ -824,7 +824,7 @@ const LogsViewer: FunctionComponent<ComponentProps> = (
     }
 
     return props.activeFilters.map((filter: ActiveFilter): ActiveFilter => {
-      if (filter.facetKey === "serviceId" && serviceMap[filter.value]) {
+      if (filter.facetKey === "primaryEntityId" && serviceMap[filter.value]) {
         const service: Service | undefined = serviceMap[filter.value];
         return {
           ...filter,
@@ -870,7 +870,7 @@ const LogsViewer: FunctionComponent<ComponentProps> = (
   ]);
 
   /*
-   * Replace serviceId UUIDs with human-readable names in value suggestions,
+   * Replace primaryEntityId UUIDs with human-readable names in value suggestions,
    * and merge in the lazily-fetched attribute value suggestions.
    * Must be before early returns to maintain consistent hook call order.
    */
@@ -889,8 +889,11 @@ const LogsViewer: FunctionComponent<ComponentProps> = (
         ...attributeValueSuggestions,
       };
 
-      if (suggestions["serviceId"] && Object.keys(serviceMap).length > 0) {
-        suggestions["serviceId"] = suggestions["serviceId"].map(
+      if (
+        suggestions["primaryEntityId"] &&
+        Object.keys(serviceMap).length > 0
+      ) {
+        suggestions["primaryEntityId"] = suggestions["primaryEntityId"].map(
           (id: string) => {
             const service: Service | undefined = serviceMap[id];
             return service?.name || id;

package/UI/Components/LogsViewer/components/LogDetailsPanel.tsx

@@ -65,7 +65,7 @@ interface ContextLog {
   time: string;
   severity: string;
   body: string;
-  serviceId: string;
+  primaryEntityId: string;
 }
 
 const prepareBody: (body: string | undefined) => PreparedBody = (
@@ -106,7 +106,7 @@ function parseContextRow(row: JSONObject): ContextLog {
     time: String(row["time"] || ""),
     severity: String(row["severityText"] || "Unspecified"),
     body: String(row["body"] || ""),
-    serviceId: String(row["serviceId"] || ""),
+    primaryEntityId: String(row["primaryEntityId"] || ""),
   };
 }
 
@@ -121,9 +121,10 @@ const LogDetailsPanel: FunctionComponent<LogDetailsPanelProps> = (
   const [contextLoaded, setContextLoaded] = useState<boolean>(false);
 
   const variant: "floating" | "embedded" = props.variant || "floating";
-  const serviceId: string = props.log.serviceId?.toString() || "";
-  const service: Service | undefined = props.serviceMap[serviceId];
-  const serviceName: string = service?.name || serviceId || "Unknown service";
+  const primaryEntityId: string = props.log.primaryEntityId?.toString() || "";
+  const service: Service | undefined = props.serviceMap[primaryEntityId];
+  const serviceName: string =
+    service?.name || primaryEntityId || "Unknown service";
   const serviceColor: string =
     (service?.serviceColor && service?.serviceColor.toString()) || "#64748b";
 
@@ -214,7 +215,7 @@ const LogDetailsPanel: FunctionComponent<LogDetailsPanelProps> = (
 
   const loadContext: () => Promise<void> =
     useCallback(async (): Promise<void> => {
-      if (!props.projectId || !serviceId || !props.log.time) {
+      if (!props.projectId || !primaryEntityId || !props.log.time) {
         setContextError("Missing project or service information for context.");
         return;
       }
@@ -230,7 +231,7 @@ const LogDetailsPanel: FunctionComponent<LogDetailsPanelProps> = (
             ),
             data: {
               logId: props.log.getColumnValue("_id")?.toString() || "",
-              serviceId: serviceId,
+              primaryEntityId: primaryEntityId,
               time: props.log.time
                 ? OneUptimeDate.toString(props.log.time)
                 : "",
@@ -260,7 +261,7 @@ const LogDetailsPanel: FunctionComponent<LogDetailsPanelProps> = (
       } finally {
         setContextLoading(false);
       }
-    }, [props.projectId, serviceId, props.log]);
+    }, [props.projectId, primaryEntityId, props.log]);
 
   useEffect(() => {
     if (activeTab === "context" && !contextLoaded && !contextLoading) {
@@ -622,7 +623,7 @@ const LogDetailsPanel: FunctionComponent<LogDetailsPanelProps> = (
                   time: props.log.time ? props.log.time.toString() : "",
                   severity: props.log.severityText?.toString() || "Unspecified",
                   body: props.log.body || "",
-                  serviceId: serviceId,
+                  primaryEntityId: primaryEntityId,
                 },
                 true,
               )}

package/UI/Components/LogsViewer/components/LogSearchBar.tsx

@@ -398,7 +398,7 @@ function extractCurrentWord(value: string): string {
 const FIELD_ALIAS_MAP: Record<string, string> = {
   severity: "severityText",
   level: "severityText",
-  service: "serviceId",
+  service: "primaryEntityId",
   trace: "traceId",
   span: "spanId",
 };

package/UI/Components/LogsViewer/components/LogsAnalyticsView.tsx

@@ -85,7 +85,7 @@ const CHART_COLORS_MUTED: Array<string> = [
 
 const DIMENSION_OPTIONS: Array<{ value: string; label: string }> = [
   { value: "severityText", label: "Severity" },
-  { value: "serviceId", label: "Service" },
+  { value: "primaryEntityId", label: "Service" },
   { value: "traceId", label: "Trace ID" },
   { value: "spanId", label: "Span ID" },
 ];
@@ -372,7 +372,7 @@ const LogsAnalyticsView: FunctionComponent<LogsAnalyticsViewProps> = (
         }
 
         const serviceFilterValues: Set<string> | undefined =
-          props.appliedFacetFilters.get("serviceId");
+          props.appliedFacetFilters.get("primaryEntityId");
 
         if (serviceFilterValues && serviceFilterValues.size > 0) {
           (requestData as Record<string, unknown>)["serviceIds"] =

package/UI/Components/LogsViewer/components/LogsFacetSidebar.tsx

@@ -39,7 +39,7 @@ export interface LogsFacetSidebarProps {
 }
 
 const RESOURCE_FACET_KEYS: ReadonlySet<string> = new Set([
-  "serviceId",
+  "primaryEntityId",
   "hostId",
   "dockerHostId",
   "kubernetesClusterId",
@@ -146,7 +146,7 @@ function buildClusterDisplayMap(
 function getFacetTitle(key: string): string {
   const titleMap: Record<string, string> = {
     severityText: "Severity",
-    serviceId: "Service",
+    primaryEntityId: "Service",
     hostId: "Host",
     dockerHostId: "Docker Host",
     kubernetesClusterId: "Kubernetes Cluster",
@@ -187,7 +187,7 @@ const LogsFacetSidebar: FunctionComponent<LogsFacetSidebarProps> = (
   const facetKeys: Array<string> = useMemo(() => {
     const priorityKeys: Array<string> = [
       "severityText",
-      "serviceId",
+      "primaryEntityId",
       "hostId",
       "dockerHostId",
       "kubernetesClusterId",
@@ -280,7 +280,7 @@ const LogsFacetSidebar: FunctionComponent<LogsFacetSidebarProps> = (
           let valueDisplayMap: Record<string, string> | undefined;
           let valueColorMap: Record<string, string> | undefined;
 
-          if (key === "serviceId") {
+          if (key === "primaryEntityId") {
             valueDisplayMap = serviceDisplayMap;
             valueColorMap = serviceColorMap;
           } else if (key === "hostId") {

package/UI/Components/LogsViewer/components/LogsTable.tsx

@@ -233,10 +233,12 @@ const LogsTable: FunctionComponent<LogsTableProps> = (
           <tbody className="divide-y divide-gray-100">
             {props.logs.map((log: Log, index: number) => {
               const rowId: string = resolveLogIdentifier(log, index);
-              const serviceId: string = log.serviceId?.toString() || "";
-              const service: Service | undefined = props.serviceMap[serviceId];
+              const primaryEntityId: string =
+                log.primaryEntityId?.toString() || "";
+              const service: Service | undefined =
+                props.serviceMap[primaryEntityId];
               const serviceName: string =
-                service?.name || serviceId || "Unknown";
+                service?.name || primaryEntityId || "Unknown";
               const serviceColor: string =
                 (service?.serviceColor && service?.serviceColor.toString()) ||
                 "#94a3b8";