Remove socket.encrypted field (#1387)

* Remove socket.encrypted field * CHANGELOG * Fix new aiohttp tests

Author: basepi

CHANGELOG.asciidoc

@@ -47,6 +47,11 @@ endif::[]
 * Improve status_code handling in AWS Lambda integration {pull}1382[#1382]
 * Fix `aiohttp` exception handling to allow for non-500 responses including `HTTPOk` {pull}1384[#1384]
 
+[float]
+===== Other
+
+* Remove unused `http.request.socket.encrypted` context field {pull}1332[#1332]
+
 
 [[release-notes-6.x]]
 === Python Agent version 6.x

elasticapm/contrib/aiohttp/utils.py

@@ -38,7 +38,7 @@
 def get_data_from_request(request: Request, config: Config, event_type: str):
  result = {
  "method": request.method,
- "socket": {"remote_address": request.remote, "encrypted": request.secure},
+ "socket": {"remote_address": request.remote},
  "cookies": dict(request.cookies),
  }
  if config.capture_headers:

elasticapm/contrib/django/client.py

@@ -118,7 +118,7 @@ def get_data_from_request(self, request, event_type):
  result = {
  "env": dict(get_environ(request.META)),
  "method": request.method,
- "socket": {"remote_address": request.META.get("REMOTE_ADDR"), "encrypted": request.is_secure()},
+ "socket": {"remote_address": request.META.get("REMOTE_ADDR")},
  "cookies": dict(request.COOKIES),
  }
  if self.config.capture_headers:

elasticapm/contrib/flask/utils.py

@@ -40,7 +40,7 @@ def get_data_from_request(request, config, event_type):
  result = {
  "env": dict(get_environ(request.environ)),
  "method": request.method,
- "socket": {"remote_address": request.environ.get("REMOTE_ADDR"), "encrypted": request.is_secure},
+ "socket": {"remote_address": request.environ.get("REMOTE_ADDR")},
  "cookies": request.cookies,
  }
  if config.capture_headers:

elasticapm/contrib/starlette/utils.py

@@ -50,7 +50,7 @@ async def get_data_from_request(request: Request, config: Config, event_type: st
  """
  result = {
  "method": request.method,
- "socket": {"remote_address": _get_client_ip(request), "encrypted": request.url.is_secure},
+ "socket": {"remote_address": _get_client_ip(request)},
  "cookies": request.cookies,
  }
  if config.capture_headers:

elasticapm/contrib/tornado/utils.py

@@ -43,7 +43,7 @@ def get_data_from_request(request_handler, request, config, event_type):
  """
  result = {
  "method": request.method,
- "socket": {"remote_address": request.remote_ip, "encrypted": request.protocol == "https"},
+ "socket": {"remote_address": request.remote_ip},
  "cookies": request.cookies,
  "http_version": request.version,
  }

tests/contrib/asyncio/aiohttp_web_tests.py

@@ -93,7 +93,7 @@ async def test_get(aiohttp_client, aioeapm):
  assert transaction["span_count"]["started"] == 1
  request = transaction["context"]["request"]
  request["method"] == "GET"
- request["socket"] == {"remote_address": "127.0.0.1", "encrypted": False}
+ request["socket"] == {"remote_address": "127.0.0.1"}
 
  assert span["name"] == "test"
 
@@ -138,7 +138,7 @@ async def test_exception(aiohttp_client, aioeapm, url, exception):
  assert transaction["type"] == "request"
  request = transaction["context"]["request"]
  assert request["method"] == "GET"
- assert request["socket"] == {"remote_address": "127.0.0.1", "encrypted": False}
+ assert request["socket"] == {"remote_address": "127.0.0.1"}
  assert transaction["context"]["response"]["status_code"] == 500
 
  assert len(elasticapm_client.events[constants.ERROR]) == 1
@@ -166,7 +166,7 @@ async def test_http_exception_below_500(aiohttp_client, aioeapm):
  assert transaction["type"] == "request"
  request = transaction["context"]["request"]
  assert request["method"] == "GET"
- assert request["socket"] == {"remote_address": "127.0.0.1", "encrypted": False}
+ assert request["socket"] == {"remote_address": "127.0.0.1"}
  assert transaction["context"]["response"]["status_code"] == 200
 
  assert len(elasticapm_client.events[constants.ERROR]) == 0

tests/contrib/asyncio/starlette_tests.py

@@ -144,7 +144,7 @@ def test_get(app, elasticapm_client):
  assert transaction["span_count"]["started"] == 1
  request = transaction["context"]["request"]
  assert request["method"] == "GET"
- assert request["socket"] == {"remote_address": "127.0.0.1", "encrypted": False}
+ assert request["socket"] == {"remote_address": "127.0.0.1"}
 
  assert span["name"] == "test"
 
@@ -178,7 +178,7 @@ def test_post(app, elasticapm_client):
  assert transaction["span_count"]["started"] == 1
  request = transaction["context"]["request"]
  assert request["method"] == "POST"
- assert request["socket"] == {"remote_address": "127.0.0.1", "encrypted": False}
+ assert request["socket"] == {"remote_address": "127.0.0.1"}
  assert request["body"] == "foo=bar"
 
  assert span["name"] == "test"
@@ -208,7 +208,7 @@ def test_exception(app, elasticapm_client):
  assert transaction["type"] == "request"
  request = transaction["context"]["request"]
  assert request["method"] == "GET"
- assert request["socket"] == {"remote_address": "127.0.0.1", "encrypted": False}
+ assert request["socket"] == {"remote_address": "127.0.0.1"}
  assert transaction["context"]["response"]["status_code"] == 500
 
  assert len(elasticapm_client.events[constants.ERROR]) == 1
@@ -419,7 +419,7 @@ def test_static_files_only(app_static_files_only, elasticapm_client):
  assert transaction["context"]["request"]["url"]["pathname"] == "/tmp/" + file_name
  request = transaction["context"]["request"]
  assert request["method"] == "GET"
- assert request["socket"] == {"remote_address": "127.0.0.1", "encrypted": False}
+ assert request["socket"] == {"remote_address": "127.0.0.1"}
 
 
 def test_static_files_only_file_notfound(app_static_files_only, elasticapm_client):
@@ -449,7 +449,7 @@ def test_static_files_only_file_notfound(app_static_files_only, elasticapm_clien
  assert transaction["context"]["request"]["url"]["pathname"] == "/tmp/whatever"
  request = transaction["context"]["request"]
  assert request["method"] == "GET"
- assert request["socket"] == {"remote_address": "127.0.0.1", "encrypted": False}
+ assert request["socket"] == {"remote_address": "127.0.0.1"}
 
 
 def test_make_client_with_config():

tests/contrib/asyncio/tornado/tornado_tests.py

@@ -126,7 +126,7 @@ async def test_get(app, base_url, http_client):
  assert transaction["span_count"]["started"] == 1
  request = transaction["context"]["request"]
  assert request["method"] == "GET"
- assert request["socket"] == {"remote_address": "127.0.0.1", "encrypted": False}
+ assert request["socket"] == {"remote_address": "127.0.0.1"}
 
  assert span["name"] == "test"
 
@@ -148,7 +148,7 @@ async def test_exception(app, base_url, http_client):
  assert transaction["type"] == "request"
  request = transaction["context"]["request"]
  assert request["method"] == "GET"
- assert request["socket"] == {"remote_address": "127.0.0.1", "encrypted": False}
+ assert request["socket"] == {"remote_address": "127.0.0.1"}
  assert transaction["context"]["response"]["status_code"] == 500
 
  assert len(elasticapm_client.events[constants.ERROR]) == 1
@@ -195,7 +195,7 @@ async def test_render(app, base_url, http_client):
  assert transaction["span_count"]["started"] == 2
  request = transaction["context"]["request"]
  assert request["method"] == "GET"
- assert request["socket"] == {"remote_address": "127.0.0.1", "encrypted": False}
+ assert request["socket"] == {"remote_address": "127.0.0.1"}
 
  span = spans[0]
  assert span["name"] == "test"