Change server_url default to avoid ipv6 ambiguity (elastic#1744)

* Change `server_url` default to avoid ipv6 ambiguity * Fix failing test and another minor doc fix

Author: basepi

CHANGELOG.asciidoc

@@ -40,6 +40,7 @@ endif::[]
 ===== Bug fixes
 
 * Small fix to underlying Starlette logic to prevent duplicate Client objects {pull}1735[#1735]
+* Change `server_url` default to `http://127.0.0.1:8200` to avoid ipv6 ambiguity {pull}1744[#1744]
 
 
 

docs/configuration.asciidoc

@@ -110,7 +110,7 @@ or whitespace-only.
 [options="header"]
 |============
 | Environment | Django/Flask | Default
-| `ELASTIC_APM_SERVER_URL` | `SERVER_URL` | `'http://localhost:8200'`
+| `ELASTIC_APM_SERVER_URL` | `SERVER_URL` | `'http://127.0.0.1:8200'`
 |============
 
 The URL for your APM Server.

docs/django.asciidoc

@@ -89,7 +89,7 @@ NOTE: For automatic insertion to work,
 your list of middlewares (`settings.MIDDLEWARE` or `settings.MIDDLEWARE_CLASSES`) must be of type `list` or `tuple`.
 
 In addition to broad request metrics (what will appear in the APM app as transactions),
-the agent also collects fine grained metrics on template rendering, 
+the agent also collects fine grained metrics on template rendering,
 database queries, HTTP requests, etc.
 You can find more information on what we instrument in the <<automatic-instrumentation, Automatic Instrumentation>> section.
 
@@ -363,7 +363,7 @@ Trying to send a test error using these settings:
 
 SERVICE_NAME: <SERVICE_NAME>
 SECRET_TOKEN: <SECRET_TOKEN>
-SERVER: http://localhost:8200
+SERVER: http://127.0.0.1:8200
 
 Success! We tracked the error successfully! You should be able to see it in a few seconds.
 ----
@@ -372,4 +372,4 @@ Success! We tracked the error successfully! You should be able to see it in a fe
 [[supported-django-and-python-versions]]
 ==== Supported Django and Python versions
 
-A list of supported <<supported-django,Django>> and <<supported-python,Python>> versions can be found on our <<supported-technologies,Supported Technologies>> page. 
+A list of supported <<supported-django,Django>> and <<supported-python,Python>> versions can be found on our <<supported-technologies,Supported Technologies>> page.

elasticapm/conf/__init__.py

@@ -550,7 +550,7 @@ class Config(_ConfigBase):
  secret_token = _ConfigValue("SECRET_TOKEN")
  api_key = _ConfigValue("API_KEY")
  debug = _BoolConfigValue("DEBUG", default=False)
- server_url = _ConfigValue("SERVER_URL", default="http://localhost:8200", required=True)
+ server_url = _ConfigValue("SERVER_URL", default="http://127.0.0.1:8200", required=True)
  server_cert = _ConfigValue("SERVER_CERT", validators=[FileIsReadableValidator()])
  verify_server_cert = _BoolConfigValue("VERIFY_SERVER_CERT", default=True)
  use_certifi = _BoolConfigValue("USE_CERTIFI", default=True)

tests/contrib/django/django_tests.py

@@ -1270,7 +1270,7 @@ def test_settings_server_url_default():
  with override_settings(ELASTIC_APM={}):
  call_command("elasticapm", "check", stdout=stdout)
  output = stdout.getvalue()
- assert "SERVER_URL http://localhost:8200 looks fine" in output
+ assert "SERVER_URL http://127.0.0.1:8200 looks fine" in output
 
 
 def test_settings_server_url_is_empty_string():