Skip to content

Change cloud_provider default to True #875

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 30, 2020
Merged

Change cloud_provider default to True #875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/configuration.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion elasticapm/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion elasticapm/conf/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down