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

Fixing inescapable character bug for Windows path string #1100

Merged
merged 21 commits into from
Jun 3, 2022
Merged

Fixing inescapable character bug for Windows path string #1100

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
ea0cf3f
Adding escape call to sitecustomize sub call.
jeremydvoss May 19, 2022
764a784
Update CHANGLOG
jeremydvoss May 19, 2022
1dfd150
Ran tox -e generate which corrected import order
jeremydvoss May 20, 2022
b178282
Update CHANGELOG.md
jeremydvoss May 23, 2022
f6001c6
Merge branch 'main' into jerevoss
ocelotl May 25, 2022
a0b731c
Refactored removal of dir from PYTHONPATH into separate function
jeremydvoss May 25, 2022
f8870ee
Merge branch 'main' into jerevoss
jeremydvoss May 27, 2022
1aed29b
Fixed bug where ? is escaped instead of just the directory path
jeremydvoss May 27, 2022
25a17e6
Added Fixed tag that was accidentally removed it Resolve Conflicts
jeremydvoss May 27, 2022
d4c92a0
Merge branch 'main' into jerevoss
lzchen May 31, 2022
bcac672
Merge branch 'main' into jerevoss
jeremydvoss May 31, 2022
b04bc61
Tests run. Assert statement fails
jeremydvoss May 31, 2022
5cfc06c
Removed os-specific calls out of function so tests can run on any os
jeremydvoss Jun 1, 2022
15580e5
Removed os-specific calls out of function so tests can run on any os
jeremydvoss Jun 1, 2022
e6c5b3a
Narrow protobuf dependency to exclude protobuf >= 4 (#1109)
TBBle May 26, 2022
cd66c71
updated type hints for getters and setters (#1106)
alanisaac May 29, 2022
17fbb6d
Update CHANGELOG.md
jeremydvoss Jun 2, 2022
66a8c2d
Update opentelemetry-instrumentation/tests/test_utils.py
jeremydvoss Jun 2, 2022
fea8e67
Fixing newline at end of file and test typo
jeremydvoss Jun 2, 2022
6cb5b35
Merge branch 'main' into jerevoss
jeremydvoss Jun 3, 2022
a9d2e86
Fixing redifinition of built-in dir
jeremydvoss Jun 3, 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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased](https://github.com/open-telemetry/opentelemetry-python/compare/v1.12.0rc1-0.31b0...HEAD)

- Adding escape call to fix [auto-instrumentation not producing spans on Windows](https://github.com/open-telemetry/opentelemetry-python/issues/2703).
([#1098](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1098))
srikanthccv marked this conversation as resolved.
Show resolved Hide resolved

## [1.12.0rc1-0.31b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.12.0rc1-0.31b0) - 2022-05-17


Expand Down
4 changes: 2 additions & 2 deletions ...y-instrumentation/src/opentelemetry/instrumentation/auto_instrumentation/sitecustomize.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from logging import getLogger
from os import environ
from os.path import abspath, dirname, pathsep
from re import sub
from re import sub, escape

from pkg_resources import iter_entry_points

Expand Down Expand Up @@ -112,7 +112,7 @@ def _load_configurators():
def initialize():
# prevents auto-instrumentation of subprocesses if code execs another python process
environ["PYTHONPATH"] = sub(
jeremydvoss marked this conversation as resolved.
Show resolved Hide resolved
rf"{dirname(abspath(__file__))}{pathsep}?",
escape(rf"{dirname(abspath(__file__))}{pathsep}?"),
jeremydvoss marked this conversation as resolved.
Show resolved Hide resolved
"",
environ["PYTHONPATH"],
)
Expand Down