chore(telemetry): decouple telemetry writer from global config

ddtrace/internal/agent.py

@@ -4,8 +4,8 @@
 from typing import TypeVar
 from typing import Union
 
+from ddtrace.internal.constants import DEFAULT_TIMEOUT
 from ddtrace.internal.logger import get_logger
-from ddtrace.settings import _config as ddconfig
 
 from .http import HTTPConnection
 from .http import HTTPSConnection
@@ -44,15 +44,15 @@ def get_trace_url():
 
     Raises a ``ValueError`` if the URL is not supported by the Agent.
     """
-    user_supplied_host = ddconfig._trace_agent_hostname is not None
-    user_supplied_port = ddconfig._trace_agent_port is not None
+    user_supplied_host = os.environ.get("DD_AGENT_HOST", os.environ.get("DD_TRACE_AGENT_HOSTNAME"))
+    user_supplied_port = os.environ.get("DD_AGENT_PORT", os.environ.get("DD_TRACE_AGENT_PORT"))
 
-    url = ddconfig._trace_agent_url
+    url = os.environ.get("DD_TRACE_AGENT_URL")
 
     if not url:
-        if user_supplied_host or user_supplied_port:
-            host = ddconfig._trace_agent_hostname or DEFAULT_HOSTNAME
-            port = ddconfig._trace_agent_port or DEFAULT_TRACE_PORT
+        if user_supplied_host is not None or user_supplied_port is not None:
+            host = user_supplied_host or DEFAULT_HOSTNAME
+            port = user_supplied_port or DEFAULT_TRACE_PORT
             if is_ipv6_hostname(host):
                 host = "[{}]".format(host)
             url = "http://%s:%s" % (host, port)
@@ -66,15 +66,14 @@ def get_trace_url():
 
 def get_stats_url():
     # type: () -> str
-    user_supplied_host = ddconfig._stats_agent_hostname is not None
-    user_supplied_port = ddconfig._stats_agent_port is not None
-
-    url = ddconfig._stats_agent_url
+    user_supplied_host = os.environ.get("DD_AGENT_HOST", os.environ.get("DD_DOGSTATSD_HOST"))
+    user_supplied_port = os.getenv("DD_DOGSTATSD_PORT")
+    url = os.getenv("DD_DOGSTATSD_URL")
 
     if not url:
-        if user_supplied_host or user_supplied_port:
-            port = ddconfig._stats_agent_port or DEFAULT_STATS_PORT
-            host = ddconfig._stats_agent_hostname or DEFAULT_HOSTNAME
+        if user_supplied_host is not None or user_supplied_port is not None:
+            port = user_supplied_port or DEFAULT_STATS_PORT
+            host = user_supplied_host or DEFAULT_HOSTNAME
             if is_ipv6_hostname(host):
                 host = "[{}]".format(host)
             url = "udp://{}:{}".format(host, port)
@@ -87,7 +86,8 @@ def get_stats_url():
 
 def info(url=None):
     agent_url = get_trace_url() if url is None else url
-    _conn = get_connection(agent_url, timeout=ddconfig._agent_timeout_seconds)
+    timeout = float(os.getenv("DD_TRACE_AGENT_TIMEOUT_SECONDS", DEFAULT_TIMEOUT))
+    _conn = get_connection(agent_url, timeout=timeout)
     try:
         _conn.request("GET", "info", headers={"content-type": "application/json"})
         resp = _conn.getresponse()

ddtrace/internal/runtime/runtime_metrics.py

@@ -8,7 +8,6 @@
 from ddtrace.internal import atexit
 from ddtrace.internal import forksafe
 from ddtrace.internal import telemetry
-from ddtrace.internal.telemetry.constants import TELEMETRY_RUNTIMEMETRICS_ENABLED
 from ddtrace.vendor.dogstatsd import DogStatsd
 
 from .. import periodic
@@ -21,6 +20,8 @@
 from .tag_collectors import TracerTagCollector
 
 
+TELEMETRY_RUNTIMEMETRICS_ENABLED = "DD_RUNTIME_METRICS_ENABLED"
+
 log = get_logger(__name__)
 
 

ddtrace/internal/telemetry/constants.py

@@ -21,78 +21,3 @@ class TELEMETRY_APM_PRODUCT(Enum):
     DYNAMIC_INSTRUMENTATION = "dynamic_instrumentation"
     PROFILER = "profiler"
     APPSEC = "appsec"
-
-
-# Configuration names must map to values supported by backend services:
-# https://github.com/DataDog/dd-go/blob/f88e85d64b173e7733ac03e23576d1c9be37f32e/trace/apps/tracer-telemetry-intake/telemetry-payload/static/config_norm_rules.json
-TELEMETRY_DYNAMIC_INSTRUMENTATION_ENABLED = "DD_DYNAMIC_INSTRUMENTATION_ENABLED"
-TELEMETRY_EXCEPTION_REPLAY_ENABLED = "DD_EXCEPTION_REPLAY_ENABLED"
-
-
-# Tracing Features
-
-TELEMETRY_TRACE_DEBUG = "DD_TRACE_DEBUG"
-TELEMETRY_ANALYTICS_ENABLED = "DD_TRACE_ANALYTICS_ENABLED"
-TELEMETRY_STARTUP_LOGS_ENABLED = "DD_TRACE_STARTUP_LOGS"
-TELEMETRY_CLIENT_IP_ENABLED = "DD_TRACE_CLIENT_IP_ENABLED"
-TELEMETRY_128_BIT_TRACEID_GENERATION_ENABLED = "DD_TRACE_128_BIT_TRACEID_GENERATION_ENABLED"
-TELEMETRY_TRACE_COMPUTE_STATS = "DD_TRACE_COMPUTE_STATS"
-TELEMETRY_OBFUSCATION_QUERY_STRING_PATTERN = "DD_TRACE_OBFUSCATION_QUERY_STRING_REGEXP"
-TELEMETRY_OTEL_ENABLED = "DD_TRACE_OTEL_ENABLED"
-TELEMETRY_TRACE_HEALTH_METRICS_ENABLED = "DD_TRACE_HEALTH_METRICS_ENABLED"
-TELEMETRY_ENABLED = "DD_INSTRUMENTATION_TELEMETRY_ENABLED"
-TELEMETRY_RUNTIMEMETRICS_ENABLED = "DD_RUNTIME_METRICS_ENABLED"
-TELEMETRY_REMOTE_CONFIGURATION_ENABLED = "DD_REMOTE_CONFIGURATION_ENABLED"
-TELEMETRY_REMOTE_CONFIGURATION_INTERVAL = "DD_REMOTE_CONFIG_POLL_INTERVAL_SECONDS"
-TELEMETRY_SERVICE_MAPPING = "DD_SERVICE_MAPPING"
-TELEMETRY_SPAN_SAMPLING_RULES = "DD_SPAN_SAMPLING_RULES"
-TELEMETRY_SPAN_SAMPLING_RULES_FILE = "DD_SPAN_SAMPLING_RULES_FILE"
-TELEMETRY_PROPAGATION_STYLE_INJECT = "DD_TRACE_PROPAGATION_STYLE_INJECT"
-TELEMETRY_PROPAGATION_STYLE_EXTRACT = "DD_TRACE_PROPAGATION_STYLE_EXTRACT"
-TELEMETRY_TRACE_SAMPLING_RULES = "DD_TRACE_SAMPLING_RULES"
-TELEMETRY_TRACE_SAMPLING_LIMIT = "DD_TRACE_RATE_LIMIT"
-TELEMETRY_PARTIAL_FLUSH_ENABLED = "DD_TRACE_PARTIAL_FLUSH_ENABLED"
-TELEMETRY_PARTIAL_FLUSH_MIN_SPANS = "DD_TRACE_PARTIAL_FLUSH_MIN_SPANS"
-TELEMETRY_TRACE_SPAN_ATTRIBUTE_SCHEMA = "DD_TRACE_SPAN_ATTRIBUTE_SCHEMA"
-TELEMETRY_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED = "DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED"
-TELEMETRY_TRACE_PEER_SERVICE_DEFAULTS_ENABLED = "DD_TRACE_PEER_SERVICE_DEFAULTS_ENABLED"
-TELEMETRY_TRACE_PEER_SERVICE_MAPPING = "DD_TRACE_PEER_SERVICE_MAPPING"
-
-TELEMETRY_TRACE_API_VERSION = "DD_TRACE_API_VERSION"
-TELEMETRY_TRACE_WRITER_BUFFER_SIZE_BYTES = "DD_TRACE_WRITER_BUFFER_SIZE_BYTES"
-TELEMETRY_TRACE_WRITER_MAX_PAYLOAD_SIZE_BYTES = "DD_TRACE_WRITER_MAX_PAYLOAD_SIZE_BYTES"
-TELEMETRY_TRACE_WRITER_INTERVAL_SECONDS = "DD_TRACE_WRITER_INTERVAL_SECONDS"
-TELEMETRY_TRACE_WRITER_REUSE_CONNECTIONS = "DD_TRACE_WRITER_REUSE_CONNECTIONS"
-
-TELEMETRY_DOGSTATSD_PORT = "DD_DOGSTATSD_PORT"
-TELEMETRY_DOGSTATSD_URL = "DD_DOGSTATSD_URL"
-
-TELEMETRY_AGENT_HOST = "DD_AGENT_HOST"
-TELEMETRY_AGENT_PORT = "DD_AGENT_PORT"
-TELEMETRY_AGENT_URL = "DD_TRACE_AGENT_URL"
-TELEMETRY_TRACE_AGENT_TIMEOUT_SECONDS = "DD_TRACE_AGENT_TIMEOUT_SECONDS"
-
-# Profiling features
-TELEMETRY_PROFILING_STACK_ENABLED = "DD_PROFILING_STACK_ENABLED"
-TELEMETRY_PROFILING_MEMORY_ENABLED = "DD_PROFILING_MEMORY_ENABLED"
-TELEMETRY_PROFILING_HEAP_ENABLED = "DD_PROFILING_HEAP_ENABLED"
-TELEMETRY_PROFILING_LOCK_ENABLED = "DD_PROFILING_LOCK_ENABLED"
-TELEMETRY_PROFILING_EXPORT_LIBDD_ENABLED = "DD_PROFILING_EXPORT_LIBDD_ENABLED"
-TELEMETRY_PROFILING_CAPTURE_PCT = "DD_PROFILING_CAPTURE_PCT"
-TELEMETRY_PROFILING_UPLOAD_INTERVAL = "DD_PROFILING_UPLOAD_INTERVAL"
-TELEMETRY_PROFILING_MAX_FRAMES = "DD_PROFILING_MAX_FRAMES"
-
-TELEMETRY_INJECT_WAS_ATTEMPTED = "DD_LIB_INJECTION_ATTEMPTED"
-TELEMETRY_LIB_WAS_INJECTED = "DD_LIB_INJECTED"
-TELEMETRY_LIB_INJECTION_FORCED = "DD_INJECT_FORCE"
-
-
-# Crashtracker
-TELEMETRY_CRASHTRACKING_ENABLED = "crashtracking_enabled"  # Env var enabled
-TELEMETRY_CRASHTRACKING_AVAILABLE = "crashtracking_available"  # Feature is available
-TELEMETRY_CRASHTRACKING_STARTED = "crashtracking_started"  # Crashtracking is running
-TELEMETRY_CRASHTRACKING_STDOUT_FILENAME = "crashtracking_stdout_filename"
-TELEMETRY_CRASHTRACKING_STDERR_FILENAME = "crashtracking_stderr_filename"
-TELEMETRY_CRASHTRACKING_ALT_STACK = "crashtracking_alt_stack"
-TELEMETRY_CRASHTRACKING_STACKTRACE_RESOLVER = "crashtracking_stacktrace_resolver"
-TELEMETRY_CRASHTRACKING_DEBUG_URL = "crashtracking_debug_url"

ddtrace/internal/telemetry/data.py

@@ -12,7 +12,6 @@
 from ddtrace.internal.utils.cache import cached
 from ddtrace.version import get_version
 
-from ...settings import _config as config  # noqa:F401
 from ..hostname import get_hostname