Skip to content

ci: reduce flakiness from httplib https tests #15318

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
Nov 19, 2025
Merged

ci: reduce flakiness from httplib https tests #15318

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
31 changes: 15 additions & 16 deletions tests/contrib/httplib/test_httplib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import socket
import sys
from urllib import parse
import urllib.error
from urllib.request import Request
from urllib.request import build_opener
from urllib.request import urlopen
Expand Down Expand Up @@ -204,11 +205,9 @@ def test_httplib_request_get_request_https(self):
headers={"Accept": "text/plain", "User-Agent": "ddtrace-test"},
)
resp = conn.getresponse()
self.assertEqual(resp.status, 200)
self.assertEqual(
self.to_str(resp.read()),
"My dog used to chase people on a bike a lot. It got so bad I had to take his bike away.",
)
# DEV: We don't care if the result was successful or not, just that we succesfully
# traced an HTTPS request. Relying on third party services is not ideal and can be flaky
status = resp.status

spans = self.pop_spans()
self.assertEqual(len(spans), 1)
Expand All @@ -217,12 +216,12 @@ def test_httplib_request_get_request_https(self):
self.assertEqual(span.span_type, "http")
self.assertEqual(span.service, "tests.contrib.httplib")
self.assertEqual(span.name, self.SPAN_NAME)
self.assertEqual(span.error, 0)
self.assertEqual(span.error, status not in (200, 404))
assert span.get_tag("http.method") == "GET"
assert span.get_tag("component") == "httplib"
assert span.get_tag("span.kind") == "client"
assert span.get_tag("out.host") == "icanhazdadjoke.com"
assert_span_http_status_code(span, 200)
assert_span_http_status_code(span, status)
assert span.get_tag("http.url") == "https://icanhazdadjoke.com/j/R7UfaahVfFd"

def test_httplib_request_post_request(self):
Expand Down Expand Up @@ -447,14 +446,14 @@ def test_urllib_request_https(self):
url,
headers={"Accept": "text/plain", "User-Agent": "ddtrace-test"},
)
# DEV: We don't care if the result was successful or not, just that we succesfully
# traced an HTTPS request. Relying on third party services is not ideal and can be flaky
with override_global_tracer(self.tracer):
resp = urlopen(req)

self.assertEqual(resp.getcode(), 200)
self.assertEqual(
self.to_str(resp.read()),
"My dog used to chase people on a bike a lot. It got so bad I had to take his bike away.",
)
try:
resp = urlopen(req)
status = resp.getcode()
except urllib.error.HTTPError as e:
status = e.code

spans = self.pop_spans()
self.assertEqual(len(spans), 1)
Expand All @@ -463,12 +462,12 @@ def test_urllib_request_https(self):
self.assertEqual(span.span_type, "http")
self.assertEqual(span.service, "tests.contrib.httplib")
self.assertEqual(span.name, self.SPAN_NAME)
self.assertEqual(span.error, 0)
self.assertEqual(span.error, status not in (200, 404))
self.assertEqual(span.get_tag("http.method"), "GET")
self.assertEqual(span.get_tag("component"), "httplib")
self.assertEqual(span.get_tag("span.kind"), "client")
self.assertEqual(span.get_tag("out.host"), "icanhazdadjoke.com")
assert_span_http_status_code(span, 200)
assert_span_http_status_code(span, status)
self.assertEqual(span.get_tag("http.url"), url)

def test_urllib_request_object(self):
Expand Down
Loading