Skip to content

The open alternative to Salesforce, designed for AI.

fix(server): attach service and pod identity to exported metrics (#24756)

Charles Bochet95ea62c9d9f6
diff --git a/packages/twenty-server/package.json b/packages/twenty-server/package.json
index 034b454db0a..f398789bd3c 100644
--- a/packages/twenty-server/package.json
+++ b/packages/twenty-server/package.json
@@ -70,6 +70,7 @@
"@opentelemetry/api": "^1.9.0",
"@opentelemetry/exporter-metrics-otlp-http": "^0.219.0",
"@opentelemetry/exporter-prometheus": "^0.219.0",
+ "@opentelemetry/resources": "^2.8.0",
"@opentelemetry/sdk-metrics": "^2.8.0",
"@react-pdf/renderer": "^4.1.6",
"@sentry/nestjs": "^10.59.0",
diff --git a/packages/twenty-server/src/instrument.ts b/packages/twenty-server/src/instrument.ts
index 02cad6c022c..30e7062230f 100644
--- a/packages/twenty-server/src/instrument.ts
+++ b/packages/twenty-server/src/instrument.ts
@@ -1,8 +1,10 @@
+import os from 'os';
import process from 'process';
import { metrics as otelMetrics } from '@opentelemetry/api';
import { OTLPMetricExporter } from '@opentelemetry/exporter-metrics-otlp-http';
import { PrometheusExporter } from '@opentelemetry/exporter-prometheus';
+import { resourceFromAttributes } from '@opentelemetry/resources';
import {
AggregationTemporality,
ConsoleMetricExporter,
@@ -123,6 +125,10 @@ const prometheusExporter = meterDrivers.includes(MeterDriver.Prometheus)
: null;
const meterProvider = new MeterProvider({
+ resource: resourceFromAttributes({
+ 'service.name': process.env.OTEL_SERVICE_NAME ?? 'twenty-server',
+ 'k8s.pod.name': process.env.HOSTNAME ?? os.hostname(),
+ }),
readers: [
...(meterDrivers.includes(MeterDriver.Console)
? [
diff --git a/yarn.lock b/yarn.lock
index d82421afbfc..d207219687f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13354,6 +13354,17 @@ __metadata:
languageName: node
linkType: hard
+"@opentelemetry/core@npm:2.10.0":
+ version: 2.10.0
+ resolution: "@opentelemetry/core@npm:2.10.0"
+ dependencies:
+ "@opentelemetry/semantic-conventions": "npm:^1.29.0"
+ peerDependencies:
+ "@opentelemetry/api": ">=1.0.0 <1.10.0"
+ checksum: 10c0/fe79c3f77881c5cdd5cff17825f847536fb7882d8c7e26356081ab20c1a16910ae54ffb1deb49ec34293cc2da5bf8501f30acb51e7e159184f2320ebba958c3f
+ languageName: node
+ linkType: hard
+
"@opentelemetry/core@npm:2.8.0, @opentelemetry/core@npm:^2.6.1":
version: 2.8.0
resolution: "@opentelemetry/core@npm:2.8.0"
@@ -13447,6 +13458,18 @@ __metadata:
languageName: node
linkType: hard
+"@opentelemetry/resources@npm:^2.8.0":
+ version: 2.10.0
+ resolution: "@opentelemetry/resources@npm:2.10.0"
+ dependencies:
+ "@opentelemetry/core": "npm:2.10.0"
+ "@opentelemetry/semantic-conventions": "npm:^1.29.0"
+ peerDependencies:
+ "@opentelemetry/api": ">=1.3.0 <1.10.0"
+ checksum: 10c0/23e227a7fee39f93fee9b956fd7e46558807df633ee5a00b0ce0aed11bef587bf03489e02c330e8e414ab6fe4f011c8fe4d5b03a1fbd0003481f29a428bb9433
+ languageName: node
+ linkType: hard
+
"@opentelemetry/sdk-logs@npm:0.219.0":
version: 0.219.0
resolution: "@opentelemetry/sdk-logs@npm:0.219.0"
@@ -49442,6 +49465,7 @@ __metadata:
"@opentelemetry/api": "npm:^1.9.0"
"@opentelemetry/exporter-metrics-otlp-http": "npm:^0.219.0"
"@opentelemetry/exporter-prometheus": "npm:^0.219.0"
+ "@opentelemetry/resources": "npm:^2.8.0"
"@opentelemetry/sdk-metrics": "npm:^2.8.0"
"@react-pdf/renderer": "npm:^4.1.6"
"@sentry/nestjs": "npm:^10.59.0"