|
1 | | -import os |
2 | | - |
3 | 1 | import pyramid |
4 | 2 | import pyramid.config |
5 | 3 | import wrapt |
6 | 4 |
|
7 | 5 | from ddtrace import config |
8 | 6 | from ddtrace.internal.utils.formats import asbool |
| 7 | +from ddtrace.settings._config import _get_config |
9 | 8 |
|
10 | 9 | from .constants import SETTINGS_ANALYTICS_ENABLED |
11 | 10 | from .constants import SETTINGS_ANALYTICS_SAMPLE_RATE |
|
18 | 17 | config._add( |
19 | 18 | "pyramid", |
20 | 19 | dict( |
21 | | - distributed_tracing=asbool(os.getenv("DD_PYRAMID_DISTRIBUTED_TRACING", default=True)), |
| 20 | + distributed_tracing=asbool(_get_config("DD_PYRAMID_DISTRIBUTED_TRACING", default=True)), |
22 | 21 | ), |
23 | 22 | ) |
24 | 23 |
|
@@ -51,13 +50,12 @@ def traced_init(wrapped, instance, args, kwargs): |
51 | 50 | service = config._get_service(default="pyramid") |
52 | 51 | # DEV: integration-specific analytics flag can be not set but still enabled |
53 | 52 | # globally for web frameworks |
54 | | - old_analytics_enabled = os.getenv("DD_PYRAMID_ANALYTICS_ENABLED") |
55 | | - analytics_enabled = os.environ.get("DD_TRACE_PYRAMID_ANALYTICS_ENABLED", old_analytics_enabled) |
| 53 | + old_analytics_enabled = _get_config("DD_PYRAMID_ANALYTICS_ENABLED") |
| 54 | + analytics_enabled = _get_config("DD_TRACE_PYRAMID_ANALYTICS_ENABLED", default=old_analytics_enabled) |
56 | 55 | if analytics_enabled is not None: |
57 | 56 | analytics_enabled = asbool(analytics_enabled) |
58 | | - # TODO: why is analytics sample rate a string or a bool here? |
59 | | - old_analytics_sample_rate = os.getenv("DD_PYRAMID_ANALYTICS_SAMPLE_RATE", default=True) |
60 | | - analytics_sample_rate = os.environ.get("DD_TRACE_PYRAMID_ANALYTICS_SAMPLE_RATE", old_analytics_sample_rate) |
| 57 | + analytics_sample_rate = _get_config("DD_TRACE_PYRAMID_ANALYTICS_SAMPLE_RATE") |
| 58 | + |
61 | 59 | trace_settings = { |
62 | 60 | SETTINGS_SERVICE: service, |
63 | 61 | SETTINGS_DISTRIBUTED_TRACING: config.pyramid.distributed_tracing, |
|
0 commit comments