@oneuptime/common 12.0.29 → 12.0.31

package/build/dist/Server/Utils/EnterpriseLicense/EnterpriseLicenseSeatUtil.js

@@ -0,0 +1,145 @@
+import BadDataException from "../../../Types/Exception/BadDataException";
+import ObjectID from "../../../Types/ObjectID";
+import EnterpriseLicenseSeatsUtil from "../../../Utils/EnterpriseLicense/EnterpriseLicenseSeats";
+import { IsBillingEnabled, IsEnterpriseEdition } from "../../EnvironmentConfig";
+import GlobalConfigService from "../../Services/GlobalConfigService";
+/*
+ * Enforcement of the enterprise license seat limit on a self-hosted
+ * installation.
+ *
+ * The limit itself is set on oneuptime.com and mirrored into GlobalConfig by
+ * the daily report job (and by validating or refreshing the license by hand).
+ * This is the half that acts on it: it is the only thing standing between a
+ * customer's license terms and an unbounded User table.
+ *
+ * The seat arithmetic lives in Common/Utils/EnterpriseLicense/EnterpriseLicenseSeats
+ * as a pure function; everything here is about reading the license state and
+ * deciding whether the installation is one that enforces at all.
+ */
+export default class EnterpriseLicenseSeatUtil {
+    /*
+     * Whether this process is an installation whose users are governed by an
+     * enterprise license at all.
+     *
+     * Community Edition has no license and no limit. oneuptime.com runs with
+     * billing enabled and bounds seats through subscriptions instead
+     * (TeamMemberService.onBeforeCreate) — enforcing a license limit there as
+     * well would be a second, wrong answer to the same question.
+     */
+    static isSeatLimitEnforceable() {
+        return IsEnterpriseEdition && !IsBillingEnabled;
+    }
+    /*
+     * Seat usage derived from an already-loaded GlobalConfig row. Kept separate
+     * from the loading so a caller that has the row in hand — the license
+     * endpoint, which has just read it — does not read it a second time.
+     *
+     * A null config (a fresh installation whose GlobalConfig has not been seeded
+     * yet) yields no limit, which is the same answer as a licence with no seat
+     * limit set.
+     */
+    static getSeatUsageFromGlobalConfig(data) {
+        const config = data.config;
+        const instances = Array.isArray(config === null || config === void 0 ? void 0 : config.enterpriseLicenseInstances)
+            ? config.enterpriseLicenseInstances
+            : [];
+        return EnterpriseLicenseSeatsUtil.getSeatUsage({
+            userLimit: config === null || config === void 0 ? void 0 : config.enterpriseLicenseUserLimit,
+            localUserCount: data.localUserCount,
+            aggregatedUserCount: config === null || config === void 0 ? void 0 : config.enterpriseLicenseCurrentUserCount,
+            instances: instances,
+            thisInstanceId: (config === null || config === void 0 ? void 0 : config.instanceId) ? config.instanceId.toString() : null,
+        });
+    }
+    /*
+     * Seat usage for this installation right now, or null on an installation
+     * that does not enforce a seat limit.
+     *
+     * Null rather than an unenforced SeatUsage so callers cannot accidentally
+     * present Community Edition with a seat report it has no business having,
+     * and so the user count is never queried there.
+     */
+    static async getSeatUsage(data) {
+        if (!this.isSeatLimitEnforceable()) {
+            return null;
+        }
+        const config = await GlobalConfigService.findOneById({
+            id: ObjectID.getZeroObjectID(),
+            select: {
+                enterpriseLicenseUserLimit: true,
+                enterpriseLicenseCurrentUserCount: true,
+                enterpriseLicenseInstances: true,
+                instanceId: true,
+            },
+            props: {
+                isRoot: true,
+            },
+        });
+        return this.getSeatUsageForLoadedGlobalConfig({
+            config: config,
+            getLocalUserCount: data.getLocalUserCount,
+        });
+    }
+    /*
+     * The same answer as getSeatUsage, for a caller that has already loaded the
+     * GlobalConfig row (the license endpoint reads it to build its response, and
+     * reading it twice per request would be silly).
+     *
+     * The row must have been selected with enterpriseLicenseUserLimit,
+     * enterpriseLicenseCurrentUserCount, enterpriseLicenseInstances and
+     * instanceId, or the numbers here are a fiction built from missing columns.
+     */
+    static async getSeatUsageForLoadedGlobalConfig(data) {
+        if (!this.isSeatLimitEnforceable()) {
+            return null;
+        }
+        /*
+         * The seat limit is read before the users are counted, and the count is
+         * skipped entirely when there is no limit. An unlimited licence is the
+         * common case on a large installation, and that is exactly the
+         * installation where counting the User table on every user creation would
+         * be worth avoiding.
+         */
+        const withoutLocalUsers = this.getSeatUsageFromGlobalConfig({
+            config: data.config,
+            localUserCount: 0,
+        });
+        if (!withoutLocalUsers.isEnforced) {
+            return withoutLocalUsers;
+        }
+        return this.getSeatUsageFromGlobalConfig({
+            config: data.config,
+            localUserCount: await data.getLocalUserCount(),
+        });
+    }
+    /*
+     * Throws if this installation cannot take another user.
+     *
+     * Called from UserService.onBeforeCreate, which every path that creates a
+     * user goes through — team invitations, self-service signup, SSO and OIDC
+     * just-in-time provisioning, SCIM, and the Admin Dashboard. Enforcing on the
+     * User row rather than on the invitation is what makes that true: a seat is
+     * consumed by a person existing on the installation, not by the particular
+     * door they came through.
+     *
+     * It is also why this deliberately does NOT exempt root/internal writes.
+     * Team invitations create the invited user with `isRoot: true`, so an
+     * isRoot escape hatch here would exempt the single most important path.
+     */
+    static async assertSeatAvailableForNewUser(data) {
+        const seatUsage = await this.getSeatUsage({
+            getLocalUserCount: data.getLocalUserCount,
+        });
+        if (!seatUsage || !seatUsage.isEnforced) {
+            return;
+        }
+        if (seatUsage.hasSeatForNewUser) {
+            return;
+        }
+        throw new BadDataException(EnterpriseLicenseSeatsUtil.getSeatLimitReachedMessage({
+            seatsInUse: seatUsage.seatsInUse,
+            userLimit: seatUsage.userLimit,
+        }));
+    }
+}
+//# sourceMappingURL=EnterpriseLicenseSeatUtil.js.map

package/build/dist/Server/Utils/EnterpriseLicense/EnterpriseLicenseSeatUtil.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EnterpriseLicenseSeatUtil.js","sourceRoot":"","sources":["../../../../../Server/Utils/EnterpriseLicense/EnterpriseLicenseSeatUtil.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Utils/Monitor/CapturedMetricAttributeUtil.js

@@ -0,0 +1,201 @@
+import { AllResourceIdentityLabelKeys } from "./SeriesResourceLabels";
+/*
+ * ---------------------------------------------------------------------------
+ * Attributes a monitor SCRIPT chose, on their way into ClickHouse
+ * ---------------------------------------------------------------------------
+ *
+ * Custom code and synthetic monitors let a user's script name its own metric
+ * dimensions:
+ *
+ *   oneuptime.captureMetric("api.queue.depth", 12, { region: "us-east-1" })
+ *
+ * Everything else that writes a metric row picks its own attribute keys from a
+ * fixed vocabulary. This is the one writer where the KEY is user input, so it
+ * is the one writer that needs a guard, and this module is it.
+ *
+ * Two classes of key are refused.
+ *
+ *  1. RESOURCE IDENTITY. A metric row is not just a datapoint — it is a claim
+ *     about which resource the datapoint describes. `SeriesResourceLabels`
+ *     lists the attribute names that carry that claim (`service.name`,
+ *     `oneuptime.host.id`, `k8s.cluster.name`, ...), and the consumers take
+ *     them at face value.
+ *
+ *     Two consequences, one immediate and one a step removed. Immediately, the
+ *     resource detail pages scope their charts by the raw attribute rather
+ *     than by the owning entity's id — Service > Metrics pins
+ *     `resource.service.name = <the service's name>` — so a script stamping
+ *     that key files its monitor's datapoints onto an unrelated Service's
+ *     page. A step removed, ANY metric monitor grouped by one of these keys
+ *     turns it into a series label, and from there `SeriesResourceLinker`
+ *     attaches the named resource to every alert and incident that series
+ *     opens, `AlertOwnerRuleEngineService` pages that resource's owners
+ *     through owner inheritance, and `MonitorMaintenanceSuppression` silences
+ *     the series for the duration of a maintenance window on it. (A custom
+ *     code monitor's OWN alerts carry no series labels, so that second chain
+ *     needs a metric monitor over the `custom.monitor.*` series — which is an
+ *     ordinary thing for the same user to build.)
+ *
+ *     The blocklist is DERIVED from `AllResourceIdentityLabelKeys` so a key
+ *     added to the read side cannot be forgotten here.
+ *
+ *     The whole `oneuptime.` and `resource.` namespaces go with them.
+ *     `oneuptime.*` is what ingest stamps (ids, names, labels, custom fields);
+ *     `resource.*` is the ClickHouse spelling of an OTel resource attribute,
+ *     and a monitor metric has no OTel resource — so a script writing there is
+ *     always impersonating something. Blocking the namespaces rather than the
+ *     individual keys is what makes this hold for stamps added later.
+ *
+ *  2. PROTOTYPE-WALKING SEGMENTS. Dotted keys are read back as nested paths
+ *     (`{{host.name}}` in an alert template walks `host` then `name`), so a
+ *     segment of `__proto__` / `constructor` / `prototype` aims that walk at
+ *     `Object.prototype`. `MonitorTemplateUtil` refuses to walk them, and this
+ *     keeps them out of the store in the first place.
+ *
+ * Values are coerced rather than filtered. The sandbox hands over whatever
+ * JSON the script passed, and the ClickHouse column is Map(String, String), so
+ * a number or a boolean is a perfectly good dimension once stringified — which
+ * is what the synthetic runtime already does in-sandbox. The custom code path
+ * used to drop them on the floor server-side instead, so
+ * `captureMetric("queue.depth", n, { shard: 3 })` silently recorded no `shard`
+ * at all. Anything with no useful string form (objects, arrays, null, NaN,
+ * Infinity) is still dropped.
+ *
+ * The caps match the synthetic runtime's in-sandbox caps exactly. They are
+ * re-applied here because a probe is a separately deployed process: the server
+ * must not take the probe's word for how much a script was allowed to write.
+ */
+/** Most attributes kept on one captured metric. Matches the synthetic runtime. */
+export const MaxCapturedMetricAttributes = 50;
+/** Longest attribute key kept. Matches the synthetic runtime. */
+export const MaxCapturedMetricAttributeKeyLength = 200;
+/** Longest attribute value kept. Matches the synthetic runtime. */
+export const MaxCapturedMetricAttributeValueLength = 1000;
+/*
+ * The monitor's own identity, stamped by `buildMonitorMetricAttributes` and by
+ * the custom-metric block itself. A script that could overwrite these would be
+ * able to file its datapoints under a different monitor, or hide them from the
+ * Custom Metrics tab.
+ */
+const MonitorIdentityAttributeKeys = [
+    "monitorId",
+    "projectId",
+    "monitorName",
+    "probeName",
+    "probeId",
+    "isCustomMetric",
+];
+/*
+ * Namespace prefixes reserved for OneUptime's own stamps. `oneuptime.` covers
+ * every id / name / label / customField stamp; `resource.` covers the
+ * ClickHouse spelling of OTel resource attributes.
+ */
+const ReservedAttributeKeyPrefixes = [
+    "oneuptime.",
+    "resource.",
+];
+/*
+ * Path segments that make a dotted key resolve to the object prototype when a
+ * consumer walks it as a nested property path.
+ */
+const PrototypeWalkingKeySegments = new Set([
+    "__proto__",
+    "constructor",
+    "prototype",
+]);
+const ReservedAttributeKeys = new Set([
+    ...MonitorIdentityAttributeKeys,
+    ...AllResourceIdentityLabelKeys,
+]);
+export default class CapturedMetricAttributeUtil {
+    /**
+     * True when a monitor script must not be allowed to write this attribute
+     * key, either because OneUptime owns its meaning or because reading it back
+     * as a nested path would walk the object prototype.
+     *
+     * Compared case-sensitively, exactly as the read side compares
+     * (`SeriesResourceLabels.collectLabelValues` does a plain lookup), so this
+     * refuses precisely the spellings that would actually be honoured.
+     */
+    static isReservedAttributeKey(key) {
+        if (ReservedAttributeKeys.has(key)) {
+            return true;
+        }
+        for (const prefix of ReservedAttributeKeyPrefixes) {
+            if (key.startsWith(prefix)) {
+                return true;
+            }
+        }
+        for (const segment of key.split(".")) {
+            if (PrototypeWalkingKeySegments.has(segment)) {
+                return true;
+            }
+        }
+        return false;
+    }
+    /**
+     * The attributes of one captured metric, filtered, coerced and capped.
+     *
+     * First key wins on a post-trim collision, so the result does not depend on
+     * how the script happened to order two keys that differ only in whitespace.
+     */
+    static sanitize(attributes) {
+        const sanitized = {};
+        const droppedReservedKeys = [];
+        if (!attributes || typeof attributes !== "object") {
+            return { attributes: sanitized, droppedReservedKeys };
+        }
+        let kept = 0;
+        for (const rawKey of Object.keys(attributes)) {
+            if (kept >= MaxCapturedMetricAttributes) {
+                break;
+            }
+            /*
+             * An empty or whitespace-only key would store as an attribute no filter
+             * could ever select — the same thing MetricResourceAttributeUtil refuses
+             * to form for labels and custom fields.
+             */
+            const key = rawKey
+                .trim()
+                .substring(0, MaxCapturedMetricAttributeKeyLength);
+            if (key.length === 0) {
+                continue;
+            }
+            if (this.isReservedAttributeKey(key)) {
+                if (!droppedReservedKeys.includes(key)) {
+                    droppedReservedKeys.push(key);
+                }
+                continue;
+            }
+            if (sanitized[key] !== undefined) {
+                continue;
+            }
+            const value = this.toAttributeValue(attributes[rawKey]);
+            if (value === null) {
+                continue;
+            }
+            sanitized[key] = value;
+            kept++;
+        }
+        return { attributes: sanitized, droppedReservedKeys };
+    }
+    /*
+     * One attribute value as the string the Map(String, String) column stores.
+     * Returns null for anything that carries no usable dimension — an object, an
+     * array, null/undefined, or a non-finite number, which would record as the
+     * text "NaN" and chart as a category.
+     */
+    static toAttributeValue(value) {
+        if (typeof value === "string") {
+            return value.substring(0, MaxCapturedMetricAttributeValueLength);
+        }
+        if (typeof value === "number") {
+            return isFinite(value) ? String(value) : null;
+        }
+        if (typeof value === "boolean") {
+            return value ? "true" : "false";
+        }
+        return null;
+    }
+}
+//# sourceMappingURL=CapturedMetricAttributeUtil.js.map

package/build/dist/Server/Utils/Monitor/CapturedMetricAttributeUtil.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"CapturedMetricAttributeUtil.js","sourceRoot":"","sources":["../../../../../Server/Utils/Monitor/CapturedMetricAttributeUtil.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Utils/Monitor/Criteria/SnmpMonitorCriteria.js

@@ -12,6 +12,7 @@ import PerEntityCriteriaFanOut from "../PerEntityCriteriaFanOut";
 import { AnomalyDetectionSensitivity, CheckOn, CriteriaFilterUtil, FilterType, } from "../../../../Types/Monitor/CriteriaFilter";
 import MonitorMetricType from "../../../../Types/Monitor/MonitorMetricType";
 import OneUptimeDate from "../../../../Types/Date";
+import SnmpOidListUtil from "../../../../Types/Monitor/SnmpMonitor/SnmpOidListUtil";
 import EvaluateOverTime from "./EvaluateOverTime";
 import MetricBaselineService, { MetricBaselineService as MetricBaselineServiceClass, } from "../../../Services/MetricBaselineService";
 import CaptureSpan from "../../Telemetry/CaptureSpan";
@@ -319,8 +320,16 @@ export default class SnmpMonitorCriteria {
             if (!oid) {
                 return null;
             }
+            /*
+             * Compare canonical forms. ".1.3.6.1" and "1.3.6.1" are the same
+             * object, operators type both, and net-snmp always answers with the
+             * dotless form — so a stored leading dot used to make the criterion
+             * silently un-matchable forever. Newly reachable now that the OID
+             * picker actually writes a value.
+             */
+            const normalizedOid = SnmpOidListUtil.normalizeOid(oid);
             const oidResponse = (_d = snmpResponse === null || snmpResponse === void 0 ? void 0 : snmpResponse.oidResponses) === null || _d === void 0 ? void 0 : _d.find((response) => {
-                return response.oid === oid;
+                return SnmpOidListUtil.normalizeOid(response.oid) === normalizedOid;
             });
             const exists = Boolean(oidResponse && oidResponse.value !== null);
             const isTrue = input.criteriaFilter.filterType === FilterType.True;
@@ -339,8 +348,16 @@ export default class SnmpMonitorCriteria {
             if (!oid) {
                 return null;
             }
+            /*
+             * Compare canonical forms. ".1.3.6.1" and "1.3.6.1" are the same
+             * object, operators type both, and net-snmp always answers with the
+             * dotless form — so a stored leading dot used to make the criterion
+             * silently un-matchable forever. Newly reachable now that the OID
+             * picker actually writes a value.
+             */
+            const normalizedOid = SnmpOidListUtil.normalizeOid(oid);
             const oidResponse = (_f = snmpResponse === null || snmpResponse === void 0 ? void 0 : snmpResponse.oidResponses) === null || _f === void 0 ? void 0 : _f.find((response) => {
-                return response.oid === oid;
+                return SnmpOidListUtil.normalizeOid(response.oid) === normalizedOid;
             });
             if (!oidResponse || oidResponse.value === null) {
                 return null;

package/build/dist/Server/Utils/Monitor/Criteria/SnmpMonitorCriteria.js.map

@@ -1 +1 @@
-{"version":3,"file":"SnmpMonitorCriteria.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/SnmpMonitorCriteria.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SnmpMonitorCriteria.js","sourceRoot":"","sources":["../../../../../../Server/Utils/Monitor/Criteria/SnmpMonitorCriteria.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Utils/Monitor/MonitorMetricUtil.js

@@ -11,12 +11,14 @@ import logger from "../Logger";
 import CaptureSpan from "../Telemetry/CaptureSpan";
 import TelemetryUtil from "../Telemetry/Telemetry";
 import MetricResourceAttributeUtil from "../../../Utils/Metrics/MetricResourceAttributeUtil";
+import CapturedMetricAttributeUtil from "./CapturedMetricAttributeUtil";
 import MetricService from "../../Services/MetricService";
 import GlobalConfigService from "../../Services/GlobalConfigService";
 import { MetricPointType } from "../../../Models/AnalyticsModels/Metric";
 import ServiceType from "../../../Types/Telemetry/ServiceType";
 import MetricType from "../../../Models/DatabaseModels/MetricType";
 import MonitorMetricType from "../../../Types/Monitor/MonitorMetricType";
+import { MAX_INTERFACE_METRIC_SERIES, MAX_OID_METRIC_SERIES, } from "../../../Types/Monitor/SnmpMonitor/SnmpOidListUtil";
 import { CheckOn } from "../../../Types/Monitor/CriteriaFilter";
 import ObjectID from "../../../Types/ObjectID";
 import OneUptimeDate from "../../../Types/Date";
@@ -157,9 +159,14 @@ class MonitorMetricUtil {
      * same monitor, so there is nothing per-metric to decide, and one pass is
      * far easier to keep correct than thirty call sites.
      *
-     * Resource attributes are merged LAST. Custom code monitors let a user
-     * supply their own attribute names, and those must not be able to shadow the
-     * oneuptime.* namespace.
+     * Resource attributes are merged LAST, so a resource attribute wins any
+     * collision. That merge is NOT what keeps the oneuptime.* namespace safe
+     * from a monitor script, though — it only ever writes the handful of keys
+     * this monitor's own labels and custom fields produce, and it does not run
+     * at all for a monitor that has neither. Script-supplied attribute keys are
+     * refused at the point they are read instead, by
+     * CapturedMetricAttributeUtil, which rejects the whole oneuptime.* and
+     * resource.* namespaces rather than the keys that happen to collide today.
      */
     static applyResourceAttributesToMetricRows(data) {
         const resourceAttributes = MetricResourceAttributeUtil.getResourceAttributes({
@@ -739,7 +746,7 @@ class MonitorMetricUtil {
              * unbounded rows (large routers can expose thousands of
              * subinterfaces). Same approach as the custom-metric cap below.
              */
-            const interfacesToEmit = snmpInterfaces.slice(0, 200);
+            const interfacesToEmit = snmpInterfaces.slice(0, MAX_INTERFACE_METRIC_SERIES);
             if (interfacesToEmit.length < snmpInterfaces.length) {
                 logger.warn(`Monitor ${data.monitorId.toString()}: emitting metrics for first ${interfacesToEmit.length} of ${snmpInterfaces.length} SNMP interfaces`);
             }
@@ -807,8 +814,15 @@ class MonitorMetricUtil {
          */
         const snmpOidResponses = (_k = data.dataToProcess.snmpResponse) === null || _k === void 0 ? void 0 : _k.oidResponses;
         if (snmpOidResponses && snmpOidResponses.length > 0) {
-            // Same unbounded-write cap rationale as the interface block above.
-            const oidResponsesToEmit = snmpOidResponses.slice(0, 50);
+            /*
+             * Same unbounded-write cap rationale as the interface block above.
+             *
+             * Shared with NetworkDeviceMetricUtil rather than repeated as a
+             * literal: this is the monitor-scoped copy of the same emit, and the
+             * two caps have to move together or a device charts a different number
+             * of OIDs than the monitors watching it.
+             */
+            const oidResponsesToEmit = snmpOidResponses.slice(0, MAX_OID_METRIC_SERIES);
             if (oidResponsesToEmit.length < snmpOidResponses.length) {
                 logger.warn(`Monitor ${data.monitorId.toString()}: emitting metrics for first ${oidResponsesToEmit.length} of ${snmpOidResponses.length} SNMP OID responses`);
             }
@@ -1021,13 +1035,13 @@ class MonitorMetricUtil {
         if (allCustomMetrics.length > 0) {
             logger.debug(`${data.monitorId.toString()} - Processing ${allCustomMetrics.length} custom metrics`);
         }
-        const reservedAttributeKeys = new Set([
-            "monitorId",
-            "projectId",
-            "monitorName",
-            "probeName",
-            "probeId",
-        ]);
+        /*
+         * Keys a script tried to write but is not allowed to own, collected
+         * across the whole check so the operator gets one line naming them
+         * rather than one per datapoint. Without it, an attribute that silently
+         * never reaches a chart is indistinguishable from a bug in the script.
+         */
+        const droppedReservedAttributeKeys = new Set();
         for (const customMetric of allCustomMetrics) {
             if (!customMetric.name ||
                 typeof customMetric.name !== "string" ||
@@ -1036,19 +1050,19 @@ class MonitorMetricUtil {
                 continue;
             }
             const prefixedName = `custom.monitor.${customMetric.name}`;
-            const extraAttributes = {
-                isCustomMetric: "true",
-            };
+            /*
+             * Script-supplied attributes first, OneUptime's own stamps after, so
+             * the stamps are written onto a set the guard has already cleared of
+             * every key OneUptime owns.
+             */
+            const sanitized = CapturedMetricAttributeUtil.sanitize(customMetric.attributes);
+            for (const droppedKey of sanitized.droppedReservedKeys) {
+                droppedReservedAttributeKeys.add(droppedKey);
+            }
+            const extraAttributes = Object.assign(Object.assign({}, sanitized.attributes), { isCustomMetric: "true" });
             if (data.dataToProcess.probeId) {
                 extraAttributes["probeId"] = data.dataToProcess.probeId.toString();
             }
-            if (customMetric.attributes) {
-                for (const [key, val] of Object.entries(customMetric.attributes)) {
-                    if (typeof val === "string" && !reservedAttributeKeys.has(key)) {
-                        extraAttributes[key] = val;
-                    }
-                }
-            }
             const attributes = this.buildMonitorMetricAttributes({
                 monitorId: data.monitorId,
                 projectId: data.projectId,
@@ -1071,6 +1085,11 @@ class MonitorMetricUtil {
             metricType.unit = "";
             metricNameServiceNameMap[prefixedName] = metricType;
         }
+        if (droppedReservedAttributeKeys.size > 0) {
+            logger.warn(`${data.monitorId.toString()} - Custom metric attributes dropped, these keys are reserved by OneUptime: ${Array.from(droppedReservedAttributeKeys)
+                .sort()
+                .join(", ")}`);
+        }
         this.applyResourceAttributesToMetricRows({
             metricRows: metricRows,
             labels: data.monitorLabels,