Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,9 @@ def test_basic_metrics(self):
start_time = default_timer()
response = self.pool.request("GET", self.HTTP_URL)
duration_ms = max(round((default_timer() - start_time) * 1000), 0)
metrics = self.get_sorted_metrics()
metrics = self.get_sorted_metrics(
scope="opentelemetry.instrumentation.urllib3"
)
self.assertEqual(len(metrics), 3)

(
Expand Down Expand Up @@ -143,7 +145,9 @@ def test_basic_metrics_new_semconv(self):
response = self.pool.request("GET", self.HTTP_URL)
duration_s = max(default_timer() - start_time, 0)

metrics = self.get_sorted_metrics()
metrics = self.get_sorted_metrics(
scope="opentelemetry.instrumentation.urllib3"
)
self.assertEqual(len(metrics), 3)
(
client_request_size,
Expand Down Expand Up @@ -216,7 +220,9 @@ def test_basic_metrics_both_semconv(self):
duration = max(round(duration_s * 1000), 0)
expected_size = len(response.data)

metrics = self.get_sorted_metrics()
metrics = self.get_sorted_metrics(
scope="opentelemetry.instrumentation.urllib3"
)
self.assertEqual(len(metrics), 6)

(
Expand Down Expand Up @@ -353,7 +359,9 @@ def test_basic_metrics_nonstandard_http_method(self):
response = self.pool.request("NONSTANDARD", self.HTTP_URL)
duration_ms = max(round((default_timer() - start_time) * 1000), 0)

metrics = self.get_sorted_metrics()
metrics = self.get_sorted_metrics(
scope="opentelemetry.instrumentation.urllib3"
)

(
client_duration,
Expand Down Expand Up @@ -426,7 +434,9 @@ def test_basic_metrics_nonstandard_http_method_new_semconv(self):
response = self.pool.request("NONSTANDARD", self.HTTP_URL)
duration_s = max(default_timer() - start_time, 0)

metrics = self.get_sorted_metrics()
metrics = self.get_sorted_metrics(
scope="opentelemetry.instrumentation.urllib3"
)

(
client_request_size,
Expand Down Expand Up @@ -496,7 +506,9 @@ def test_basic_metrics_nonstandard_http_method_new_semconv(self):
def test_str_request_body_size_metrics(self):
self.pool.request("POST", self.HTTP_URL, body="foobar")

metrics = self.get_sorted_metrics()
metrics = self.get_sorted_metrics(
scope="opentelemetry.instrumentation.urllib3"
)
(_, client_request_size, _) = metrics

self.assertEqual(client_request_size.name, "http.client.request.size")
Expand Down Expand Up @@ -529,7 +541,12 @@ def test_schema_url(self):
)

for metrics in resource_metrics:
for scope_metrics in metrics.scope_metrics:
scope_metrics_list = [
sm
for sm in metrics.scope_metrics
if sm.scope.name == "opentelemetry.instrumentation.urllib3"
]
for scope_metrics in scope_metrics_list:
self.assertEqual(
scope_metrics.scope.schema_url,
"https://opentelemetry.io/schemas/1.11.0",
Expand All @@ -538,7 +555,9 @@ def test_schema_url(self):
def test_bytes_request_body_size_metrics(self):
self.pool.request("POST", self.HTTP_URL, body=b"foobar")

metrics = self.get_sorted_metrics()
metrics = self.get_sorted_metrics(
scope="opentelemetry.instrumentation.urllib3"
)
(_, client_request_size, _) = metrics

self.assertEqual(client_request_size.name, "http.client.request.size")
Expand Down Expand Up @@ -566,7 +585,9 @@ def test_bytes_request_body_size_metrics(self):
def test_fields_request_body_size_metrics(self):
self.pool.request("POST", self.HTTP_URL, fields={"foo": "bar"})

metrics = self.get_sorted_metrics()
metrics = self.get_sorted_metrics(
scope="opentelemetry.instrumentation.urllib3"
)
(_, client_request_size, _) = metrics

self.assertEqual(client_request_size.name, "http.client.request.size")
Expand Down Expand Up @@ -595,7 +616,9 @@ def test_fields_request_body_size_metrics(self):
def test_bytesio_request_body_size_metrics(self):
self.pool.request("POST", self.HTTP_URL, body=io.BytesIO(b"foobar"))

metrics = self.get_sorted_metrics()
metrics = self.get_sorted_metrics(
scope="opentelemetry.instrumentation.urllib3"
)
(_, client_request_size, _) = metrics

self.assertEqual(client_request_size.name, "http.client.request.size")
Expand Down Expand Up @@ -625,7 +648,9 @@ def test_generator_request_body_size_metrics(self):
"POST", self.HTTP_URL, body=(b for b in (b"foo", b"bar"))
)

metrics = self.get_sorted_metrics()
metrics = self.get_sorted_metrics(
scope="opentelemetry.instrumentation.urllib3"
)
self.assertEqual(len(metrics), 2)
self.assertNotIn("http.client.request.size", [m.name for m in metrics])

Expand All @@ -634,7 +659,9 @@ def test_metric_uninstrument(self):
URLLib3Instrumentor().uninstrument()
self.pool.request("GET", self.HTTP_URL)

metrics = self.get_sorted_metrics()
metrics = self.get_sorted_metrics(
scope="opentelemetry.instrumentation.urllib3"
)
self.assertEqual(len(metrics), 3)

for metric in metrics:
Expand Down