@sentio/sdk 1.31.0 → 1.31.2

package/lib/core/meter.js

@@ -55,8 +55,11 @@ class Metric extends metadata_1.NamedResultDescriptor {
         this.type = type;
         this.descriptor = gen_1.MetricConfig.fromPartial({ name: this.name, ...option });
         const aggregationConfig = this.descriptor.aggregationConfig;
-        if (aggregationConfig) {
-            if (aggregationConfig.intervalInMinutes > 0 && !aggregationConfig.types) {
+        if (aggregationConfig && aggregationConfig.intervalInMinutes.length) {
+            if (aggregationConfig.intervalInMinutes.length > 1) {
+                console.error('current only support one intervalInMinutes, only first interval will be used for', name);
+            }
+            if (aggregationConfig.intervalInMinutes[0] > 0 && aggregationConfig.types.length === 0) {
                 aggregationConfig.types = [gen_1.AggregationType.SUM, gen_1.AggregationType.COUNT];
             }
         }

package/lib/core/meter.js.map

@@ -1 +1 @@
-{"version":3,"file":"meter.js","sourceRoot":"","sources":["../../src/core/meter.ts"],"names":[],"mappings":"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","sourcesContent":["import { BaseContext } from './base-context'\nimport { Numberish, toMetricValue } from './numberish'\nimport { Labels, NamedResultDescriptor } from './metadata'\nimport { AggregationConfig, AggregationType, MetricConfig } from '../gen'\nimport { MapStateStorage } from '../state/state-storage'\n\nexport function normalizeName(name: string): string {\n  const regex = new RegExp('![_.a-zA-Z0-9]')\n  return name.slice(0, 100).replace(regex, '_')\n}\n\nexport function normalizeKey(name: string): string {\n  if (name === 'labels') {\n    return 'labels_'\n  }\n  return normalizeName(name)\n}\n\nexport function normalizeValue(name: string): string {\n  return name.slice(0, 100)\n}\n\nexport function normalizeLabels(labels: Labels): Labels {\n  const normLabels: Labels = {}\n  for (const key in labels) {\n    normLabels[normalizeKey(key)] = normalizeValue(labels[key])\n  }\n  return normLabels\n}\n\nexport class MetricOptions {\n  unit?: string\n  description?: string\n  sparse?: boolean\n  aggregationConfig?: Partial<AggregationConfig>\n}\n\nexport class CounterOptions {\n  unit?: string\n  description?: string\n  sparse?: boolean\n}\n\nenum MetricType {\n  Counter = 0,\n  Gauge = 1,\n}\n\nexport class Metric extends NamedResultDescriptor {\n  type: MetricType\n  descriptor: MetricConfig\n  constructor(type: MetricType, name: string, option?: MetricOptions) {\n    super(name)\n    this.type = type\n    this.descriptor = MetricConfig.fromPartial({ name: this.name, ...option })\n    const aggregationConfig = this.descriptor.aggregationConfig\n    if (aggregationConfig) {\n      if (aggregationConfig.intervalInMinutes > 0 && !aggregationConfig.types) {\n        aggregationConfig.types = [AggregationType.SUM, AggregationType.COUNT]\n      }\n    }\n  }\n}\n\nexport class MetricState extends MapStateStorage<Metric> {\n  static INSTANCE = new MetricState()\n\n  getOrRegisterMetric(type: MetricType, name: string, option?: CounterOptions | MetricOptions): Metric {\n    const metricMap = this.getOrRegister()\n    let metric = metricMap.get(name)\n    if (metric && metric.type !== type) {\n      throw Error(`redefine ${name} of metric type ${type} that is previously ${metric.type}`)\n    }\n\n    if (!metric) {\n      if (type === MetricType.Counter) {\n        metric = new Counter(name, option)\n      } else {\n        metric = new Gauge(name, option)\n      }\n    }\n    metricMap.set(name, metric)\n    return metric\n  }\n}\n\nexport class Counter extends Metric {\n  static register(name: string, option?: CounterOptions): Counter {\n    return MetricState.INSTANCE.getOrRegisterMetric(MetricType.Counter, name, option) as Counter\n  }\n\n  constructor(name: string, option?: MetricOptions) {\n    super(MetricType.Counter, name, option)\n  }\n\n  add(ctx: BaseContext, value: Numberish, labels: Labels = {}) {\n    this.record(ctx, value, labels, true)\n  }\n\n  sub(ctx: BaseContext, value: Numberish, labels: Labels = {}) {\n    this.record(ctx, value, labels, false)\n  }\n\n  private record(ctx: BaseContext, value: Numberish, labels: Labels, add: boolean) {\n    ctx.res.counters.push({\n      metadata: ctx.getMetaData(this.name, labels),\n      metricValue: toMetricValue(value),\n      add: add,\n      runtimeInfo: undefined,\n    })\n  }\n}\n\nexport class CounterBinding {\n  private readonly ctx: BaseContext\n  private readonly counter: Counter\n\n  constructor(name: string, ctx: BaseContext) {\n    this.counter = new Counter(name)\n    this.ctx = ctx\n  }\n\n  add(value: Numberish, labels: Labels = {}) {\n    this.counter.add(this.ctx, value, labels)\n  }\n\n  sub(value: Numberish, labels: Labels = {}) {\n    this.counter.sub(this.ctx, value, labels)\n  }\n}\n\nexport class Gauge extends Metric {\n  static register(name: string, option?: MetricOptions): Gauge {\n    return MetricState.INSTANCE.getOrRegisterMetric(MetricType.Gauge, name, option) as Gauge\n  }\n\n  constructor(name: string, option?: MetricOptions) {\n    super(MetricType.Counter, name, option)\n  }\n\n  record(ctx: BaseContext, value: Numberish, labels: Labels = {}) {\n    ctx.res.gauges.push({\n      metadata: ctx.getMetaData(this.descriptor.name, labels),\n      metricValue: toMetricValue(value),\n      runtimeInfo: undefined,\n    })\n  }\n}\n\nexport class GaugeBinding {\n  private readonly gauge: Gauge\n  private readonly ctx: BaseContext\n\n  constructor(name: string, ctx: BaseContext) {\n    this.gauge = new Gauge(name)\n    this.ctx = ctx\n  }\n\n  record(value: Numberish, labels: Labels = {}) {\n    this.gauge.record(this.ctx, value, labels)\n  }\n}\n\nexport class Meter {\n  private readonly ctx: BaseContext\n\n  constructor(ctx: BaseContext) {\n    this.ctx = ctx\n  }\n\n  Counter(name: string): CounterBinding {\n    return new CounterBinding(name, this.ctx)\n  }\n\n  Gauge(name: string): GaugeBinding {\n    return new GaugeBinding(name, this.ctx)\n  }\n}\n"]}
+{"version":3,"file":"meter.js","sourceRoot":"","sources":["../../src/core/meter.ts"],"names":[],"mappings":"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","sourcesContent":["import { BaseContext } from './base-context'\nimport { Numberish, toMetricValue } from './numberish'\nimport { Labels, NamedResultDescriptor } from './metadata'\nimport { AggregationConfig, AggregationType, MetricConfig } from '../gen'\nimport { MapStateStorage } from '../state/state-storage'\n\nexport function normalizeName(name: string): string {\n  const regex = new RegExp('![_.a-zA-Z0-9]')\n  return name.slice(0, 100).replace(regex, '_')\n}\n\nexport function normalizeKey(name: string): string {\n  if (name === 'labels') {\n    return 'labels_'\n  }\n  return normalizeName(name)\n}\n\nexport function normalizeValue(name: string): string {\n  return name.slice(0, 100)\n}\n\nexport function normalizeLabels(labels: Labels): Labels {\n  const normLabels: Labels = {}\n  for (const key in labels) {\n    normLabels[normalizeKey(key)] = normalizeValue(labels[key])\n  }\n  return normLabels\n}\n\nexport class MetricOptions {\n  unit?: string\n  description?: string\n  sparse?: boolean\n  aggregationConfig?: Partial<AggregationConfig>\n}\n\nexport class CounterOptions {\n  unit?: string\n  description?: string\n  sparse?: boolean\n}\n\nenum MetricType {\n  Counter = 0,\n  Gauge = 1,\n}\n\nexport class Metric extends NamedResultDescriptor {\n  type: MetricType\n  descriptor: MetricConfig\n  constructor(type: MetricType, name: string, option?: MetricOptions) {\n    super(name)\n    this.type = type\n    this.descriptor = MetricConfig.fromPartial({ name: this.name, ...option })\n    const aggregationConfig = this.descriptor.aggregationConfig\n    if (aggregationConfig && aggregationConfig.intervalInMinutes.length) {\n      if (aggregationConfig.intervalInMinutes.length > 1) {\n        console.error('current only support one intervalInMinutes, only first interval will be used for', name)\n      }\n      if (aggregationConfig.intervalInMinutes[0] > 0 && aggregationConfig.types.length === 0) {\n        aggregationConfig.types = [AggregationType.SUM, AggregationType.COUNT]\n      }\n    }\n  }\n}\n\nexport class MetricState extends MapStateStorage<Metric> {\n  static INSTANCE = new MetricState()\n\n  getOrRegisterMetric(type: MetricType, name: string, option?: CounterOptions | MetricOptions): Metric {\n    const metricMap = this.getOrRegister()\n    let metric = metricMap.get(name)\n    if (metric && metric.type !== type) {\n      throw Error(`redefine ${name} of metric type ${type} that is previously ${metric.type}`)\n    }\n\n    if (!metric) {\n      if (type === MetricType.Counter) {\n        metric = new Counter(name, option)\n      } else {\n        metric = new Gauge(name, option)\n      }\n    }\n    metricMap.set(name, metric)\n    return metric\n  }\n}\n\nexport class Counter extends Metric {\n  static register(name: string, option?: CounterOptions): Counter {\n    return MetricState.INSTANCE.getOrRegisterMetric(MetricType.Counter, name, option) as Counter\n  }\n\n  constructor(name: string, option?: MetricOptions) {\n    super(MetricType.Counter, name, option)\n  }\n\n  add(ctx: BaseContext, value: Numberish, labels: Labels = {}) {\n    this.record(ctx, value, labels, true)\n  }\n\n  sub(ctx: BaseContext, value: Numberish, labels: Labels = {}) {\n    this.record(ctx, value, labels, false)\n  }\n\n  private record(ctx: BaseContext, value: Numberish, labels: Labels, add: boolean) {\n    ctx.res.counters.push({\n      metadata: ctx.getMetaData(this.name, labels),\n      metricValue: toMetricValue(value),\n      add: add,\n      runtimeInfo: undefined,\n    })\n  }\n}\n\nexport class CounterBinding {\n  private readonly ctx: BaseContext\n  private readonly counter: Counter\n\n  constructor(name: string, ctx: BaseContext) {\n    this.counter = new Counter(name)\n    this.ctx = ctx\n  }\n\n  add(value: Numberish, labels: Labels = {}) {\n    this.counter.add(this.ctx, value, labels)\n  }\n\n  sub(value: Numberish, labels: Labels = {}) {\n    this.counter.sub(this.ctx, value, labels)\n  }\n}\n\nexport class Gauge extends Metric {\n  static register(name: string, option?: MetricOptions): Gauge {\n    return MetricState.INSTANCE.getOrRegisterMetric(MetricType.Gauge, name, option) as Gauge\n  }\n\n  constructor(name: string, option?: MetricOptions) {\n    super(MetricType.Counter, name, option)\n  }\n\n  record(ctx: BaseContext, value: Numberish, labels: Labels = {}) {\n    ctx.res.gauges.push({\n      metadata: ctx.getMetaData(this.descriptor.name, labels),\n      metricValue: toMetricValue(value),\n      runtimeInfo: undefined,\n    })\n  }\n}\n\nexport class GaugeBinding {\n  private readonly gauge: Gauge\n  private readonly ctx: BaseContext\n\n  constructor(name: string, ctx: BaseContext) {\n    this.gauge = new Gauge(name)\n    this.ctx = ctx\n  }\n\n  record(value: Numberish, labels: Labels = {}) {\n    this.gauge.record(this.ctx, value, labels)\n  }\n}\n\nexport class Meter {\n  private readonly ctx: BaseContext\n\n  constructor(ctx: BaseContext) {\n    this.ctx = ctx\n  }\n\n  Counter(name: string): CounterBinding {\n    return new CounterBinding(name, this.ctx)\n  }\n\n  Gauge(name: string): GaugeBinding {\n    return new GaugeBinding(name, this.ctx)\n  }\n}\n"]}

package/lib/gen/processor/protos/processor.d.ts

@@ -103,7 +103,7 @@ export interface MetricConfig {
     aggregationConfig: AggregationConfig | undefined;
 }
 export interface AggregationConfig {
-    intervalInMinutes: number;
+    intervalInMinutes: number[];
     types: AggregationType[];
     discardOrigin: boolean;
 }

package/lib/gen/processor/protos/processor.js

@@ -1089,13 +1089,15 @@ exports.MetricConfig = {
     },
 };
 function createBaseAggregationConfig() {
-    return { intervalInMinutes: 0, types: [], discardOrigin: false };
+    return { intervalInMinutes: [], types: [], discardOrigin: false };
 }
 exports.AggregationConfig = {
     encode(message, writer = minimal_1.default.Writer.create()) {
-        if (message.intervalInMinutes !== 0) {
-            writer.uint32(8).int32(message.intervalInMinutes);
+        writer.uint32(10).fork();
+        for (const v of message.intervalInMinutes) {
+            writer.int32(v);
         }
+        writer.ldelim();
         writer.uint32(18).fork();
         for (const v of message.types) {
             writer.int32(v);
@@ -1114,7 +1116,15 @@ exports.AggregationConfig = {
             const tag = reader.uint32();
             switch (tag >>> 3) {
                 case 1:
-                    message.intervalInMinutes = reader.int32();
+                    if ((tag & 7) === 2) {
+                        const end2 = reader.uint32() + reader.pos;
+                        while (reader.pos < end2) {
+                            message.intervalInMinutes.push(reader.int32());
+                        }
+                    }
+                    else {
+                        message.intervalInMinutes.push(reader.int32());
+                    }
                     break;
                 case 2:
                     if ((tag & 7) === 2) {
@@ -1139,9 +1149,9 @@ exports.AggregationConfig = {
     },
     fromJSON(object) {
         return {
-            intervalInMinutes: isSet(object.intervalInMinutes)
-                ? Number(object.intervalInMinutes)
-                : 0,
+            intervalInMinutes: Array.isArray(object?.intervalInMinutes)
+                ? object.intervalInMinutes.map((e) => Number(e))
+                : [],
             types: Array.isArray(object?.types)
                 ? object.types.map((e) => aggregationTypeFromJSON(e))
                 : [],
@@ -1152,8 +1162,12 @@ exports.AggregationConfig = {
     },
     toJSON(message) {
         const obj = {};
-        message.intervalInMinutes !== undefined &&
-            (obj.intervalInMinutes = Math.round(message.intervalInMinutes));
+        if (message.intervalInMinutes) {
+            obj.intervalInMinutes = message.intervalInMinutes.map((e) => Math.round(e));
+        }
+        else {
+            obj.intervalInMinutes = [];
+        }
         if (message.types) {
             obj.types = message.types.map((e) => aggregationTypeToJSON(e));
         }
@@ -1166,7 +1180,7 @@ exports.AggregationConfig = {
     },
     fromPartial(object) {
         const message = createBaseAggregationConfig();
-        message.intervalInMinutes = object.intervalInMinutes ?? 0;
+        message.intervalInMinutes = object.intervalInMinutes?.map((e) => e) || [];
         message.types = object.types?.map((e) => e) || [];
         message.discardOrigin = object.discardOrigin ?? false;
         return message;