devservices 1.0.16__tar.gz → 1.0.17__tar.gz

{devservices-1.0.16 → devservices-1.0.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: devservices
-Version: 1.0.16
+Version: 1.0.17
 Requires-Python: >=3.10
 License-File: LICENSE.md
 Requires-Dist: pyyaml

{devservices-1.0.16 → devservices-1.0.17}/README.md

@@ -11,7 +11,7 @@ A standalone cli tool used to manage dependencies for services. It simplifies th
 The recommended way to install devservices is through a virtualenv in the requirements.txt.
 
 ```
-devservices==1.0.16
+devservices==1.0.17
 ```
 
 

{devservices-1.0.16 → devservices-1.0.17}/devservices/commands/down.py

@@ -60,7 +60,7 @@ def down(args: Namespace) -> None:
     try:
         service = find_matching_service(service_name)
     except ConfigNotFoundError as e:
-        capture_exception(e)
+        capture_exception(e, level="info")
         console.failure(
             f"{str(e)}. Please specify a service (i.e. `devservices down sentry`) or run the command from a directory with a devservices configuration."
         )
@@ -148,7 +148,7 @@ def down(args: Namespace) -> None:
             try:
                 _down(service, remote_dependencies, list(mode_dependencies), status)
             except DockerComposeError as dce:
-                capture_exception(dce)
+                capture_exception(dce, level="info")
                 status.failure(f"Failed to stop {service.name}: {dce.stderr}")
                 exit(1)
         else:

{devservices-1.0.16 → devservices-1.0.17}/devservices/commands/list_dependencies.py

@@ -34,7 +34,7 @@ def list_dependencies(args: Namespace) -> None:
     try:
         service = find_matching_service(service_name)
     except ConfigNotFoundError as e:
-        capture_exception(e)
+        capture_exception(e, level="info")
         console.failure(
             f"{str(e)}. Please specify a service (i.e. `devservices list-dependencies sentry`) or run the command from a directory with a devservices configuration."
         )

{devservices-1.0.16 → devservices-1.0.17}/devservices/commands/logs.py

@@ -49,7 +49,7 @@ def logs(args: Namespace) -> None:
     try:
         service = find_matching_service(service_name)
     except ConfigNotFoundError as e:
-        capture_exception(e)
+        capture_exception(e, level="info")
         console.failure(
             f"{str(e)}. Please specify a service (i.e. `devservices logs sentry`) or run the command from a directory with a devservices configuration."
         )
@@ -86,7 +86,7 @@ def logs(args: Namespace) -> None:
     try:
         logs_output = _logs(service, remote_dependencies, mode_dependencies)
     except DockerComposeError as dce:
-        capture_exception(dce)
+        capture_exception(dce, level="info")
         console.failure(f"Failed to get logs for {service.name}: {dce.stderr}")
         exit(1)
     for log in logs_output:

{devservices-1.0.16 → devservices-1.0.17}/devservices/commands/up.py

@@ -63,7 +63,7 @@ def up(args: Namespace) -> None:
     try:
         service = find_matching_service(service_name)
     except ConfigNotFoundError as e:
-        capture_exception(e)
+        capture_exception(e, level="info")
         console.failure(
             f"{str(e)}. Please specify a service (i.e. `devservices up sentry`) or run the command from a directory with a devservices configuration."
         )
@@ -110,7 +110,7 @@ def up(args: Namespace) -> None:
             mode_dependencies = modes[mode]
             _up(service, [mode], remote_dependencies, mode_dependencies, status)
         except DockerComposeError as dce:
-            capture_exception(dce)
+            capture_exception(dce, level="info")
             status.failure(f"Failed to start {service.name}: {dce.stderr}")
             exit(1)
     # TODO: We should factor in healthchecks here before marking service as running

{devservices-1.0.16 → devservices-1.0.17}/devservices/main.py

@@ -15,6 +15,8 @@ from sentry_sdk import set_tag
 from sentry_sdk import set_user
 from sentry_sdk import start_transaction
 from sentry_sdk.integrations.argv import ArgvIntegration
+from sentry_sdk.types import Event
+from sentry_sdk.types import Hint
 
 from devservices.commands import down
 from devservices.commands import list_dependencies
@@ -42,6 +44,31 @@ disable_sentry = os.environ.get("DEVSERVICES_DISABLE_SENTRY", default="0") == "1
 logging.basicConfig(level=logging.INFO)
 current_version = metadata.version("devservices")
 
+error_trace_ids = set()
+
+
+def before_send_error(event: Event, hint: Hint) -> Event:
+    """Gets the trace_id from the errors we care about.
+
+    This function is used as a before_send callback for Sentry to track error trace IDs.
+    It adds the trace_id to error_trace_ids set for non-info level events.
+    """
+    if event["level"] != "info":
+        error_trace_ids.add(event["contexts"]["trace"]["trace_id"])
+    return event
+
+
+def before_send_transaction(event: Event, hint: Hint) -> Event:
+    """Manually sets the status of a transaction.
+
+    This function is used as a before_send_transaction callback for Sentry to mark transaction status
+    as unknown if they don't correspond to errors we care about.
+    """
+    if event["contexts"]["trace"]["trace_id"] not in error_trace_ids:
+        event["contexts"]["trace"]["status"] = "unknown"
+    return event
+
+
 if not disable_sentry:
     init(
         dsn="https://56470da7302c16e83141f62f88e46449@o1.ingest.us.sentry.io/4507946704961536",
@@ -50,6 +77,8 @@ if not disable_sentry:
         enable_tracing=True,
         integrations=[ArgvIntegration()],
         environment=sentry_environment,
+        before_send=before_send_error,
+        before_send_transaction=before_send_transaction,
         release=current_version,
     )
     username = getpass.getuser()
@@ -59,7 +88,7 @@ if not disable_sentry:
         git_version = get_git_version()
         set_tag("git_version", git_version)
     except GitError as e:
-        capture_exception(e)
+        capture_exception(e, level="info")
         logging.debug("Failed to get git version: %s", e)
         set_tag("git_version", "unknown")
 
@@ -75,11 +104,11 @@ def main() -> None:
     try:
         check_docker_compose_version()
     except DockerDaemonNotRunningError as e:
-        capture_exception(e)
+        capture_exception(e, level="info")
         console.failure(str(e))
         exit(1)
     except DockerComposeInstallationError as e:
-        capture_exception(e)
+        capture_exception(e, level="info")
         console.failure("Failed to ensure docker compose is installed and up-to-date")
         exit(1)
     parser = argparse.ArgumentParser(

{devservices-1.0.16 → devservices-1.0.17}/devservices.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: devservices
-Version: 1.0.16
+Version: 1.0.17
 Requires-Python: >=3.10
 License-File: LICENSE.md
 Requires-Dist: pyyaml

{devservices-1.0.16 → devservices-1.0.17}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "devservices"
-version = "1.0.16"
+version = "1.0.17"
 # 3.10 is just for internal pypi compat
 requires-python = ">=3.10"
 dependencies = [