fix(tracing/botocore): fix incorrect context propagation type for SNS #3404

zARODz11z · 2022-03-09T21:23:03Z

Making sure msg attributes are encoded by the tracer (by changing the Type) allows our lambda library to decode the message attribute and create inferred spans for sns and sqs.
Checkout this dd-lambda-python PR for more context.

Checklist

Added to the correct milestone.
Tests provided or description of manual testing performed is included in the code or PR.
Library documentation is updated.
Corp site documentation is updated (link to the PR).

…_sns_send_message_trace_injection_with_message_attributes to new b64 sns encryption

ddtrace/contrib/botocore/patch.py

tests/contrib/botocore/test.py

releasenotes/notes/encode-sns-msg-attributes-as-b64-7818aec10f533534.yaml

…tes exceeded

…would skip trace injection of a sqs record.

…533534.yaml upgrade->fixes Co-authored-by: Brett Langdon <[email protected]>

…533534.yaml Co-authored-by: Brett Langdon <[email protected]>

…_with_b64_message_attributes test

zARODz11z · 2022-03-11T15:32:30Z

riot run -s mypy check seems to be failing unrelated to my changes https://app.circleci.com/pipelines/github/DataDog/dd-trace-py/15330/workflows/9432100c-9088-47ba-b103-6f8c272cf13f/jobs/1060167/parallel-runs/0/steps/0-105

brettlangdon · 2022-03-11T18:52:16Z

riot run -s mypy check seems to be failing unrelated to my changes https://app.circleci.com/pipelines/github/DataDog/dd-trace-py/15330/workflows/9432100c-9088-47ba-b103-6f8c272cf13f/jobs/1060167/parallel-runs/0/steps/0-105

Try rebasing your branch. mypy released a new version today, but we already fixed in the repo

brettlangdon

lgtm, if you can rebase from 1.x and mark the PR as ready!

…ar/sns-use-b64

…#3404) Making sure msg attributes are encoded by the tracer (by changing the Type) allows our lambda library to decode the message attribute and create inferred spans for sns and sqs. Checkout this dd-lambda-python [PR](DataDog/datadog-lambda-python#211) for more context. ## Checklist - [ ] Added to the correct milestone. - [ ] Tests provided or description of manual testing performed is included in the code or PR. - [ ] Library documentation is updated. - [ ] [Corp site](https://github.com/DataDog/documentation/) documentation is updated (link to the PR). (cherry picked from commit bd8e176)

mergify · 2022-03-22T13:57:37Z

backport 0.60

✅ Backports have been created

#3462 fix(tracing/botocore): fix incorrect context propagation type for SNS (backport #3404) has been created for branch 0.60

mergify · 2022-03-22T13:57:45Z

backport 0.58

✅ Backports have been created

#3463 fix(tracing/botocore): fix incorrect context propagation type for SNS (backport #3404) has been created for branch 0.58

…#3404) Making sure msg attributes are encoded by the tracer (by changing the Type) allows our lambda library to decode the message attribute and create inferred spans for sns and sqs. Checkout this dd-lambda-python [PR](DataDog/datadog-lambda-python#211) for more context. ## Checklist - [ ] Added to the correct milestone. - [ ] Tests provided or description of manual testing performed is included in the code or PR. - [ ] Library documentation is updated. - [ ] [Corp site](https://github.com/DataDog/documentation/) documentation is updated (link to the PR). (cherry picked from commit bd8e176)

mergify · 2022-03-22T13:58:01Z

backport 0.x 1.0

✅ Backports have been created

#3464 fix(tracing/botocore): fix incorrect context propagation type for SNS (backport #3404) has been created for branch 0.x
#3465 fix(tracing/botocore): fix incorrect context propagation type for SNS (backport #3404) has been created for branch 1.0

…#3404) Making sure msg attributes are encoded by the tracer (by changing the Type) allows our lambda library to decode the message attribute and create inferred spans for sns and sqs. Checkout this dd-lambda-python [PR](DataDog/datadog-lambda-python#211) for more context. ## Checklist - [ ] Added to the correct milestone. - [ ] Tests provided or description of manual testing performed is included in the code or PR. - [ ] Library documentation is updated. - [ ] [Corp site](https://github.com/DataDog/documentation/) documentation is updated (link to the PR). (cherry picked from commit bd8e176)

mergify · 2022-03-22T13:58:09Z

backport 0.59

✅ Backports have been created

#3466 fix(tracing/botocore): fix incorrect context propagation type for SNS (backport #3404) has been created for branch 0.59

… (backport #3404) (#3464) This is an automatic backport of pull request #3404 done by [Mergify](https://mergify.com). --- <details> <summary>Mergify commands and options</summary> <br /> More conditions and actions can be found in the [documentation](https://docs.mergify.com/). You can also trigger Mergify actions by commenting on this pull request: - `@Mergifyio refresh` will re-evaluate the rules - `@Mergifyio rebase` will rebase this PR on its base branch - `@Mergifyio update` will merge the base branch into this PR - `@Mergifyio backport <destination>` will backport this PR on `<destination>` branch Additionally, on Mergify [dashboard](https://dashboard.mergify.com/) you can: - look at your merge queues - generate the Mergify configuration with the config editor. Finally, you can contact us on https://mergify.com </details>

… (backport #3404) (#3462) This is an automatic backport of pull request #3404 done by [Mergify](https://mergify.com). --- <details> <summary>Mergify commands and options</summary> <br /> More conditions and actions can be found in the [documentation](https://docs.mergify.com/). You can also trigger Mergify actions by commenting on this pull request: - `@Mergifyio refresh` will re-evaluate the rules - `@Mergifyio rebase` will rebase this PR on its base branch - `@Mergifyio update` will merge the base branch into this PR - `@Mergifyio backport <destination>` will backport this PR on `<destination>` branch Additionally, on Mergify [dashboard](https://dashboard.mergify.com/) you can: - look at your merge queues - generate the Mergify configuration with the config editor. Finally, you can contact us on https://mergify.com </details>

… (backport #3404) (#3466) This is an automatic backport of pull request #3404 done by [Mergify](https://mergify.com). --- <details> <summary>Mergify commands and options</summary> <br /> More conditions and actions can be found in the [documentation](https://docs.mergify.com/). You can also trigger Mergify actions by commenting on this pull request: - `@Mergifyio refresh` will re-evaluate the rules - `@Mergifyio rebase` will rebase this PR on its base branch - `@Mergifyio update` will merge the base branch into this PR - `@Mergifyio backport <destination>` will backport this PR on `<destination>` branch Additionally, on Mergify [dashboard](https://dashboard.mergify.com/) you can: - look at your merge queues - generate the Mergify configuration with the config editor. Finally, you can contact us on https://mergify.com </details>

… (backport #3404) (#3465) This is an automatic backport of pull request #3404 done by [Mergify](https://mergify.com). --- <details> <summary>Mergify commands and options</summary> <br /> More conditions and actions can be found in the [documentation](https://docs.mergify.com/). You can also trigger Mergify actions by commenting on this pull request: - `@Mergifyio refresh` will re-evaluate the rules - `@Mergifyio rebase` will rebase this PR on its base branch - `@Mergifyio update` will merge the base branch into this PR - `@Mergifyio backport <destination>` will backport this PR on `<destination>` branch Additionally, on Mergify [dashboard](https://dashboard.mergify.com/) you can: - look at your merge queues - generate the Mergify configuration with the config editor. Finally, you can contact us on https://mergify.com </details>

Change DataType to binary and Value to BinaryValue

e1497de

zARODz11z mentioned this pull request Mar 9, 2022

Cover string/b64 msg attribute trace extraction DataDog/datadog-lambda-python#211

Merged

11 tasks

zARODz11z added 4 commits March 9, 2022 17:53

inject trace based on event_source

70e0924

seperate sns and sqs encoding logic with if statement and modify test…

58cba04

…_sns_send_message_trace_injection_with_message_attributes to new b64 sns encryption

fix typo

2b52760

add reno release note

270f68e

zARODz11z changed the title ~~Change DataType to binary and Value to BinaryValue~~ fix: Encode SNS as B64 Mar 10, 2022

brettlangdon reviewed Mar 10, 2022

View reviewed changes

zARODz11z and others added 10 commits March 10, 2022 15:29

add comment explaining eventSource vs EventSource

bbed931

readd skipping trace injection warning when max number of msg attribu…

ea54765

…tes exceeded

Add comments explaining why we use String vs Binary aswell as why we …

3ef7345

…would skip trace injection of a sqs record.

remove commented out code

6fb455f

make sure casing matches SNS and SQS lambda payloads

b367338

eventSource to event source in warning

b012b16

Update releasenotes/notes/encode-sns-msg-attributes-as-b64-7818aec10f…

93dccf0

…533534.yaml upgrade->fixes Co-authored-by: Brett Langdon <[email protected]>

Update releasenotes/notes/encode-sns-msg-attributes-as-b64-7818aec10f…

b1908da

…533534.yaml Co-authored-by: Brett Langdon <[email protected]>

testing

d6114cb

use b64decode and json.loads in test_sns_send_message_trace_injection…

c14f1fb

…_with_b64_message_attributes test

zARODz11z changed the title ~~fix: Encode SNS as B64~~ fix: encode sns as b64 Mar 10, 2022

zARODz11z and others added 2 commits March 10, 2022 18:46

flake fix

c5048c5

riot run -s fmt

814987f

Merge branch '1.x' into ar/sns-use-b64

1f1d6c6

zARODz11z marked this pull request as ready for review March 11, 2022 15:35

zARODz11z requested a review from a team as a code owner March 11, 2022 15:35

zARODz11z marked this pull request as draft March 11, 2022 16:16

brettlangdon changed the title ~~fix: encode sns as b64~~ fox(tracing/botocore): fix incorrect context propagation type for SNS Mar 11, 2022

brettlangdon reviewed Mar 11, 2022

View reviewed changes

brettlangdon changed the title ~~fox(tracing/botocore): fix incorrect context propagation type for SNS~~ fix(tracing/botocore): fix incorrect context propagation type for SNS Mar 11, 2022

brettlangdon and others added 3 commits March 21, 2022 11:18

Merge branch '1.x' into ar/sns-use-b64

b2eb59c

add .decode() before json.loads to pass python3.5 unit tests

3154e10

Merge branch 'ar/sns-use-b64' of github.com:DataDog/dd-trace-py into …

ecd0ce8

…ar/sns-use-b64

brettlangdon approved these changes Mar 21, 2022

View reviewed changes

Merge branch '1.x' into ar/sns-use-b64

2485b90

zARODz11z requested a review from mabdinur March 22, 2022 12:53

P403n1x87 approved these changes Mar 22, 2022

View reviewed changes

mabdinur approved these changes Mar 22, 2022

View reviewed changes

mergify bot merged commit bd8e176 into 1.x Mar 22, 2022

mergify bot deleted the ar/sns-use-b64 branch March 22, 2022 13:57

mergify bot mentioned this pull request Mar 22, 2022

fix(tracing/botocore): fix incorrect context propagation type for SNS (backport #3404) #3462

Merged

mergify bot mentioned this pull request Mar 22, 2022

fix(tracing/botocore): fix incorrect context propagation type for SNS (backport #3404) #3463

Closed

mergify bot mentioned this pull request Mar 22, 2022

fix(tracing/botocore): fix incorrect context propagation type for SNS (backport #3404) #3464

Merged

mergify bot mentioned this pull request Mar 22, 2022

fix(tracing/botocore): fix incorrect context propagation type for SNS (backport #3404) #3465

Merged

mergify bot mentioned this pull request Mar 22, 2022

fix(tracing/botocore): fix incorrect context propagation type for SNS (backport #3404) #3466

Merged

brettlangdon mentioned this pull request Mar 22, 2022

botocore distributed tracing breaks SNS filter policies (by exposing an AWS bug) #3384

Closed

jnyrup mentioned this pull request Jun 28, 2023

Invalid MessageAttributes on SNS DataDog/dd-trace-dotnet#4316

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

fix(tracing/botocore): fix incorrect context propagation type for SNS #3404

fix(tracing/botocore): fix incorrect context propagation type for SNS #3404

Uh oh!

zARODz11z commented Mar 9, 2022 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

zARODz11z commented Mar 11, 2022

Uh oh!

brettlangdon commented Mar 11, 2022

Uh oh!

brettlangdon left a comment

Uh oh!

mergify bot commented Mar 22, 2022

Uh oh!

mergify bot commented Mar 22, 2022

Uh oh!

mergify bot commented Mar 22, 2022

Uh oh!

mergify bot commented Mar 22, 2022

Uh oh!

Uh oh!

fix(tracing/botocore): fix incorrect context propagation type for SNS #3404

fix(tracing/botocore): fix incorrect context propagation type for SNS #3404

Uh oh!

Conversation

zARODz11z commented Mar 9, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Checklist

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

zARODz11z commented Mar 11, 2022

Uh oh!

brettlangdon commented Mar 11, 2022

Uh oh!

brettlangdon left a comment

Choose a reason for hiding this comment

Uh oh!

mergify bot commented Mar 22, 2022

✅ Backports have been created

Uh oh!

mergify bot commented Mar 22, 2022

✅ Backports have been created

Uh oh!

mergify bot commented Mar 22, 2022

✅ Backports have been created

Uh oh!

mergify bot commented Mar 22, 2022

✅ Backports have been created

Uh oh!

Uh oh!

zARODz11z commented Mar 9, 2022 •

edited

Loading