Skip to content
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

fix(aws-sdk): avoid repeating MessageAttributeNames in sqs receiveMessage #1044

Merged
merged 12 commits into from
Jun 10, 2022
Merged

fix(aws-sdk): avoid repeating MessageAttributeNames in sqs receiveMessage #1044

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b0fed52
fix(instrumentation-aws-sdk): dedupe prop fields
JamieDanielson May 31, 2022
7155304
fix linting
MikeGoldsmith Jun 1, 2022
80e50df
add test for message attributes
JamieDanielson Jun 3, 2022
b747f84
test both messages
JamieDanielson Jun 3, 2022
d7db9a3
deduplicate message attribute names in seperate function and add unit…
pkanal Jun 6, 2022
c0b7e48
remove line to force ci checks
JamieDanielson Jun 6, 2022
b75b319
appease linter
JamieDanielson Jun 6, 2022
abc9f56
appease linter
JamieDanielson Jun 6, 2022
d50acc7
move logic into dedupe function and add unit tests
pkanal Jun 8, 2022
88cc73e
rename helper function to be more descriptive
pkanal Jun 8, 2022
0e02b30
Merge branch 'main' into aws-sdk-sqs
MikeGoldsmith Jun 10, 2022
f3e4e41
Merge branch 'main' into aws-sdk-sqs
pkanal Jun 10, 2022
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
6 changes: 6 additions & 0 deletions plugins/node/opentelemetry-instrumentation-aws-sdk/src/services/MessageAttributes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,3 +106,9 @@ export const extractPropagationContext = (
}
return undefined;
};

export const deduplicateMessageAttributeNames = (messageAttributeNames: string[]) => {
return Array.from(
new Set(messageAttributeNames)
);
};
11 changes: 8 additions & 3 deletions plugins/node/opentelemetry-instrumentation-aws-sdk/src/services/sqs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import {
contextGetter,
extractPropagationContext,
injectPropagationContext,
deduplicateMessageAttributeNames
} from './MessageAttributes';

export class SqsServiceExtension implements ServiceExtension {
Expand Down Expand Up @@ -67,9 +68,13 @@ export class SqsServiceExtension implements ServiceExtension {
spanAttributes[SemanticAttributes.MESSAGING_OPERATION] =
MessagingOperationValues.RECEIVE;

request.commandInput.MessageAttributeNames = (
request.commandInput.MessageAttributeNames ?? []
).concat(propagation.fields());
const messageAttributeNames = request.commandInput.MessageAttributeNames ?
deduplicateMessageAttributeNames(request.commandInput.MessageAttributeNames) : [];

request.commandInput.MessageAttributeNames = [
...messageAttributeNames,
...propagation.fields()
blumamir marked this conversation as resolved.
Show resolved Hide resolved
];
}
blumamir marked this conversation as resolved.
Show resolved Hide resolved
break;

Expand Down
8 changes: 8 additions & 0 deletions plugins/node/opentelemetry-instrumentation-aws-sdk/test/MessageAttributes.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import {
MAX_MESSAGE_ATTRIBUTES,
contextSetter,
injectPropagationContext,
deduplicateMessageAttributeNames
} from '../src/services/MessageAttributes';

describe('MessageAttributes', () => {
Expand Down Expand Up @@ -76,4 +77,11 @@ describe('MessageAttributes', () => {
expect(Object.keys(contextAttributes).length).toBe(10);
});
});

describe.only('deduplicateMessageAttributeNames', () => {
it('should remove duplicate message attribute names', () => {
const messageAttributeNames = ["name 1", "name 2", "name 1"];
expect(deduplicateMessageAttributeNames(messageAttributeNames)).toEqual(["name 1", "name 2"]);
})
});
});