Update CLOUD_PROVIDER for new valid options (#878)

Ref elastic/apm#289

Author: basepi

CHANGELOG.asciidoc

@@ -30,6 +30,20 @@ endif::[]
 //===== Bug fixes
 //
 
+=== Unreleased
+
+// Unreleased changes go here
+// When the next release happens, nest these changes under the "Python Agent version 5.x" heading
+[float]
+===== Features
+
+
+[float]
+===== Bug fixes
+
+* Updated CLOUD_PROVIDER config to allow for new options defined in https://github.com/elastic/apm/issues/289[#289] {pull}878[#878]
+
+
 [[release-notes-5.x]]
 === Python Agent version 5.x
 

docs/configuration.asciidoc

@@ -206,15 +206,15 @@ 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`  | `True`     | `"aws"`
+| `ELASTIC_APM_CLOUD_PROVIDER` | `CLOUD_PROVIDER`  | `"auto"`     | `"aws"`
 |============
 
 This config value allows you to specify which cloud provider should be assumed
 for metadata collection. By default, the agent will attempt to detect the cloud
 provider or, if that fails, will use trial and error to collect the metadata.
 
 Valid options are `"aws"`, `"gcp"`, and `"azure"`. If this config value is set
-to `False`, then no cloud metadata will be collected.
+to `"none"`, then no cloud metadata will be collected.
 
 [float]
 [[config-secret-token]]

elasticapm/base.py

@@ -365,9 +365,9 @@ def get_cloud_info(self):
         Detects if the app is running in a cloud provider and fetches relevant
         metadata from the cloud provider's metadata endpoint.
         """
-        provider = self.config.cloud_provider
+        provider = str(self.config.cloud_provider).lower()
 
-        if not provider:
+        if not provider or provider == "none" or provider == "false":
             return {}
         if provider == "aws":
             data = cloud.aws_metadata()
@@ -384,7 +384,7 @@ def get_cloud_info(self):
             if not data:
                 self.logger.warning("Cloud provider {0} defined, but no metadata was found.".format(provider))
             return data
-        else:
+        elif provider == "auto" or provider == "true":
             # Trial and error
             data = {}
             data = cloud.aws_metadata()
@@ -395,6 +395,9 @@ def get_cloud_info(self):
                 return data
             data = cloud.azure_metadata()
             return data
+        else:
+            self.logger.warning("Unknown value for CLOUD_PROVIDER, skipping cloud metadata: {}".format(provider))
+            return {}
 
     def build_metadata(self):
         data = {