Skip to content

fix: Refactor testsuite for GCP and fix some bugs #804

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

Merged
untitaker merged 12 commits into from
Sep 1, 2020
Merged

fix: Refactor testsuite for GCP and fix some bugs #804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f135ffd
Changes:
Aug 28, 2020
1f1a31c
Merge branch 'master' into master
shantanu73 Aug 31, 2020
9a3c3b9
Changes:
Aug 31, 2020
88745d7
Changes:
Sep 1, 2020
16cf50a
Modified tox.ini file to resolve build fail for python3.7 environment
Sep 1, 2020
3bd76d4
Changes:
Sep 1, 2020
890996e
Fixed variable names for log url to appropriate values.
Sep 1, 2020
fd63224
fix importorskip
untitaker Sep 1, 2020
adf68cc
Revert "fix importorskip"
untitaker Sep 1, 2020
ee443a9
attempt skipif fix again
untitaker Sep 1, 2020
8c80167
Merge branch 'master' of https://github.com/shantanu72/sentry-python
Sep 1, 2020
0a9f28e
Made changes as per review comments related to variable naming and us…
Sep 1, 2020
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
23 changes: 11 additions & 12 deletions sentry_sdk/integrations/gcp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def sentry_func(*args, **kwargs):

configured_time = int(configured_time)

initial_time = datetime.now()
initial_time = datetime.utcnow()

with hub.push_scope() as scope:
with capture_internal_exceptions():
Expand Down Expand Up @@ -119,7 +119,7 @@ def _make_request_event_processor(configured_timeout, initial_time):
def event_processor(event, hint):
# type: (Event, Hint) -> Optional[Event]

final_time = datetime.now()
final_time = datetime.utcnow()
time_diff = final_time - initial_time

execution_duration_in_millis = time_diff.microseconds / MILLIS_TO_SECONDS
Expand All @@ -136,7 +136,7 @@ def event_processor(event, hint):
}

extra["google cloud logs"] = {
"url": _get_google_cloud_logs_url(initial_time),
"url": _get_google_cloud_logs_url(final_time),
}

request = event.get("request", {})
Expand All @@ -150,31 +150,30 @@ def event_processor(event, hint):
return event_processor


def _get_google_cloud_logs_url(initial_time):
def _get_google_cloud_logs_url(final_time):
# type: (datetime) -> str
"""
Generates a Google Cloud Logs console URL based on the environment variables
Arguments:
initial_time {datetime} -- Initial time
final_time {datetime} -- Final time
Returns:
str -- Google Cloud Logs Console URL to logs.
"""
hour_ago = initial_time - timedelta(hours=1)
hour_ago = final_time - timedelta(hours=1)
formatstring = "%Y-%m-%dT%H:%M:%SZ"

url = (
"https://console.cloud.google.com/logs/viewer?project={project}&resource=cloud_function"
"%2Ffunction_name%2F{function_name}%2Fregion%2F{region}&minLogLevel=0&expandAll=false"
"&timestamp={initial_time}&customFacets=&limitCustomFacetWidth=true"
"&timestamp={timestamp_end}&customFacets=&limitCustomFacetWidth=true"
"&dateRangeStart={timestamp_start}&dateRangeEnd={timestamp_end}"
"&interval=PT1H&scrollTimestamp={timestamp_current}"
"&interval=PT1H&scrollTimestamp={timestamp_end}"
).format(
project=environ.get("GCP_PROJECT"),
function_name=environ.get("FUNCTION_NAME"),
region=environ.get("FUNCTION_REGION"),
initial_time=initial_time,
timestamp_start=hour_ago,
timestamp_end=initial_time,
timestamp_current=initial_time,
timestamp_end=final_time.strftime(formatstring),
timestamp_start=hour_ago.strftime(formatstring),
)

return url
Loading