-
Notifications
You must be signed in to change notification settings - Fork 12
feat(trace): use dynamic composite ratio sampler #1070
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
anuraaga
wants to merge
12
commits into
elastic:main
Choose a base branch
from
anuraaga:composite-sampler
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
2e0f892
feat(trace): use dynamic composite ratio sampler
anuraaga 97f7e25
Add type file
anuraaga 46b6c3d
workaround 'lint:license-files' issue
trentm bf92210
Make it default but not forced
anuraaga 61dbf35
Merge branch 'composite-sampler' of https://github.com/anuraaga/elast…
anuraaga 32dbc64
Finish
anuraaga d231938
Lint
anuraaga 68f4bbd
Merge branch 'main' of https://github.com/elastic/elastic-otel-node i…
anuraaga d8a346f
simply asserts for these tests to just counting spans (as a proxy for…
trentm ee65525
for consideration: do not use initialConfig for lastAppliedConfig; dr…
trentm f1211c1
for consideration: a few more things
trentm aff1225
fix test case
trentm File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,89 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and contributors | ||
* SPDX-License-Identifier: Apache-2.0 | ||
*/ | ||
|
||
const { | ||
createCompositeSampler, | ||
createComposableParentThresholdSampler, | ||
createComposableTraceIDRatioBasedSampler, | ||
} = require('@opentelemetry/sampler-composite'); | ||
|
||
/** | ||
* @typedef {import('@opentelemetry/api').Attributes} Attributes | ||
* @typedef {import('@opentelemetry/api').Context} Context | ||
* @typedef {import('@opentelemetry/api').Link} Link | ||
* @typedef {import('@opentelemetry/api').SpanKind} SpanKind | ||
* @typedef {import('@opentelemetry/sdk-trace-base').Sampler} Sampler | ||
* @typedef {import('@opentelemetry/sdk-trace-base').SamplingResult} SamplingResult | ||
*/ | ||
|
||
/** | ||
* EDOT default sampler, a parent-based ratio sampler which can have its ratio updated dynamically. | ||
* | ||
* @implements {Sampler} | ||
*/ | ||
class DefaultSampler { | ||
#delegate; | ||
|
||
constructor(ratio = 1.0) { | ||
this.#delegate = newSampler(ratio); | ||
} | ||
|
||
/** | ||
* @param {Context} context | ||
* @param {string} traceId | ||
* @param {string} spanName | ||
* @param {SpanKind} spanKind | ||
* @param {Attributes} attributes | ||
* @param {Link[]} links | ||
* @returns {SamplingResult} | ||
*/ | ||
shouldSample(context, traceId, spanName, spanKind, attributes, links) { | ||
return this.#delegate.shouldSample( | ||
context, | ||
traceId, | ||
spanName, | ||
spanKind, | ||
attributes, | ||
links | ||
); | ||
} | ||
|
||
/** | ||
* @param {number} ratio | ||
*/ | ||
setRatio(ratio) { | ||
this.#delegate = newSampler(ratio); | ||
} | ||
|
||
toString() { | ||
return this.#delegate.toString(); | ||
} | ||
} | ||
|
||
/** | ||
* @param {number} ratio A number between 0 and 1 representing the sampling ratio. | ||
*/ | ||
function newSampler(ratio) { | ||
return createCompositeSampler( | ||
createComposableParentThresholdSampler( | ||
createComposableTraceIDRatioBasedSampler(ratio) | ||
) | ||
); | ||
} | ||
|
||
/** | ||
* Creates a default EDOT sampler, which is a parent-based ratio sampler that can have | ||
* its ratio updated dynamically by central config. | ||
* | ||
* @param {number} ratio | ||
* @returns {Sampler} A ratio sampler which can have its ratio updated dynamically. | ||
*/ | ||
function createDefaultSampler(ratio) { | ||
trentm marked this conversation as resolved.
Show resolved
Hide resolved
|
||
return new DefaultSampler(ratio); | ||
} | ||
|
||
module.exports = { | ||
createDefaultSampler, | ||
}; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,6 +9,7 @@ | |
|
||
const { | ||
getBooleanFromEnv, | ||
getNumberFromEnv, | ||
getStringFromEnv, | ||
getStringListFromEnv, | ||
} = require('@opentelemetry/core'); | ||
|
@@ -45,10 +46,12 @@ | |
setupDynConfExporters, | ||
dynConfSpanExporters, | ||
} = require('./dynconf'); | ||
const {createDefaultSampler} = require('./sampler'); | ||
const DISTRO_VERSION = require('../package.json').version; | ||
|
||
/** | ||
* @typedef {import('@opentelemetry/sdk-node').NodeSDKConfiguration} NodeSDKConfiguration | ||
* @typedef {import('@opentelemetry/sdk-trace-base').Sampler} Sampler | ||
*/ | ||
|
||
/** | ||
|
@@ -66,7 +69,7 @@ | |
try { | ||
await shutdownFn(); | ||
} catch (err) { | ||
console.warn('warning: error shutting down OTel SDK', err); | ||
} | ||
process.exit(128 + os.constants.signals.SIGTERM); | ||
}); | ||
|
@@ -76,7 +79,7 @@ | |
try { | ||
await shutdownFn(); | ||
} catch (err) { | ||
console.warn('warning: error shutting down OTel SDK', err); | ||
} | ||
}); | ||
} | ||
|
@@ -241,6 +244,26 @@ | |
|
||
const config = {...defaultConfig, ...cfg}; | ||
|
||
/** @type {Sampler} */ | ||
let sampler = undefined; | ||
let samplingRate = 1.0; | ||
if (!config.sampler && !getStringFromEnv('OTEL_TRACES_SAMPLER')) { | ||
// If the user has not set a sampler via config or env var, use our default sampler. | ||
// First get as string to differentiate between missing and invalid. | ||
if (getStringFromEnv('OTEL_TRACES_SAMPLER_ARG')) { | ||
const samplingRateArg = getNumberFromEnv('OTEL_TRACES_SAMPLER_ARG'); | ||
if (samplingRateArg === undefined) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should also validate the
|
||
log.warn( | ||
`Invalid OTEL_TRACES_SAMPLER_ARG value: ${process.env.OTEL_TRACES_SAMPLER_ARG}. Using default sampling rate of ${samplingRate}` | ||
); | ||
} else { | ||
samplingRate = samplingRateArg; | ||
} | ||
} | ||
sampler = createDefaultSampler(samplingRate); | ||
config.sampler = sampler; | ||
} | ||
|
||
// Some tricks to get a handle on noop signal providers, to be used for | ||
// dynamic configuration. | ||
const tracerProviderProxy = new api.ProxyTracerProvider(); | ||
|
@@ -306,6 +329,8 @@ | |
noopTracerProvider, | ||
// @ts-ignore: Ignore access of private _tracerProvider for now. (TODO) | ||
sdkTracerProvider: sdk._tracerProvider, | ||
sampler, | ||
samplingRate, | ||
contextPropagationOnly, | ||
}); | ||
|
||
|
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and contributors | ||
* SPDX-License-Identifier: Apache-2.0 | ||
*/ | ||
|
||
const {test} = require('tape'); | ||
const {runTestFixtures} = require('./testutils'); | ||
|
||
/** @type {import('./testutils').TestFixture[]} */ | ||
const testFixtures = [ | ||
{ | ||
name: 'OTEL_TRACES_SAMPLER unset (default sampling of 100%)', | ||
args: ['./fixtures/use-http-get.js'], | ||
cwd: __dirname, | ||
env: { | ||
NODE_OPTIONS: '--import=@elastic/opentelemetry-node', | ||
}, | ||
checkTelemetry: (t, col) => { | ||
t.equal(col.sortedSpans.length, 1); | ||
}, | ||
}, | ||
{ | ||
name: 'OTEL_TRACES_SAMPLER unset, OTEL_TRACES_SAMPLER_ARG=0 (no sampling)', | ||
args: ['./fixtures/use-http-get.js'], | ||
cwd: __dirname, | ||
env: { | ||
NODE_OPTIONS: '--import=@elastic/opentelemetry-node', | ||
OTEL_TRACES_SAMPLER_ARG: '0', | ||
}, | ||
checkTelemetry: (t, col) => { | ||
t.equal(col.sortedSpans.length, 0); | ||
}, | ||
}, | ||
{ | ||
name: 'OTEL_TRACES_SAMPLER=always_off, (no sampling)', | ||
args: ['./fixtures/use-http-get.js'], | ||
cwd: __dirname, | ||
env: { | ||
NODE_OPTIONS: '--import=@elastic/opentelemetry-node', | ||
OTEL_TRACES_SAMPLER: 'always_off', | ||
}, | ||
checkTelemetry: (t, col) => { | ||
t.equal(col.sortedSpans.length, 0); | ||
}, | ||
}, | ||
]; | ||
|
||
// ----- main line ----- | ||
|
||
test('OTEL_TRACES_SAMPLER', (suite) => { | ||
runTestFixtures(suite, testFixtures); | ||
suite.end(); | ||
}); |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.