opensource/opentelemetry-python-contrib
1
0
Fork 0
mirror of https://github.com/open-telemetry/opentelemetry-python-contrib.git synced 2025-08-02 19:47:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: opentelemetry-instrumentation-urllib (#3639)

Browse Source 
Co-authored-by: Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com>
This commit is contained in:
Ezzio Moreira
2025-07-16 05:11:46 -03:00
committed by GitHub
parent f9453b940a
commit f20fa77ad5
2 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
instrumentation/opentelemetry-instrumentation-urllib/src/opentelemetry/instrumentation/urllib/__init__.py
View File

@ -119,6 +119,9 @@ from opentelemetry.instrumentation.utils import (
)
from opentelemetry.metrics import Histogram, Meter, get_meter
from opentelemetry.propagate import inject
from opentelemetry.semconv._incubating.attributes.http_attributes import (
HTTP_URL,
)
from opentelemetry.semconv._incubating.metrics.http_metrics import (
HTTP_CLIENT_REQUEST_BODY_SIZE,
HTTP_CLIENT_RESPONSE_BODY_SIZE,
@ -130,7 +133,6 @@ from opentelemetry.semconv.metrics import MetricInstruments
from opentelemetry.semconv.metrics.http_metrics import (
HTTP_CLIENT_REQUEST_DURATION,
)
from opentelemetry.semconv.trace import SpanAttributes
from opentelemetry.trace import Span, SpanKind, Tracer, get_tracer
from opentelemetry.util.http import (
ExcludeList,
@ -325,7 +327,7 @@ def _instrument(
sem_conv_opt_in_mode=_StabilityMode.HTTP,
)
duration_attrs_old[SpanAttributes.HTTP_URL] = url
duration_attrs_old[HTTP_URL] = url
_record_histograms(
histograms,

44
instrumentation/opentelemetry-instrumentation-urllib/tests/test_urllib_integration.py
View File

@ -38,13 +38,17 @@ from opentelemetry.instrumentation.utils import (
)
from opentelemetry.propagate import get_global_textmap, set_global_textmap
from opentelemetry.sdk import resources
from opentelemetry.semconv._incubating.attributes.http_attributes import (
HTTP_METHOD,
HTTP_STATUS_CODE,
HTTP_URL,
)
from opentelemetry.semconv.attributes.error_attributes import ERROR_TYPE
from opentelemetry.semconv.attributes.http_attributes import (
HTTP_REQUEST_METHOD,
HTTP_RESPONSE_STATUS_CODE,
)
from opentelemetry.semconv.attributes.url_attributes import URL_FULL
from opentelemetry.semconv.trace import SpanAttributes
from opentelemetry.test.mock_textmap import MockTextMapPropagator
from opentelemetry.test.test_base import TestBase
from opentelemetry.trace import StatusCode
@ -150,9 +154,9 @@ class URLLibIntegrationTestBase(abc.ABC):
self.assertEqual(
span.attributes,
{
SpanAttributes.HTTP_METHOD: "GET",
SpanAttributes.HTTP_URL: self.URL,
SpanAttributes.HTTP_STATUS_CODE: 200,
HTTP_METHOD: "GET",
HTTP_URL: self.URL,
HTTP_STATUS_CODE: 200,
},
)
@ -198,9 +202,9 @@ class URLLibIntegrationTestBase(abc.ABC):
self.assertEqual(
span.attributes,
{
SpanAttributes.HTTP_METHOD: "GET",
SpanAttributes.HTTP_URL: self.URL,
SpanAttributes.HTTP_STATUS_CODE: 200,
HTTP_METHOD: "GET",
HTTP_URL: self.URL,
HTTP_STATUS_CODE: 200,
HTTP_REQUEST_METHOD: "GET",
URL_FULL: self.URL,
HTTP_RESPONSE_STATUS_CODE: 200,
@ -260,9 +264,7 @@ class URLLibIntegrationTestBase(abc.ABC):
span = self.assert_span()
self.assertEqual(
span.attributes.get(SpanAttributes.HTTP_STATUS_CODE), 404
)
self.assertEqual(span.attributes.get(HTTP_STATUS_CODE), 404)
self.assertIs(
span.status.status_code,
@ -310,9 +312,7 @@ class URLLibIntegrationTestBase(abc.ABC):
span = self.assert_span()
self.assertEqual(
span.attributes.get(SpanAttributes.HTTP_STATUS_CODE), 404
)
self.assertEqual(span.attributes.get(HTTP_STATUS_CODE), 404)
self.assertEqual(span.attributes.get(HTTP_RESPONSE_STATUS_CODE), 404)
self.assertIs(
@ -337,8 +337,8 @@ class URLLibIntegrationTestBase(abc.ABC):
self.assertEqual(
span.attributes,
{
SpanAttributes.HTTP_METHOD: "GET",
SpanAttributes.HTTP_URL: self.URL,
HTTP_METHOD: "GET",
HTTP_URL: self.URL,
},
)
@ -455,9 +455,9 @@ class URLLibIntegrationTestBase(abc.ABC):
self.assertEqual(
dict(span.attributes),
{
SpanAttributes.HTTP_METHOD: "GET",
SpanAttributes.HTTP_URL: "http://mock/status/500",
SpanAttributes.HTTP_STATUS_CODE: 500,
HTTP_METHOD: "GET",
HTTP_URL: "http://mock/status/500",
HTTP_STATUS_CODE: 500,
},
)
self.assertEqual(span.status.status_code, StatusCode.ERROR)
@ -486,9 +486,9 @@ class URLLibIntegrationTestBase(abc.ABC):
self.assertEqual(
dict(span.attributes),
{
SpanAttributes.HTTP_METHOD: "GET",
SpanAttributes.HTTP_URL: "http://mock/status/500",
SpanAttributes.HTTP_STATUS_CODE: 500,
HTTP_METHOD: "GET",
HTTP_URL: "http://mock/status/500",
HTTP_STATUS_CODE: 500,
HTTP_REQUEST_METHOD: "GET",
URL_FULL: "http://mock/status/500",
HTTP_RESPONSE_STATUS_CODE: 500,
@ -520,7 +520,7 @@ class URLLibIntegrationTestBase(abc.ABC):
span = self.assert_span()
self.assertEqual(
span.attributes[SpanAttributes.HTTP_URL],
span.attributes[HTTP_URL],
"http://REDACTED:REDACTED@mock/status/200",
)