From 0ed8984997d12df8cb3b253637dda4c4ca60c247 Mon Sep 17 00:00:00 2001 From: Colton Myers Date: Tue, 30 Jun 2020 09:25:44 -0600 Subject: [PATCH] Change `cloud_provider` default to True (#875) --- docs/configuration.asciidoc | 2 +- elasticapm/base.py | 2 +- elasticapm/conf/__init__.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/configuration.asciidoc b/docs/configuration.asciidoc index 245949663..35ca86704 100644 --- a/docs/configuration.asciidoc +++ b/docs/configuration.asciidoc @@ -206,7 +206,7 @@ You must use the query bar to filter for a specific environment in versions prio [options="header"] |============ | Environment | Django/Flask | Default | Example -| `ELASTIC_APM_CLOUD_PROVIDER` | `CLOUD_PROVIDER` | `None` | `"aws"` +| `ELASTIC_APM_CLOUD_PROVIDER` | `CLOUD_PROVIDER` | `True` | `"aws"` |============ This config value allows you to specify which cloud provider should be assumed diff --git a/elasticapm/base.py b/elasticapm/base.py index e6b00addf..8d3a5d3a0 100644 --- a/elasticapm/base.py +++ b/elasticapm/base.py @@ -367,7 +367,7 @@ def get_cloud_info(self): """ provider = self.config.cloud_provider - if provider is False: + if not provider: return {} if provider == "aws": data = cloud.aws_metadata() diff --git a/elasticapm/conf/__init__.py b/elasticapm/conf/__init__.py index 327b64c60..9c1aae0aa 100644 --- a/elasticapm/conf/__init__.py +++ b/elasticapm/conf/__init__.py @@ -347,7 +347,7 @@ class Config(_ConfigBase): django_transaction_name_from_route = _BoolConfigValue("DJANGO_TRANSACTION_NAME_FROM_ROUTE", default=False) disable_log_record_factory = _BoolConfigValue("DISABLE_LOG_RECORD_FACTORY", default=False) use_elastic_traceparent_header = _BoolConfigValue("USE_ELASTIC_TRACEPARENT_HEADER", default=True) - cloud_provider = _ConfigValue("CLOUD_PROVIDER", default=None) + cloud_provider = _ConfigValue("CLOUD_PROVIDER", default=True) @property def is_recording(self):