fix(profiling): handle known HTTP request errors [backport 1.14] (#6327)

Backport e097222 from #6249 to 1.14.

After the removal of the tenacity dependency, some known HTTP request
exceptions are no longer handled as expected and the user is asked to
report an issue to the project. This change ensures that we have a
similar behaviour in place whereby known issues are handled as before.

## Checklist

- [x] Change(s) are motivated and described in the PR description.
- [x] Testing strategy is described if automated tests are not included
in the PR.
- [x] Risk is outlined (performance impact, potential for breakage,
maintainability, etc).
- [x] Change is maintainable (easy to change, telemetry, documentation).
- [x] [Library release note
guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html)
are followed. If no release note is required, add label
`changelog/no-changelog`.
- [x] Documentation is included (in-code, generated user docs, [public
corp docs](https://github.com/DataDog/documentation/)).
- [x] Backport labels are set (if
[applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting))

## Reviewer Checklist

- [x] Title is accurate.
- [x] No unnecessary changes are introduced.
- [x] Description motivates each change.
- [x] Avoids breaking
[API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces)
changes unless absolutely necessary.
- [x] Testing strategy adequately addresses listed risk(s).
- [x] Change is maintainable (easy to change, telemetry, documentation).
- [x] Release note makes sense to a user of the library.
- [x] Reviewer has explicitly acknowledged and discussed the performance
implications of this PR as reported in the benchmarks PR comment.
- [x] Backport labels are set in a manner that is consistent with the
[release branch maintenance
policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)

Co-authored-by: Gabriele N. Tornetta <[email protected]>
Co-authored-by: Emmett Butler <[email protected]>

Author: 3 people

ddtrace/profiling/exporter/http.py

@@ -12,6 +12,7 @@
 
 import attr
 import six
+from six.moves import http_client
 
 import ddtrace
 from ddtrace.ext.git import COMMIT_SHA
@@ -233,6 +234,8 @@ def _upload(self, client, path, body, headers):
             client.request("POST", path, body=body, headers=headers)
             response = client.getresponse()
             response.read()  # reading is mandatory
+        except (http_client.HTTPException, EnvironmentError) as e:
+            raise exporter.ExportError("HTTP upload request failed: %s" % e)
         finally:
             client.close()
 

releasenotes/notes/fix-profiler-handle-request-errors-45a1917365c5b512.yaml

@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    profiling: Fixed a regression whereby the profile exporter would not handle
+    known request errors and asks the user to report an issue instead.

tests/profiling/exporter/test_http.py

@@ -3,15 +3,13 @@
 import email.parser
 import json
 import platform
-import socket
 import sys
 import threading
 import time
 
 import pytest
 import six
 from six.moves import BaseHTTPServer
-from six.moves import http_client
 
 import ddtrace
 from ddtrace.internal import compat
@@ -216,7 +214,7 @@ def test_export_server_down():
         max_retry_delay=2,
         endpoint_call_counter_span_processor=_get_span_processor(),
     )
-    with pytest.raises(EnvironmentError):
+    with pytest.raises(exporter.ExportError):
         exp.export(test_pprof.TEST_EVENTS, 0, 1)
 
 
@@ -228,7 +226,7 @@ def test_export_timeout(endpoint_test_timeout_server):
         max_retry_delay=2,
         endpoint_call_counter_span_processor=_get_span_processor(),
     )
-    with pytest.raises((TimeoutError, socket.timeout) if six.PY3 else socket.error):
+    with pytest.raises(exporter.ExportError):
         exp.export(test_pprof.TEST_EVENTS, 0, 1)
 
 
@@ -240,7 +238,7 @@ def test_export_reset(endpoint_test_reset_server):
         max_retry_delay=2,
         endpoint_call_counter_span_processor=_get_span_processor(),
     )
-    with pytest.raises(ConnectionResetError if six.PY3 else http_client.BadStatusLine):
+    with pytest.raises(exporter.ExportError):
         exp.export(test_pprof.TEST_EVENTS, 0, 1)