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

Jump to bottom

Merge main into logs #2107

Merged
merged 23 commits into from
Sep 13, 2021
Merged

Merge main into logs #2107

merged 23 commits into from
Sep 13, 2021

Conversation

lzchen
Copy link
Contributor

@lzchen lzchen commented Sep 9, 2021

No description provided.

musicinmybrain and others added 23 commits August 16, 2021 10:45
@musicinmybrain
Handle traceback.format_exception() API change in Python 3.10 (open-t…
1048391 
…elemetry#2018)
@lzchen
Fix sampling comment (open-telemetry#2040)
5e0a465
@musicinmybrain
Fix typos of “it's” where “its” is meant (open-telemetry#2039)
93fa54d
@ocelotl
Remove contextvars workaround (open-telemetry#2009)
4e0642b
@owais
Added support for OTEL_SPAN_ATTRIBUTE_VALUE_LENGTH_LIMIT (open-tele…
2a726e4 
…metry#2044)

Fixes open-telemetry#2045
Fixes open-telemetry#2043
Fixes open-telemetry#2042
Fixes open-telemetry#2041
@owais
Restrict attribute keys to non-empty strings (open-telemetry#2057)
653207d 
According to the spec:

> The attribute key, which MUST be a non-null and non-empty string.

https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/common/common.md
@srikanthccv
Update getting-started guide (open-telemetry#2053)
1bb4439
@blumamir
docs(auto-instrument): add missing pip install in README (open-teleme…
aa1a2ac 
…try#2061)
@owais @lzchen
Fix limit env vars unset/unlimited values (open-telemetry#2054)
b5704d5 
* Added support for `OTEL_SPAN_ATTRIBUTE_VALUE_LENGTH_LIMIT`

Fixes open-telemetry#2045
Fixes open-telemetry#2043
Fixes open-telemetry#2042
Fixes open-telemetry#2041

* SpanLimit: Treat empty value env vars as unset

Fixes open-telemetry#2052

* Update CHANGELOG.md

Co-authored-by: Leighton Chen <lechen@microsoft.com>

Co-authored-by: Leighton Chen <lechen@microsoft.com>
@owais
Add support for OTEL_ATTRIBUTE_VALUE_LENGTH_LIMIT env var (open-tel…
4250078 
…emetry#2056)

* Added support for `OTEL_SPAN_ATTRIBUTE_VALUE_LENGTH_LIMIT`

Fixes open-telemetry#2045
Fixes open-telemetry#2043
Fixes open-telemetry#2042
Fixes open-telemetry#2041
@owais
updating changelogs and version to 1.5.0-0.24b0 (open-telemetry#2069)
3b190f5
@ocelotl
Fix lint (open-telemetry#2076)
4a9567a
@owais
Use exact dep versions in getting started docs tests (open-telemetry#…
c3dfa36 
…2070)
@srikanthccv
Update to semantic conventions v1.6.1 (open-telemetry#2077)
04f74ee 
* Update to semantic conventions v1.6.1

* Add CHANGELOG entry

* Fix lint
@owais
Rename base test assertion methods for consistency (open-telemetry#2084)
b4ebef9 
* Rename base test assertion methods for consistency

* Renamed assertion method

* Updated contrib SHA

* Updated contrib SHA
@ocelotl
Escape reserved characters in baggage keys (open-telemetry#2080)
a36a615 
* Escape reserved characters in baggage keys

Fixes open-telemetry#2072

* Add extract tests

* Fix lint
@ocelotl
Do not count skipped baggage entries (open-telemetry#2079)
91d1900
Update index.rst (open-telemetry#2085)
b76683e
@owais @lzchen
Updated website docs (open-telemetry#2082)
3fdfa6d 
* Updated website docs

* Update docs/getting-started.rst

Co-authored-by: Leighton Chen <lechen@microsoft.com>

Co-authored-by: Leighton Chen <lechen@microsoft.com>
@owais
let's do this (run tests on windows) (open-telemetry#1889)
c1e8a51 
Run tests on Windows in Github CI
@ocelotl @owais
Add pre and post instrument entrypoints (open-telemetry#1983)
08392c8 
* Add pre and post instrument entry points

Fixes open-telemetry#1982


Co-authored-by: Owais Lone <owais@users.noreply.github.com>
@srikanthccv @owais
Do not count invalid attributes for dropped (open-telemetry#2096)
df76b62 
Do not count invalid attributes for dropped


Co-authored-by: Owais Lone <owais@users.noreply.github.com>
@lzchen
Merge branch 'main' of https://github.com/open-telemetry/opentelemetr…
b59f209 
…y-python into merge
@lzchen lzchen requested a review from a team September 9, 2021 22:24
codeboten
codeboten approved these changes Sep 9, 2021
View reviewed changes
Copy link
Contributor

@codeboten codeboten left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@aabmass
Copy link
Member

aabmass commented Sep 10, 2021

@lzchen I am curious, how do you plan to merge this? "Squash and Merge" or "Create a merge commit"?

Since all this code has been reviewed, another option is for a maintainer to just occasionally run git switch <feature-branch> && git merge main && git push or set this up on a schedule with a cron action (not sure if you need a personal access token to do this). Thoughts?

@lzchen lzchen closed this Sep 13, 2021
@lzchen lzchen reopened this Sep 13, 2021
@lzchen lzchen closed this Sep 13, 2021
@lzchen lzchen reopened this Sep 13, 2021
@lzchen
Copy link
Contributor Author

lzchen commented Sep 13, 2021

@aabmass
Squash and merge.

@lzchen lzchen merged commit 2ad1ef8 into open-telemetry:logs Sep 13, 2021
@lzchen lzchen deleted the merge branch September 13, 2021 16:58
@ocelotl ocelotl mentioned this pull request Oct 13, 2021
Closed
@lzchen lzchen mentioned this pull request Oct 15, 2021
Closed
lzchen added a commit to lzchen/opentelemetry-python that referenced this pull request Oct 15, 2021
@lzchen
Merge main into logs (open-telemetry#2107)
128ef53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@codeboten codeboten codeboten approved these changes

@aabmass aabmass aabmass approved these changes

@srikanthccv srikanthccv srikanthccv approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@lzchen @aabmass @codeboten @srikanthccv @musicinmybrain @ocelotl @owais @blumamir