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

[iss-167] X-RAY creates new session #180

Merged
merged 9 commits into from
Nov 21, 2019
Merged

[iss-167] X-RAY creates new session #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e2aaaaa
[iss-167] X-RAY creates new session, added empty creds for botocore v…
Nov 7, 2019
4009c6b
[iss-167] X-RAY creates new session, added empty creds for botocore v…
Nov 7, 2019
52eb303
[iss-167] X-RAY creates new session, added empty creds for botocore v…
Nov 7, 2019
3e5c6e0
Merge branch 'master' into issue-167-X-RAY-creates-new-session-with-h…
polamayster Nov 12, 2019
ea5d60b
Merge branch 'master' into issue-167-X-RAY-creates-new-session-with-h…
chanchiem Nov 19, 2019
cdffa0d
Merge branch 'master' into issue-167-X-RAY-creates-new-session-with-h…
bhautikpip Nov 19, 2019
8036f49
[iss-167] X-RAY creates new session, added empty creds for botocore v…
Nov 21, 2019
2efe37d
[iss-167] X-RAY creates new session, added empty creds for botocore v…
polamayster Nov 21, 2019
f597438
Merge branch 'issue-167-X-RAY-creates-new-session-with-hardcoded-regi…
Nov 21, 2019
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: 2 additions & 1 deletion aws_xray_sdk/core/sampling/connector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,5 +160,6 @@ def _create_xray_client(self, ip='127.0.0.1', port='2000'):
url = 'http://%s:%s' % (ip, port)
return session.create_client('xray', endpoint_url=url,
region_name='us-west-2',
config=Config(signature_version=UNSIGNED)
config=Config(signature_version=UNSIGNED),
aws_access_key_id='', aws_secret_access_key=''
)
3 changes: 2 additions & 1 deletion tests/test_recorder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@


@pytest.fixture(autouse=True)
def construct_ctx():
def construct_ctx(monkeypatch):
"""
Clean up context storage before and after each test run.
"""
monkeypatch.delattr("botocore.session.Session.get_credentials")
xray_recorder.configure(sampling=False)
xray_recorder.clear_trace_entities()
yield
Expand Down