Skip to content

Change server_url default to avoid ipv6 ambiguity #1744

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 2 commits into from
Feb 8, 2023
Merged

Change server_url default to avoid ipv6 ambiguity #1744

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14fecea
Change `server_url` default to avoid ipv6 ambiguity
basepi Feb 7, 2023
34267c3
Fix failing test and another minor doc fix
basepi Feb 7, 2023
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix failing test and another minor doc fix
  • Loading branch information
@basepi
basepi committed Feb 7, 2023
commit 34267c36373f694f40811ba9283a04f6d60b51f8
6 changes: 3 additions & 3 deletions docs/django.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -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.
----
Expand All @@ -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.
2 changes: 1 addition & 1 deletion tests/contrib/django/django_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down