Skip to content

Commit 23ac123

Browse files
author
Emanuele Palazzetti
authored
[core] fix deprecation warning on get_env() (#454)
1 parent 70d3097 commit 23ac123

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

ddtrace/utils/formats.py

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,17 @@ def get_env(integration, variable, default=None):
1717
legacy_env = 'DATADOG_{}'.format(key)
1818
env = 'DD_{}'.format(key)
1919

20-
# [Backward compatibility]: `DATADOG_` variables are deprecated
21-
deprecation(
22-
name='DATADOG_',
23-
message='Use `DD_` prefix instead',
24-
version='1.0.0',
25-
)
26-
value = os.getenv(env) or os.getenv(legacy_env)
20+
value = os.getenv(env)
21+
legacy = os.getenv(legacy_env)
22+
if legacy:
23+
# Deprecation: `DATADOG_` variables are deprecated
24+
deprecation(
25+
name='DATADOG_',
26+
message='Use `DD_` prefix instead',
27+
version='1.0.0',
28+
)
29+
30+
value = value or legacy
2731
return value if value else default
2832

2933

0 commit comments

Comments
 (0)