Skip to content

feat(instrumentation-ioredis): add requireParentSpan option to config #372

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.

Sign up for GitHub

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

Merged
naseemkullah merged 4 commits into from
Mar 4, 2021
Merged

feat(instrumentation-ioredis): add requireParentSpan option to config #372

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aa55a50
feat(instrumentation-ioredis): add requireParentSpan option to config
Mar 3, 2021
060da2f
style(instrumentation-ioredis): fix lint
Mar 3, 2021
245efa3
style(instrumentation-ioredis): use default config
Mar 4, 2021
310e21a
Merge branch 'main' of https://github.com/open-telemetry/opentelemetr…
Mar 4, 2021
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
Prev Previous commit
Next Next commit
style(instrumentation-ioredis): use default config
  • Loading branch information
Amir Blum committed Mar 4, 2021
commit 245efa3416372162089fcaf480ca558d4d08fa64
12 changes: 10 additions & 2 deletions plugins/node/opentelemetry-instrumentation-ioredis/src/ioredis.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,22 @@ import { IORedisInstrumentationConfig } from './types';
import { traceConnection, traceSendCommand } from './utils';
import { VERSION } from './version';

const DEFAULT_CONFIG: IORedisInstrumentationConfig = {
requireParentSpan: true,
};

export class IORedisInstrumentation extends InstrumentationBase<
typeof ioredisTypes
> {
static readonly DB_SYSTEM = 'redis';
readonly supportedVersions = ['>1 <5'];

constructor(protected _config: IORedisInstrumentationConfig = {}) {
super('@opentelemetry/instrumentation-ioredis', VERSION, _config);
constructor(_config: IORedisInstrumentationConfig = {}) {
super(
'@opentelemetry/instrumentation-ioredis',
VERSION,
Object.assign({}, DEFAULT_CONFIG, _config)
);
}

init(): InstrumentationNodeModuleDefinition<typeof ioredisTypes>[] {
Expand Down
8 changes: 3 additions & 5 deletions plugins/node/opentelemetry-instrumentation-ioredis/src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,9 @@ export const traceSendCommand = (
if (arguments.length < 1 || typeof cmd !== 'object') {
return original.apply(this, arguments);
}
// Do not trace if there is not parent span
if (
config?.requireParentSpan !== false &&
getSpan(context.active()) === undefined
) {

const hasNoParentSpan = getSpan(context.active()) === undefined;
if (config?.requireParentSpan === true && hasNoParentSpan) {
return original.apply(this, arguments);
}

Expand Down