Skip to content

Commit 474c83c

Browse files
IAmPrajnaIAmPrajna
committed
ref: migrate from SpanAttributes
1 parent 4a1e0ce commit 474c83c

File tree

1 file changed

+61
-49
lines changed

1 file changed

+61
-49
lines changed

‎instrumentation/opentelemetry-instrumentation-requests/tests/test_requests_integration.py‎

Lines changed: 61 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,19 @@
5151
SERVER_PORT,
5252
)
5353
from opentelemetry.semconv.attributes.url_attributes import URL_FULL
54-
from opentelemetry.semconv.trace import SpanAttributes
54+
from opentelemetry.semconv._incubating.attributes.http_attributes import (
55+
HTTP_FLAVOR,
56+
HTTP_HOST,
57+
HTTP_METHOD,
58+
HTTP_SCHEME,
59+
HTTP_STATUS_CODE,
60+
HTTP_URL,
61+
)
62+
from opentelemetry.semconv.schemas import Schemas
63+
from opentelemetry.semconv._incubating.attributes.net_attributes import (
64+
NET_PEER_NAME,
65+
NET_PEER_PORT,
66+
)
5567
from opentelemetry.test.mock_textmap import MockTextMapPropagator
5668
from opentelemetry.test.test_base import TestBase
5769
from opentelemetry.trace import StatusCode
@@ -161,9 +173,9 @@ def test_basic(self):
161173
self.assertEqual(
162174
span.attributes,
163175
{
164-
SpanAttributes.HTTP_METHOD: "GET",
165-
SpanAttributes.HTTP_URL: self.URL,
166-
SpanAttributes.HTTP_STATUS_CODE: 200,
176+
HTTP_METHOD: "GET",
177+
HTTP_URL: self.URL,
178+
HTTP_STATUS_CODE: 200,
167179
},
168180
)
169181

@@ -187,7 +199,7 @@ def test_basic_new_semconv(self):
187199

188200
self.assertEqual(
189201
span.instrumentation_scope.schema_url,
190-
SpanAttributes.SCHEMA_URL,
202+
"https://opentelemetry.io/schemas/1.21.0",
191203
)
192204
self.assertEqual(
193205
span.attributes,
@@ -223,22 +235,22 @@ def test_basic_both_semconv(self):
223235

224236
self.assertEqual(
225237
span.instrumentation_scope.schema_url,
226-
SpanAttributes.SCHEMA_URL,
238+
"https://opentelemetry.io/schemas/1.21.0",
227239
)
228240
self.assertEqual(
229241
span.attributes,
230242
{
231-
SpanAttributes.HTTP_METHOD: "GET",
243+
HTTP_METHOD: "GET",
232244
HTTP_REQUEST_METHOD: "GET",
233-
SpanAttributes.HTTP_URL: url_with_port,
245+
HTTP_URL: url_with_port,
234246
URL_FULL: url_with_port,
235-
SpanAttributes.HTTP_HOST: "mock",
247+
HTTP_HOST: "mock",
236248
SERVER_ADDRESS: "mock",
237249
NETWORK_PEER_ADDRESS: "mock",
238-
SpanAttributes.NET_PEER_PORT: 80,
239-
SpanAttributes.HTTP_STATUS_CODE: 200,
250+
NET_PEER_PORT: 80,
251+
HTTP_STATUS_CODE: 200,
240252
HTTP_RESPONSE_STATUS_CODE: 200,
241-
SpanAttributes.HTTP_FLAVOR: "1.1",
253+
HTTP_FLAVOR: "1.1",
242254
NETWORK_PROTOCOL_VERSION: "1.1",
243255
SERVER_PORT: 80,
244256
NETWORK_PEER_PORT: 80,
@@ -262,9 +274,9 @@ def test_nonstandard_http_method(self):
262274
self.assertEqual(
263275
span.attributes,
264276
{
265-
SpanAttributes.HTTP_METHOD: "_OTHER",
266-
SpanAttributes.HTTP_URL: self.URL,
267-
SpanAttributes.HTTP_STATUS_CODE: 405,
277+
HTTP_METHOD: "_OTHER",
278+
HTTP_URL: self.URL,
279+
HTTP_STATUS_CODE: 405,
268280
},
269281
)
270282

@@ -366,7 +378,7 @@ def test_not_foundbasic(self):
366378
span = self.assert_span()
367379

368380
self.assertEqual(
369-
span.attributes.get(SpanAttributes.HTTP_STATUS_CODE), 404
381+
span.attributes.get(HTTP_STATUS_CODE), 404
370382
)
371383

372384
self.assertIs(
@@ -407,7 +419,7 @@ def test_not_foundbasic_both_semconv(self):
407419
span = self.assert_span()
408420

409421
self.assertEqual(
410-
span.attributes.get(SpanAttributes.HTTP_STATUS_CODE), 404
422+
span.attributes.get(HTTP_STATUS_CODE), 404
411423
)
412424
self.assertEqual(span.attributes.get(HTTP_RESPONSE_STATUS_CODE), 404)
413425
self.assertEqual(span.attributes.get(ERROR_TYPE), "404")
@@ -523,9 +535,9 @@ def response_hook(
523535
self.assertEqual(
524536
span.attributes,
525537
{
526-
SpanAttributes.HTTP_METHOD: "GET",
527-
SpanAttributes.HTTP_URL: self.URL,
528-
SpanAttributes.HTTP_STATUS_CODE: 200,
538+
HTTP_METHOD: "GET",
539+
HTTP_URL: self.URL,
540+
HTTP_STATUS_CODE: 200,
529541
"http.response.body": "Hello!",
530542
},
531543
)
@@ -555,8 +567,8 @@ def test_requests_exception_without_response(self, *_, **__):
555567
self.assertEqual(
556568
span.attributes,
557569
{
558-
SpanAttributes.HTTP_METHOD: "GET",
559-
SpanAttributes.HTTP_URL: self.URL,
570+
HTTP_METHOD: "GET",
571+
HTTP_URL: self.URL,
560572
},
561573
)
562574
self.assertEqual(span.status.status_code, StatusCode.ERROR)
@@ -604,8 +616,8 @@ def test_requests_exception_without_proper_response_type(self, *_, **__):
604616
self.assertEqual(
605617
span.attributes,
606618
{
607-
SpanAttributes.HTTP_METHOD: "GET",
608-
SpanAttributes.HTTP_URL: self.URL,
619+
HTTP_METHOD: "GET",
620+
HTTP_URL: self.URL,
609621
},
610622
)
611623
self.assertEqual(span.status.status_code, StatusCode.ERROR)
@@ -626,9 +638,9 @@ def test_requests_exception_with_response(self, *_, **__):
626638
self.assertEqual(
627639
span.attributes,
628640
{
629-
SpanAttributes.HTTP_METHOD: "GET",
630-
SpanAttributes.HTTP_URL: self.URL,
631-
SpanAttributes.HTTP_STATUS_CODE: 500,
641+
HTTP_METHOD: "GET",
642+
HTTP_URL: self.URL,
643+
HTTP_STATUS_CODE: 500,
632644
},
633645
)
634646
self.assertEqual(span.status.status_code, StatusCode.ERROR)
@@ -684,7 +696,7 @@ def test_credential_removal(self):
684696
self.perform_request(new_url)
685697
span = self.assert_span()
686698

687-
self.assertEqual(span.attributes[SpanAttributes.HTTP_URL], self.URL)
699+
self.assertEqual(span.attributes[HTTP_URL], self.URL)
688700

689701
def test_if_headers_equals_none(self):
690702
result = requests.get(self.URL, headers=None, timeout=5)
@@ -745,13 +757,13 @@ def test_basic_metric_success(self):
745757
self.perform_request(self.URL)
746758

747759
expected_attributes = {
748-
SpanAttributes.HTTP_STATUS_CODE: 200,
749-
SpanAttributes.HTTP_HOST: "examplehost",
750-
SpanAttributes.NET_PEER_PORT: 8000,
751-
SpanAttributes.NET_PEER_NAME: "examplehost",
752-
SpanAttributes.HTTP_METHOD: "GET",
753-
SpanAttributes.HTTP_FLAVOR: "1.1",
754-
SpanAttributes.HTTP_SCHEME: "http",
760+
HTTP_STATUS_CODE: 200,
761+
HTTP_HOST: "examplehost",
762+
NET_PEER_PORT: 8000,
763+
NET_PEER_NAME: "examplehost",
764+
HTTP_METHOD: "GET",
765+
HTTP_FLAVOR: "1.1",
766+
HTTP_SCHEME: "http",
755767
}
756768

757769
for (
@@ -809,13 +821,13 @@ def test_basic_metric_both_semconv(self):
809821
self.perform_request(self.URL)
810822

811823
expected_attributes_old = {
812-
SpanAttributes.HTTP_STATUS_CODE: 200,
813-
SpanAttributes.HTTP_HOST: "examplehost",
814-
SpanAttributes.NET_PEER_PORT: 8000,
815-
SpanAttributes.NET_PEER_NAME: "examplehost",
816-
SpanAttributes.HTTP_METHOD: "GET",
817-
SpanAttributes.HTTP_FLAVOR: "1.1",
818-
SpanAttributes.HTTP_SCHEME: "http",
824+
HTTP_STATUS_CODE: 200,
825+
HTTP_HOST: "examplehost",
826+
NET_PEER_PORT: 8000,
827+
NET_PEER_NAME: "examplehost",
828+
HTTP_METHOD: "GET",
829+
HTTP_FLAVOR: "1.1",
830+
HTTP_SCHEME: "http",
819831
}
820832

821833
expected_attributes_new = {
@@ -879,13 +891,13 @@ def test_custom_histogram_boundaries_new_semconv(self):
879891

880892
def test_basic_metric_non_recording_span(self):
881893
expected_attributes = {
882-
SpanAttributes.HTTP_STATUS_CODE: 200,
883-
SpanAttributes.HTTP_HOST: "examplehost",
884-
SpanAttributes.NET_PEER_PORT: 8000,
885-
SpanAttributes.NET_PEER_NAME: "examplehost",
886-
SpanAttributes.HTTP_METHOD: "GET",
887-
SpanAttributes.HTTP_FLAVOR: "1.1",
888-
SpanAttributes.HTTP_SCHEME: "http",
894+
HTTP_STATUS_CODE: 200,
895+
HTTP_HOST: "examplehost",
896+
NET_PEER_PORT: 8000,
897+
NET_PEER_NAME: "examplehost",
898+
HTTP_METHOD: "GET",
899+
HTTP_FLAVOR: "1.1",
900+
HTTP_SCHEME: "http",
889901
}
890902

891903
with mock.patch("opentelemetry.trace.INVALID_SPAN") as mock_span:

0 commit comments

Comments
 (0)