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.

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): calc propagation fields count before context inject #738

Merged
merged 6 commits into from
Jan 14, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,10 @@ export const injectPropagationContext = (
attributesMap?: SQS.MessageBodyAttributeMap | SNS.MessageAttributeMap
): SQS.MessageBodyAttributeMap | SNS.MessageAttributeMap => {
const attributes = attributesMap ?? {};
if (Object.keys(attributes).length < MAX_MESSAGE_ATTRIBUTES) {
if (
Object.keys(attributes).length + propagation.fields().length <=
MAX_MESSAGE_ATTRIBUTES
) {
propagation.inject(context.active(), attributes, contextSetter);
} else {
diag.warn(
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
/*
* Copyright The OpenTelemetry Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

import * as expect from 'expect';
import {
MAX_MESSAGE_ATTRIBUTES,
contextSetter,
injectPropagationContext,
} from '../src/services/MessageAttributes';

describe('MessageAttributes', () => {
describe('MAX_MESSAGE_ATTRIBUTES', () => {
it('should be 10', () => {
expect(MAX_MESSAGE_ATTRIBUTES).toBe(10);
});
});

describe('contextSetter', () => {
it('should set parent context in sqs receive callback', () => {
const contextKey = 'key';
const contextValue = 'value';
const contextCarrier = {};
contextSetter.set(contextCarrier, contextKey, contextValue);

const expectedContext = {
[contextKey]: { DataType: 'String', StringValue: contextValue },
};
expect(contextCarrier).toStrictEqual(expectedContext);
});
});

describe('injectPropagationContext', () => {
it('should inject context if there are available attributes', () => {
const contextAttributes = {
key1: { DataType: 'String', StringValue: 'value1' },
key2: { DataType: 'String', StringValue: 'value2' },
key3: { DataType: 'String', StringValue: 'value3' },
key4: { DataType: 'String', StringValue: 'value4' },
key5: { DataType: 'String', StringValue: 'value5' },
};

expect(Object.keys(contextAttributes).length).toBe(5);
injectPropagationContext(contextAttributes);
expect(Object.keys(contextAttributes).length).toBeGreaterThan(5);
});

it('should not inject context if there not enough available attributes', () => {
const contextAttributes = {
key1: { DataType: 'String', StringValue: 'value1' },
key2: { DataType: 'String', StringValue: 'value2' },
key3: { DataType: 'String', StringValue: 'value3' },
key4: { DataType: 'String', StringValue: 'value4' },
key5: { DataType: 'String', StringValue: 'value5' },
key6: { DataType: 'String', StringValue: 'value6' },
key7: { DataType: 'String', StringValue: 'value7' },
key8: { DataType: 'String', StringValue: 'value8' },
key9: { DataType: 'String', StringValue: 'value9' },
key10: { DataType: 'String', StringValue: 'value10' },
};

expect(Object.keys(contextAttributes).length).toBe(10);
injectPropagationContext(contextAttributes);
expect(Object.keys(contextAttributes).length).toBe(10);
});
});
});