Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 17 additions & 25 deletions packages/opentelemetry-node/lib/sdk-metrics.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

// Gets the SDK configuration and updates it to have instruments
// to collect metrics related to the SDK like:
// to collect metrics related to the SDK, for now:
// - otel.sdk.span.live
// - otel.sdk.span.ended

Expand All @@ -13,7 +13,6 @@ const {
METRIC_OTEL_SDK_SPAN_ENDED,
METRIC_OTEL_SDK_SPAN_LIVE,
ATTR_OTEL_SPAN_SAMPLING_RESULT,
OTEL_SPAN_SAMPLING_RESULT_VALUE_DROP,
OTEL_SPAN_SAMPLING_RESULT_VALUE_RECORD_AND_SAMPLE,
OTEL_SPAN_SAMPLING_RESULT_VALUE_RECORD_ONLY,
} = require('./semconv');
Expand All @@ -22,6 +21,8 @@ const {
* @typedef {import('@opentelemetry/api').Meter} Meter
* @typedef {import('@opentelemetry/api').UpDownCounter} UpDownCounter
* @typedef {import('@opentelemetry/api').Counter} Counter
* @typedef {import('@opentelemetry/sdk-trace-base').Span} Span
* @typedef {import('@opentelemetry/sdk-trace-base').ReadableSpan} ReadableSpan
* @typedef {import('@opentelemetry/sdk-trace-base').SpanProcessor} SpanProcessor
*/

Expand All @@ -46,6 +47,8 @@ function getSpansMeter() {
if (selfMetricsMeter) {
return selfMetricsMeter;
}
// NOTE: we have a metter for a single scope which is the EDOT package
// TODO: check WWJD (what would Java do?)
selfMetricsMeter = metrics.getMeter(ELASTIC_SDK_SCOPE, ELASTIC_SDK_VERSION);
return selfMetricsMeter;
}
Expand Down Expand Up @@ -79,45 +82,34 @@ function getEndedSpansCounter() {
}

/**
* @param {any} span - an Span form the API or a ReadableSpan from the trace SDK
* All Spans treated in SpanProcessors are recording so here none will have
* a "DROP" sampling result
* @param {Span | ReadableSpan} span
* @returns {string}
*/
function getSamplingResult(span) {
let result;
const isRecording =
typeof span.isRecording === 'function'
? span.isRecording()
: !span.ended;

if (isRecording) {
const isSampled = span.spanContext().traceFlags & TraceFlags.SAMPLED;
result = isSampled
? OTEL_SPAN_SAMPLING_RESULT_VALUE_RECORD_AND_SAMPLE
: OTEL_SPAN_SAMPLING_RESULT_VALUE_RECORD_ONLY;
} else {
result = OTEL_SPAN_SAMPLING_RESULT_VALUE_DROP;
}

return result;
const isSampled = span.spanContext().traceFlags & TraceFlags.SAMPLED;
return isSampled
? OTEL_SPAN_SAMPLING_RESULT_VALUE_RECORD_AND_SAMPLE
: OTEL_SPAN_SAMPLING_RESULT_VALUE_RECORD_ONLY;
}

/** @type {SpanProcessor} */
const spanMetricsProcessor = {
forceFlush: function () {
return Promise.resolve();
},
onStart: function (span, parentContext) {
onStart: function (span) {
getLiveSpansCounter().add(1, {
[ATTR_OTEL_SPAN_SAMPLING_RESULT]: getSamplingResult(span),
});
},
onEnd: function (span) {
getLiveSpansCounter().add(-1, {
const attrs = {
[ATTR_OTEL_SPAN_SAMPLING_RESULT]: getSamplingResult(span),
});
getEndedSpansCounter().add(1, {
[ATTR_OTEL_SPAN_SAMPLING_RESULT]: getSamplingResult(span),
});
};
getLiveSpansCounter().add(-1, attrs);
getEndedSpansCounter().add(1, attrs);
},
shutdown: function () {
return Promise.resolve();
Expand Down
9 changes: 5 additions & 4 deletions packages/opentelemetry-node/lib/sdk.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
try {
await shutdownFn();
} catch (err) {
console.warn('warning: error shutting down OTel SDK', err);

Check warning on line 60 in packages/opentelemetry-node/lib/sdk.js

View workflow job for this annotation

GitHub Actions / lint

Unexpected console statement
}
process.exit(128 + os.constants.signals.SIGTERM);
});
Expand All @@ -67,7 +67,7 @@
try {
await shutdownFn();
} catch (err) {
console.warn('warning: error shutting down OTel SDK', err);

Check warning on line 70 in packages/opentelemetry-node/lib/sdk.js

View workflow job for this annotation

GitHub Actions / lint

Unexpected console statement
}
});
}
Expand Down Expand Up @@ -195,15 +195,16 @@
aggregation: {type: AggregationType.DROP},
},
];

// Configure OTEL SDK metrics
// ref: https://github.com/open-telemetry/semantic-conventions/blob/main/model/otel/metrics.yaml
setupSdkMetrics(defaultConfig);
}

const config = Object.assign(defaultConfig, cfg);

setupEnvironment();
if (metricsEnabled) {
// Configure OTEL SDK metrics
// ref: https://github.com/open-telemetry/semantic-conventions/blob/main/model/otel/metrics.yaml
setupSdkMetrics(config);
}
const sdk = new NodeSDK(config);

// TODO perhaps include some choice resource attrs in this log (sync ones): service.name, deployment.environment.name
Expand Down
6 changes: 0 additions & 6 deletions packages/opentelemetry-node/lib/semconv.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,6 @@ const METRIC_OTEL_SDK_SPAN_LIVE = 'otel.sdk.span.live';
*/
const ATTR_OTEL_SPAN_SAMPLING_RESULT = 'otel.span.sampling_result';

/**
* Enum value "DROP" for attribute {@link ATTR_OTEL_SPAN_SAMPLING_RESULT}.
*/
const OTEL_SPAN_SAMPLING_RESULT_VALUE_DROP = 'DROP';

/**
* Enum value "RECORD_AND_SAMPLE" for attribute {@link ATTR_OTEL_SPAN_SAMPLING_RESULT}.
*/
Expand All @@ -84,7 +79,6 @@ module.exports = {
METRIC_OTEL_SDK_SPAN_ENDED,
METRIC_OTEL_SDK_SPAN_LIVE,
ATTR_OTEL_SPAN_SAMPLING_RESULT,
OTEL_SPAN_SAMPLING_RESULT_VALUE_DROP,
OTEL_SPAN_SAMPLING_RESULT_VALUE_RECORD_AND_SAMPLE,
OTEL_SPAN_SAMPLING_RESULT_VALUE_RECORD_ONLY,
};
Loading