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: spantypes in ddtrace1.0 #3192

Merged

mergify merged 1 commit into 1.0-dev from munir/1.0-dev/fix-flake9-spantypes

Jan 27, 2022

Contributor

mabdinur commented Jan 27, 2022 •

edited

Loading

fixes flake8 error introduced by a merge conflict

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).


fix(ci): flake8 error introduced by merge conflict

ff1b256

mabdinur requested a review from a team as a code owner

January 27, 2022 15:21

mabdinur changed the base branch from master to 1.0-dev

January 27, 2022 15:22

Kyle-Verhoog approved these changes

View reviewed changes

mabdinur changed the title ~~fix: spantypes merge conflict~~ fix: spantypes in ddtrace1.0

brettlangdon approved these changes

View reviewed changes

Member

brettlangdon commented Jan 27, 2022

Does this need a release note?

mergify bot merged commit 4162e16 into 1.0-dev

mergify bot deleted the munir/1.0-dev/fix-flake9-spantypes branch

January 27, 2022 22:02

majorgreys pushed a commit to majorgreys/dd-trace-py that referenced this pull request


fix: spantypes in ddtrace1.0 (DataDog#3192)

4211f7d

fixes flake8 error introduced by a merge conflict
## 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).

brettlangdon pushed a commit that referenced this pull request


fix: spantypes in ddtrace1.0 (#3192)

fb209be

fixes flake8 error introduced by a merge conflict
## 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).

brettlangdon pushed a commit that referenced this pull request


fix: spantypes in ddtrace1.0 (#3192)

42f495f

fixes flake8 error introduced by a merge conflict
## 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).

majorgreys mentioned this pull request

fix(appsec): ddtrace.ext.SpanTypes not an Enum #3220

Merged

mergify bot pushed a commit that referenced this pull request


fix(appsec): ddtrace.ext.SpanTypes not an Enum (#3220)

e39b57f

Update from #3192 given new code added by #3027.

brettlangdon pushed a commit that referenced this pull request


fix: spantypes in ddtrace1.0 (#3192)

937399b

fixes flake8 error introduced by a merge conflict
## 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).

brettlangdon pushed a commit that referenced this pull request


fix(appsec): ddtrace.ext.SpanTypes not an Enum (#3220)

cf4532d

Update from #3192 given new code added by #3027.

brettlangdon pushed a commit that referenced this pull request


fix: spantypes in ddtrace1.0 (#3192)

6e4836d

fixes flake8 error introduced by a merge conflict
## 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).

brettlangdon pushed a commit that referenced this pull request


fix(appsec): ddtrace.ext.SpanTypes not an Enum (#3220)

3b435dd

Update from #3192 given new code added by #3027.

majorgreys pushed a commit that referenced this pull request


fix: spantypes in ddtrace1.0 (#3192)

545ffc7

fixes flake8 error introduced by a merge conflict
## 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).

majorgreys added a commit that referenced this pull request


fix(appsec): ddtrace.ext.SpanTypes not an Enum (#3220)

a8f2fa8

Update from #3192 given new code added by #3027.

majorgreys pushed a commit that referenced this pull request


fix: spantypes in ddtrace1.0 (#3192)

a94a61f

fixes flake8 error introduced by a merge conflict
## 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).

majorgreys added a commit that referenced this pull request


fix(appsec): ddtrace.ext.SpanTypes not an Enum (#3220)

927a468

Update from #3192 given new code added by #3027.

majorgreys pushed a commit that referenced this pull request


fix: spantypes in ddtrace1.0 (#3192)

e1eccd9

fixes flake8 error introduced by a merge conflict
## 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).

majorgreys added a commit that referenced this pull request


fix(appsec): ddtrace.ext.SpanTypes not an Enum (#3220)

9e135b3

Update from #3192 given new code added by #3027.

majorgreys pushed a commit that referenced this pull request


fix: spantypes in ddtrace1.0 (#3192)

64a003b

fixes flake8 error introduced by a merge conflict
## 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).

majorgreys added a commit that referenced this pull request


fix(appsec): ddtrace.ext.SpanTypes not an Enum (#3220)

88d2461

Update from #3192 given new code added by #3027.

majorgreys pushed a commit that referenced this pull request


fix: spantypes in ddtrace1.0 (#3192)

0b50b06

fixes flake8 error introduced by a merge conflict
## 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).

majorgreys added a commit that referenced this pull request


fix(appsec): ddtrace.ext.SpanTypes not an Enum (#3220)

cd6abc6

Update from #3192 given new code added by #3027.

majorgreys pushed a commit that referenced this pull request


fix: spantypes in ddtrace1.0 (#3192)

d200ba9

fixes flake8 error introduced by a merge conflict
## 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).

majorgreys added a commit that referenced this pull request


fix(appsec): ddtrace.ext.SpanTypes not an Enum (#3220)

214f5b5

Update from #3192 given new code added by #3027.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment