Change cloud_provider default to True (#875)

elastic · Jun 30, 2020 · 0ed8984 · 0ed8984
1 parent aee748f
commit 0ed8984
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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):