@codefresh-io/cf-telemetry 2.0.0-alpha.30 → 2.0.0-alpha.32

package/README.md

@@ -27,5 +27,5 @@ import '@codefresh-io/cf-telemetry/init'
 
 | Variable               | Required | Default value                                                     | Description                                 |
 |------------------------| -------- |-------------------------------------------------------------------|---------------------------------------------|
-| `CF_TELEMETRY_SERVICE_NAME` | optional | `unknown_service:node` | Sets service name for OpenTelemetry and Pyroscope. |
-| `CF_TELEMETRY_SERVICE_VERSION` | optional | `unknown` | Sets service version for OpenTelemetry and Pyroscope. |
+| `CF_SERVICE_NAME` | optional | `unknown_service:node` | Sets service name for OpenTelemetry, Pyroscope and Prometheus. |
+| `CF_SERVICE_VERSION` | optional | `unknown` | Sets service name for OpenTelemetry, Pyroscope and Prometheus. |

package/dist/metrics/prometheus/helpers.d.ts

@@ -1,7 +1,4 @@
-export interface ExemplarLabels {
-    spanId?: string;
-    traceId?: string;
-}
+import type { ExemplarLabels } from './metrics';
 /**
  * Get exemplar labels for Prometheus metrics with enabled exemplars.
  */

package/dist/metrics/prometheus/helpers.js

@@ -8,8 +8,8 @@ const sdk_node_1 = require("@opentelemetry/sdk-node");
 const getExemplarLabels = () => {
     const { spanId, traceId } = sdk_node_1.api.trace.getActiveSpan()?.spanContext() ?? {};
     return {
-        ...spanId && { spanId },
-        ...traceId && { traceId },
+        ...spanId && { span_id: spanId },
+        ...traceId && { trace_id: traceId },
     };
 };
 exports.getExemplarLabels = getExemplarLabels;

package/dist/metrics/prometheus/helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../src/metrics/prometheus/helpers.ts"],"names":[],"mappings":";;;AAAA,sDAA8C;AAO9C;;GAEG;AACI,MAAM,iBAAiB,GAAG,GAAmB,EAAE;IACpD,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,cAAG,CAAC,KAAK,CAAC,aAAa,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;IAC3E,OAAO;QACL,GAAG,MAAM,IAAI,EAAE,MAAM,EAAE;QACvB,GAAG,OAAO,IAAI,EAAE,OAAO,EAAE;KAC1B,CAAC;AACJ,CAAC,CAAC;AANW,QAAA,iBAAiB,qBAM5B"}
+{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../src/metrics/prometheus/helpers.ts"],"names":[],"mappings":";;;AAAA,sDAA8C;AAG9C;;GAEG;AACI,MAAM,iBAAiB,GAAG,GAAmB,EAAE;IACpD,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,cAAG,CAAC,KAAK,CAAC,aAAa,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;IAC3E,OAAO;QACL,GAAG,MAAM,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE;QAChC,GAAG,OAAO,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE;KACpC,CAAC;AACJ,CAAC,CAAC;AANW,QAAA,iBAAiB,qBAM5B"}

package/dist/metrics/prometheus/metrics.d.ts

@@ -1,10 +1,12 @@
-import type { CounterConfiguration as CounterConfigurationOriginal, GaugeConfiguration as GaugeConfigurationOriginal, HistogramConfiguration as HistogramConfigurationOriginal, MetricConfiguration as MetricConfigurationOriginal, SummaryConfiguration as SummaryConfigurationOriginal } from 'prom-client';
+import type { CounterConfiguration as CounterConfigurationOriginal, GaugeConfiguration as GaugeConfigurationOriginal, HistogramConfiguration as HistogramConfigurationOriginal, LabelValues, MetricConfiguration as MetricConfigurationOriginal, SummaryConfiguration as SummaryConfigurationOriginal } from 'prom-client';
 import { Counter as CounterOriginal, Gauge as GaugeOriginal, Histogram as HistogramOriginal, Summary as SummaryOriginal } from 'prom-client';
+export type ExemplarLabelName = 'span_id' | 'trace_id';
+export type ExemplarLabels = LabelValues<ExemplarLabelName>;
 export type MetricConfiguration<T extends string = string> = MetricConfigurationOriginal<T> & {
     name: `codefresh_${string}`;
 };
 export type CounterConfiguration<T extends string = string> = CounterConfigurationOriginal<T> & MetricConfiguration<T>;
-export declare class Counter<T extends string = string> extends CounterOriginal<T> {
+export declare class Counter<T extends string = string> extends CounterOriginal<T | ExemplarLabelName> {
     constructor(config: CounterConfiguration<T>);
 }
 export type GaugeConfiguration<T extends string = string> = GaugeConfigurationOriginal<T> & MetricConfiguration<T>;
@@ -12,7 +14,7 @@ export declare class Gauge<T extends string = string> extends GaugeOriginal<T> {
     constructor(config: GaugeConfiguration<T>);
 }
 export type HistogramConfiguration<T extends string = string> = HistogramConfigurationOriginal<T> & MetricConfiguration<T>;
-export declare class Histogram<T extends string = string> extends HistogramOriginal<T> {
+export declare class Histogram<T extends string = string> extends HistogramOriginal<T | ExemplarLabelName> {
     constructor(config: HistogramConfiguration<T>);
 }
 export type SummaryConfiguration<T extends string = string> = SummaryConfigurationOriginal<T> & MetricConfiguration<T>;

package/dist/metrics/prometheus/metrics.js.map

@@ -1 +1 @@
-{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../../src/metrics/prometheus/metrics.ts"],"names":[],"mappings":";;;AAOA,6CAKqB;AAKrB,MAAa,OAAmC,SAAQ,qBAAkB;IACxE,YAAY,MAA+B;QACzC,KAAK,CAAC,MAAM,CAAC,CAAC;IAChB,CAAC;CACF;AAJD,0BAIC;AAGD,MAAa,KAAiC,SAAQ,mBAAgB;IACpE,YAAY,MAA6B;QACvC,KAAK,CAAC,MAAM,CAAC,CAAC;IAChB,CAAC;CACF;AAJD,sBAIC;AAGD,MAAa,SAAqC,SAAQ,uBAAoB;IAC5E,YAAY,MAAiC;QAC3C,KAAK,CAAC,MAAM,CAAC,CAAC;IAChB,CAAC;CACF;AAJD,8BAIC;AAGD,MAAa,OAAmC,SAAQ,qBAAkB;IACxE,YAAY,MAA+B;QACzC,KAAK,CAAC,MAAM,CAAC,CAAC;IAChB,CAAC;CACF;AAJD,0BAIC"}
+{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../../src/metrics/prometheus/metrics.ts"],"names":[],"mappings":";;;AAQA,6CAKqB;AAOrB,MAAa,OAAmC,SAAQ,qBAAsC;IAC5F,YAAY,MAA+B;QACzC,KAAK,CAAC,MAAM,CAAC,CAAC;IAChB,CAAC;CACF;AAJD,0BAIC;AAGD,MAAa,KAAiC,SAAQ,mBAAgB;IACpE,YAAY,MAA6B;QACvC,KAAK,CAAC,MAAM,CAAC,CAAC;IAChB,CAAC;CACF;AAJD,sBAIC;AAGD,MAAa,SAAqC,SAAQ,uBAAwC;IAChG,YAAY,MAAiC;QAC3C,KAAK,CAAC,MAAM,CAAC,CAAC;IAChB,CAAC;CACF;AAJD,8BAIC;AAGD,MAAa,OAAmC,SAAQ,qBAAkB;IACxE,YAAY,MAA+B;QACzC,KAAK,CAAC,MAAM,CAAC,CAAC;IAChB,CAAC;CACF;AAJD,0BAIC"}

package/dist/otel/sdk.js

@@ -23,6 +23,13 @@ exports.sdk = new sdk_node_1.NodeSDK({
         // It copies baggage info from parent span to child span
         new baggage_span_processor_1.BaggageSpanProcessor(baggage_span_processor_1.ALLOW_ALL_BAGGAGE_KEYS),
     ],
-    instrumentations: [(0, auto_instrumentations_node_1.getNodeAutoInstrumentations)()],
+    instrumentations: [(0, auto_instrumentations_node_1.getNodeAutoInstrumentations)({
+            '@opentelemetry/instrumentation-http': {
+                responseHook: (span, response) => {
+                    if ('setHeader' in response)
+                        response.setHeader('cf-trace-id', span.spanContext().traceId);
+                },
+            },
+        })],
 });
 //# sourceMappingURL=sdk.js.map

package/dist/otel/sdk.js.map

@@ -1 +1 @@
-{"version":3,"file":"sdk.js","sourceRoot":"","sources":["../../src/otel/sdk.ts"],"names":[],"mappings":";;;AAAA,0FAAwF;AACxF,kFAAqG;AACrG,4EAAwE;AACxE,sFAA4E;AAC5E,wDAAkE;AAClE,sDAAkD;AAClD,kEAAmE;AACnE,8EAA8F;AAC9F,oDAAgD;AAEnC,QAAA,GAAG,GAAG,IAAI,kBAAO,CAAC;IAC7B,WAAW,EAAE,4BAAY,CAAC,WAAW;IACrC,mBAAmB,EAAE,IAAI;IACzB,QAAQ,EAAE,IAAA,kCAAsB,EAAC;QAC/B,CAAC,wCAAiB,CAAC,EAAE,4BAAY,CAAC,WAAW;QAC7C,CAAC,2CAAoB,CAAC,EAAE,4BAAY,CAAC,cAAc;KACpD,CAAC;IACF,YAAY,EAAE,IAAI,wCAAkB,EAAE;IACtC,cAAc,EAAE;QACd,IAAI,mCAAkB,CAAC,IAAI,4CAAiB,EAAE,CAAC;QAC/C,wDAAwD;QACxD,IAAI,6CAAoB,CAAC,+CAAsB,CAAC;KACjD;IACD,gBAAgB,EAAE,CAAC,IAAA,wDAA2B,GAAE,CAAC;CAClD,CAAC,CAAC"}
+{"version":3,"file":"sdk.js","sourceRoot":"","sources":["../../src/otel/sdk.ts"],"names":[],"mappings":";;;AAAA,0FAAwF;AACxF,kFAAqG;AACrG,4EAAwE;AACxE,sFAA4E;AAC5E,wDAAkE;AAClE,sDAAkD;AAClD,kEAAmE;AACnE,8EAA8F;AAC9F,oDAAgD;AAEnC,QAAA,GAAG,GAAG,IAAI,kBAAO,CAAC;IAC7B,WAAW,EAAE,4BAAY,CAAC,WAAW;IACrC,mBAAmB,EAAE,IAAI;IACzB,QAAQ,EAAE,IAAA,kCAAsB,EAAC;QAC/B,CAAC,wCAAiB,CAAC,EAAE,4BAAY,CAAC,WAAW;QAC7C,CAAC,2CAAoB,CAAC,EAAE,4BAAY,CAAC,cAAc;KACpD,CAAC;IACF,YAAY,EAAE,IAAI,wCAAkB,EAAE;IACtC,cAAc,EAAE;QACd,IAAI,mCAAkB,CAAC,IAAI,4CAAiB,EAAE,CAAC;QAC/C,wDAAwD;QACxD,IAAI,6CAAoB,CAAC,+CAAsB,CAAC;KACjD;IACD,gBAAgB,EAAE,CAAC,IAAA,wDAA2B,EAAC;YAC7C,qCAAqC,EAAE;gBACrC,YAAY,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE;oBAC/B,IAAI,WAAW,IAAI,QAAQ;wBAAE,QAAQ,CAAC,SAAS,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,CAAC;gBAC7F,CAAC;aACF;SACF,CAAC,CAAC;CACJ,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codefresh-io/cf-telemetry",
-  "version": "2.0.0-alpha.30",
+  "version": "2.0.0-alpha.32",
   "exports": {
     "./init": {
       "import": "./dist/init.mjs",