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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## Unreleased

***Fixed:***

- Ensure telemetry is submitted when its storage directory does not exist

## 0.38.0 - 2026-08-04

***Changed:***
Expand Down
6 changes: 5 additions & 1 deletion src/dda/telemetry/daemon/handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,13 @@
from dda.telemetry.constants import DaemonEnvVars
from dda.utils.fs import Path

LOG_FILE = Path(os.environ[DaemonEnvVars.LOG_FILE])
ERROR_FILE = Path(os.environ[DaemonEnvVars.ERROR_FILE])
ERROR_OCCURRED = False

LOG_FILE.parent.ensure_dir()
ERROR_FILE.parent.ensure_dir()


def set_error() -> None:
global ERROR_OCCURRED # noqa: PLW0603
Expand All @@ -33,7 +37,7 @@ def filter(self, record: logging.LogRecord) -> bool: # noqa: PLR6301


logging.basicConfig(
filename=os.environ[DaemonEnvVars.LOG_FILE],
filename=LOG_FILE,
level=os.environ.get(DaemonEnvVars.LOG_LEVEL, "INFO"),
format="%(asctime)s | %(levelname)s | %(message)s",
)
Expand Down
40 changes: 40 additions & 0 deletions tests/telemetry/test_manager.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# SPDX-FileCopyrightText: 2026-present Datadog, Inc. <dev@datadoghq.com>
#
# SPDX-License-Identifier: MIT
from __future__ import annotations

import os
import subprocess
import sys

from dda.telemetry.constants import DaemonEnvVars
from dda.telemetry.manager import TelemetryManager


def test_watch_delegates_storage_creation_to_daemon(mocker, temp_dir):
app = mocker.Mock()
cache_dir = temp_dir / "cache"
app.config.storage.cache = cache_dir
write_dir = temp_dir / "write"
mocker.patch("tempfile.mkdtemp", return_value=str(write_dir))

manager = TelemetryManager(app)
manager.watch()

storage_dir = cache_dir / "telemetry"
assert not storage_dir.exists()
env_vars = app.subprocess.spawn_daemon.call_args.kwargs["env"]
assert env_vars[DaemonEnvVars.WRITE_DIR] == str(write_dir)
assert env_vars[DaemonEnvVars.LOG_FILE] == str(storage_dir / "daemon.log")
assert env_vars[DaemonEnvVars.ERROR_FILE] == str(storage_dir / "daemon.error")


def test_daemon_creates_storage_directory(temp_dir):
storage_dir = temp_dir / "cache" / "telemetry"
env_vars = os.environ.copy()
env_vars[DaemonEnvVars.LOG_FILE] = str(storage_dir / "daemon.log")
env_vars[DaemonEnvVars.ERROR_FILE] = str(storage_dir / "daemon.error")

subprocess.run([sys.executable, "-c", "import dda.telemetry.daemon.handler"], env=env_vars, check=True)

assert storage_dir.is_dir()
Loading