@@ -13,20 +13,7 @@ def _get_env(key, default=None, cast=None, depends_on_tracing=False):
1313 @property
1414 def _getter (self ):
1515 if not hasattr (self , prop_key ):
16- if depends_on_tracing and not config .trace_enabled :
17- val = False
18- else :
19- val = os .environ .get (key , default )
20- if cast is not None :
21- try :
22- val = cast (val )
23- except (ValueError , TypeError ):
24- msg = (
25- "Failed to cast environment variable '%s' with "
26- "value '%s' to type %s. Using default value '%s'."
27- )
28- logger .warning (msg , key , val , cast .__name__ , default )
29- val = default
16+ val = self ._resolve_env (key , default , cast , depends_on_tracing )
3017 setattr (self , prop_key , val )
3118 return getattr (self , prop_key )
3219
@@ -44,6 +31,22 @@ def as_list(val):
4431
4532class Config :
4633
34+ def _resolve_env (self , key , default = None , cast = None , depends_on_tracing = False ):
35+ if depends_on_tracing and not self .trace_enabled :
36+ return False
37+ val = os .environ .get (key , default )
38+ if cast is not None :
39+ try :
40+ val = cast (val )
41+ except (ValueError , TypeError ):
42+ msg = (
43+ "Failed to cast environment variable '%s' with "
44+ "value '%s' to type %s. Using default value '%s'."
45+ )
46+ logger .warning (msg , key , val , cast .__name__ , default )
47+ val = default
48+ return val
49+
4750 service = _get_env ("DD_SERVICE" )
4851 env = _get_env ("DD_ENV" )
4952
0 commit comments