Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 4 additions & 2 deletions sentry_sdk/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
disable_capture_event,
format_timestamp,
get_type_name,
get_default_release,
get_default_environment,
handle_in_app,
logger,
)
Expand Down Expand Up @@ -62,10 +64,10 @@ def _get_options(*args, **kwargs):
rv["dsn"] = os.environ.get("SENTRY_DSN")

if rv["release"] is None:
rv["release"] = os.environ.get("SENTRY_RELEASE")
rv["release"] = get_default_release()

if rv["environment"] is None:
rv["environment"] = os.environ.get("SENTRY_ENVIRONMENT")
rv["environment"] = get_default_environment(rv["release"])

if rv["server_name"] is None and hasattr(socket, "gethostname"):
rv["server_name"] = socket.gethostname()
Expand Down
52 changes: 52 additions & 0 deletions sentry_sdk/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import os
import sys
import threading
import subprocess

from datetime import datetime

Expand Down Expand Up @@ -52,6 +53,57 @@ def _get_debug_hub():
pass


def get_default_release():
# type: () -> Optional[str]
"""Try to guess a default release."""
release = os.environ.get("SENTRY_RELEASE")
if release:
return release

with open(os.path.devnull, "w+") as null:
try:
release = (
subprocess.Popen(
["git", "rev-parse", "--short", "HEAD"],
stdout=subprocess.PIPE,
stderr=null,
stdin=null,
)
.communicate()[0]
.strip()
.decode("utf-8")
)
except (OSError, IOError):
pass

if release:
return release

for var in (
"HEROKU_SLUG_COMMIT",
"SOURCE_VERSION",
"CODEBUILD_RESOLVED_SOURCE_VERSION",
"CIRCLE_SHA1",
"GAE_DEPLOYMENT_ID",
):
release = os.environ.get(var)
if release:
return release
return None


def get_default_environment(
release=None, # type: Optional[str]
):
# type: (...) -> Optional[str]
rv = os.environ.get("SENTRY_ENVIRONMENT")
if rv:
return rv
if release is not None:
return "production"
return None


class CaptureInternalException(object):
__slots__ = ()

Expand Down