feat: enhancements to OpenTelemetry support

openfga · Aug 30, 2024 · 3fe9b36 · 3fe9b36
1 parent 4d9ddfc
commit 3fe9b36
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/common.ts b/common.ts
@@ -226,14 +226,26 @@ export const createRequestFunction = function (axiosArgs: RequestArgs, axiosInst
       attributes,
     });
 
-    attributes = telemetryAttributes.prepare(attributes);
-
     if (attributes[TelemetryAttributes.httpServerRequestDuration.name]) {
-      telemetryMetrics.histogram(TelemetryHistograms.queryDuration, parseInt(attributes[TelemetryAttributes.httpServerRequestDuration.name] as string, 10), attributes);
+      telemetryMetrics.histogram(
+        TelemetryHistograms.queryDuration,
+        parseInt(attributes[TelemetryAttributes.httpServerRequestDuration.name] as string, 10),
+        telemetryAttributes.prepare(
+          attributes,
+          Object.keys(configuration.telemetryConfig.metrics.histogramQueryDuration.attributes())
+        )
+      );
     }
 
     if (attributes[TelemetryAttributes.httpClientRequestDuration.name]) {
-      telemetryMetrics.histogram(TelemetryHistograms.requestDuration, Date.now() - start, attributes);
+      telemetryMetrics.histogram(
+        TelemetryHistograms.requestDuration,
+        Date.now() - start,
+        telemetryAttributes.prepare(
+          attributes,
+          Object.keys(configuration.telemetryConfig.metrics.histogramRequestDuration.attributes())
+        )
+      );
     }
 
     return result;