@sentio/runtime 2.44.0-rc.3 → 2.44.0-rc.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentio/runtime",
-  "version": "2.44.0-rc.3",
+  "version": "2.44.0-rc.5",
   "license": "Apache-2.0",
   "type": "module",
   "exports": {

package/src/metrics.ts

@@ -1,13 +1,18 @@
 import { Attributes, Counter, metrics, Gauge } from '@opentelemetry/api'
 
-const meter = metrics.getMeter('processor')
+const getMeter = () => metrics.getMeter('processor')
 
 class C {
-  private counter: Counter<Attributes>
+  private _counter: Counter<Attributes>
   private value: number = 0
 
-  constructor(name: string) {
-    this.counter = meter.createCounter(name)
+  constructor(private name: string) {}
+
+  get counter(): Counter<Attributes> {
+    if (!this._counter) {
+      this._counter = getMeter().createCounter(this.name)
+    }
+    return this._counter
   }
 
   add(value: number, attributes?: Attributes) {
@@ -21,11 +26,16 @@ class C {
 }
 
 class G {
-  private gauge: Gauge<Attributes>
+  private _gauge: Gauge<Attributes>
   private value: number = 0
 
-  constructor(name: string) {
-    this.gauge = meter.createGauge(name)
+  constructor(private name: string) {}
+
+  get gauge(): Gauge<Attributes> {
+    if (!this._gauge) {
+      this._gauge = getMeter().createGauge(this.name)
+    }
+    return this._gauge
   }
 
   record(value: number, attributes?: Attributes) {

package/src/otlp.ts

@@ -5,9 +5,13 @@ import { PrometheusExporter } from '@opentelemetry/exporter-prometheus'
 import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node'
 import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-grpc'
 import { BatchSpanProcessor } from '@opentelemetry/sdk-trace-base'
-import { metrics, trace, ProxyTracerProvider } from '@opentelemetry/api'
+import { diag, DiagConsoleLogger, DiagLogLevel, metrics, trace, ProxyTracerProvider } from '@opentelemetry/api'
+
+export async function setupOTLP(debug?: boolean) {
+  if (debug) {
+    diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.DEBUG)
+  }
 
-export async function setupOTLP() {
   const resource = await envDetector.detect()
 
   const meterProvider = new MeterProvider({
@@ -29,12 +33,15 @@ export async function setupOTLP() {
   const exporter = new OTLPTraceExporter() // new ConsoleSpanExporter();
   const processor = new BatchSpanProcessor(exporter)
   traceProvider.addSpanProcessor(processor)
+  traceProvider.register()
 
   metrics.setGlobalMeterProvider(meterProvider)
   trace.setGlobalTracerProvider(traceProvider)
   ;['SIGINT', 'SIGTERM'].forEach((signal) => {
     process.on(signal as any, () => shutdownProvider())
   })
+
+  metrics.getMeter('processor').createGauge('up').record(1)
 }
 
 export async function shutdownProvider() {

package/src/processor-runner.ts

@@ -21,15 +21,7 @@ import { FullProcessorServiceImpl } from './full-service.js'
 import { ChainConfig } from './chain-config.js'
 import { setupLogger } from './logger.js'
 
-// import { NodeSDK } from '@opentelemetry/sdk-node'
-import { envDetector } from '@opentelemetry/resources'
-import { OTLPMetricExporter } from '@opentelemetry/exporter-metrics-otlp-grpc'
-import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-grpc'
-import { PeriodicExportingMetricReader, MeterProvider } from '@opentelemetry/sdk-metrics'
-import { BatchSpanProcessor } from '@opentelemetry/sdk-trace-base'
-import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node'
-import { diag, DiagConsoleLogger, DiagLogLevel, metrics, trace } from '@opentelemetry/api'
-import { PrometheusExporter } from '@opentelemetry/exporter-prometheus'
+import { setupOTLP } from './otlp.js'
 
 // const mergedRegistry = Registry.merge([globalRegistry, niceGrpcRegistry])
 
@@ -58,51 +50,7 @@ const logLevel = process.env['LOG_LEVEL']?.toUpperCase()
 setupLogger(options['log-format'] === 'json', logLevel === 'debug' ? true : options.debug)
 console.debug('Starting with', options.target)
 
-if (options.debug) {
-  diag.setLogger(new DiagConsoleLogger(), DiagLogLevel.DEBUG)
-}
-
-const resource = await envDetector.detect()
-
-const meterProvider = new MeterProvider({
-  resource,
-  readers: [
-    new PeriodicExportingMetricReader({
-      exporter: new OTLPMetricExporter()
-    }),
-    new PrometheusExporter({
-      // http://localhost:4041/metrics
-      port: 4041
-    })
-  ]
-})
-
-const traceProvider = new NodeTracerProvider({
-  resource: resource
-})
-const exporter = new OTLPTraceExporter() // new ConsoleSpanExporter();
-const processor = new BatchSpanProcessor(exporter)
-traceProvider.addSpanProcessor(processor)
-traceProvider.register()
-
-metrics.setGlobalMeterProvider(meterProvider)
-trace.setGlobalTracerProvider(traceProvider)
-;['SIGINT', 'SIGTERM'].forEach((signal) => {
-  process.on(signal as any, () => shutdownProvider())
-})
-
-export async function shutdownProvider() {
-  const traceProvider = trace.getTracerProvider()
-  if (traceProvider instanceof NodeTracerProvider) {
-    traceProvider.shutdown().catch(console.error)
-  }
-  const meterProvider = metrics.getMeterProvider()
-  if (meterProvider instanceof MeterProvider) {
-    meterProvider.shutdown().catch(console.error)
-  }
-}
-
-metrics.getMeter('processor').createGauge('up').record(1)
+await setupOTLP(options.debug)
 
 Error.stackTraceLimit = 20