use existing sem conv.

instrumentation/opentelemetry-instrumentation-requests/src/opentelemetry/instrumentation/requests/__init__.py

@@ -129,18 +129,17 @@ def response_hook(span, request_obj, response):
     TEST_PATTERNS,
 )
 from opentelemetry.instrumentation.requests.package import _instruments
-from opentelemetry.instrumentation.requests.semconv import (
-    ATTR_USER_AGENT_SYNTHETIC_TYPE,
-    USER_AGENT_SYNTHETIC_TYPE_VALUE_BOT,
-    USER_AGENT_SYNTHETIC_TYPE_VALUE_TEST,
-)
 from opentelemetry.instrumentation.requests.version import __version__
 from opentelemetry.instrumentation.utils import (
     is_http_instrumentation_enabled,
     suppress_http_instrumentation,
 )
 from opentelemetry.metrics import Histogram, get_meter
 from opentelemetry.propagate import inject
+from opentelemetry.semconv._incubating.attributes.user_agent_attributes import (
+    USER_AGENT_SYNTHETIC_TYPE,
+    UserAgentSyntheticTypeValues,
+)
 from opentelemetry.semconv.attributes.error_attributes import ERROR_TYPE
 from opentelemetry.semconv.attributes.network_attributes import (
     NETWORK_PEER_ADDRESS,
@@ -175,8 +174,8 @@ def _detect_synthetic_user_agent(user_agent: str) -> Optional[str]:
         user_agent: The user agent string to analyze
 
     Returns:
-        USER_AGENT_SYNTHETIC_TYPE_VALUE_TEST if user agent contains any pattern from TEST_PATTERNS
-        USER_AGENT_SYNTHETIC_TYPE_VALUE_BOT if user agent contains any pattern from BOT_PATTERNS
+        UserAgentSyntheticTypeValues.TEST if user agent contains any pattern from TEST_PATTERNS
+        UserAgentSyntheticTypeValues.BOT if user agent contains any pattern from BOT_PATTERNS
         None otherwise
 
     Note: Test patterns take priority over bot patterns.
@@ -187,9 +186,9 @@ def _detect_synthetic_user_agent(user_agent: str) -> Optional[str]:
     user_agent_lower = user_agent.lower()
 
     if any(test_pattern in user_agent_lower for test_pattern in TEST_PATTERNS):
-        return USER_AGENT_SYNTHETIC_TYPE_VALUE_TEST
+        return UserAgentSyntheticTypeValues.TEST.value
     if any(bot_pattern in user_agent_lower for bot_pattern in BOT_PATTERNS):
-        return USER_AGENT_SYNTHETIC_TYPE_VALUE_BOT
+        return UserAgentSyntheticTypeValues.BOT.value
 
     return None
 
@@ -286,7 +285,7 @@ def get_or_create_headers():
         user_agent = headers.get("User-Agent")
         synthetic_type = _detect_synthetic_user_agent(user_agent)
         if synthetic_type:
-            span_attributes[ATTR_USER_AGENT_SYNTHETIC_TYPE] = synthetic_type
+            span_attributes[USER_AGENT_SYNTHETIC_TYPE] = synthetic_type
 
         metric_labels = {}
         _set_http_method(

instrumentation/opentelemetry-instrumentation-requests/tests/test_user_agent_synthetic.py

@@ -16,10 +16,9 @@
 import requests
 
 from opentelemetry.instrumentation.requests import RequestsInstrumentor
-from opentelemetry.instrumentation.requests.semconv import (
-    ATTR_USER_AGENT_SYNTHETIC_TYPE,
-    USER_AGENT_SYNTHETIC_TYPE_VALUE_BOT,
-    USER_AGENT_SYNTHETIC_TYPE_VALUE_TEST,
+from opentelemetry.semconv._incubating.attributes.user_agent_attributes import (
+    USER_AGENT_SYNTHETIC_TYPE,
+    UserAgentSyntheticTypeValues,
 )
 from opentelemetry.test.test_base import TestBase
 
@@ -56,8 +55,8 @@ def test_user_agent_bot_googlebot(self):
 
         span = self.assert_span()
         self.assertEqual(
-            span.attributes.get(ATTR_USER_AGENT_SYNTHETIC_TYPE),
-            USER_AGENT_SYNTHETIC_TYPE_VALUE_BOT,
+            span.attributes.get(USER_AGENT_SYNTHETIC_TYPE),
+            UserAgentSyntheticTypeValues.BOT.value,
         )
 
     def test_user_agent_bot_bingbot(self):
@@ -69,8 +68,8 @@ def test_user_agent_bot_bingbot(self):
 
         span = self.assert_span()
         self.assertEqual(
-            span.attributes.get(ATTR_USER_AGENT_SYNTHETIC_TYPE),
-            USER_AGENT_SYNTHETIC_TYPE_VALUE_BOT,
+            span.attributes.get(USER_AGENT_SYNTHETIC_TYPE),
+            UserAgentSyntheticTypeValues.BOT.value,
         )
 
     def test_user_agent_test_alwayson(self):
@@ -80,8 +79,8 @@ def test_user_agent_test_alwayson(self):
 
         span = self.assert_span()
         self.assertEqual(
-            span.attributes.get(ATTR_USER_AGENT_SYNTHETIC_TYPE),
-            USER_AGENT_SYNTHETIC_TYPE_VALUE_TEST,
+            span.attributes.get(USER_AGENT_SYNTHETIC_TYPE),
+            UserAgentSyntheticTypeValues.TEST.value,
         )
 
     def test_user_agent_case_insensitive(self):
@@ -91,8 +90,8 @@ def test_user_agent_case_insensitive(self):
 
         span = self.assert_span()
         self.assertEqual(
-            span.attributes.get(ATTR_USER_AGENT_SYNTHETIC_TYPE),
-            USER_AGENT_SYNTHETIC_TYPE_VALUE_BOT,
+            span.attributes.get(USER_AGENT_SYNTHETIC_TYPE),
+            UserAgentSyntheticTypeValues.BOT.value,
         )
 
         self.memory_exporter.clear()
@@ -102,8 +101,8 @@ def test_user_agent_case_insensitive(self):
 
         span = self.assert_span()
         self.assertEqual(
-            span.attributes.get(ATTR_USER_AGENT_SYNTHETIC_TYPE),
-            USER_AGENT_SYNTHETIC_TYPE_VALUE_TEST,
+            span.attributes.get(USER_AGENT_SYNTHETIC_TYPE),
+            UserAgentSyntheticTypeValues.TEST.value,
         )
 
     def test_user_agent_normal_browser(self):
@@ -114,22 +113,22 @@ def test_user_agent_normal_browser(self):
         requests.get(self.URL, headers=headers, timeout=5)
 
         span = self.assert_span()
-        self.assertNotIn(ATTR_USER_AGENT_SYNTHETIC_TYPE, span.attributes)
+        self.assertNotIn(USER_AGENT_SYNTHETIC_TYPE, span.attributes)
 
     def test_no_user_agent_header(self):
         """Test that requests without user agent don't get synthetic type"""
         requests.get(self.URL, timeout=5)
 
         span = self.assert_span()
-        self.assertNotIn(ATTR_USER_AGENT_SYNTHETIC_TYPE, span.attributes)
+        self.assertNotIn(USER_AGENT_SYNTHETIC_TYPE, span.attributes)
 
     def test_empty_user_agent_header(self):
         """Test that empty user agent doesn't get synthetic type"""
         headers = {"User-Agent": ""}
         requests.get(self.URL, headers=headers, timeout=5)
 
         span = self.assert_span()
-        self.assertNotIn(ATTR_USER_AGENT_SYNTHETIC_TYPE, span.attributes)
+        self.assertNotIn(USER_AGENT_SYNTHETIC_TYPE, span.attributes)
 
     def test_user_agent_substring_match(self):
         """Test that substrings are detected correctly"""
@@ -139,8 +138,8 @@ def test_user_agent_substring_match(self):
 
         span = self.assert_span()
         self.assertEqual(
-            span.attributes.get(ATTR_USER_AGENT_SYNTHETIC_TYPE),
-            USER_AGENT_SYNTHETIC_TYPE_VALUE_BOT,
+            span.attributes.get(USER_AGENT_SYNTHETIC_TYPE),
+            UserAgentSyntheticTypeValues.BOT.value,
         )
 
         self.memory_exporter.clear()
@@ -151,8 +150,8 @@ def test_user_agent_substring_match(self):
 
         span = self.assert_span()
         self.assertEqual(
-            span.attributes.get(ATTR_USER_AGENT_SYNTHETIC_TYPE),
-            USER_AGENT_SYNTHETIC_TYPE_VALUE_TEST,
+            span.attributes.get(USER_AGENT_SYNTHETIC_TYPE),
+            UserAgentSyntheticTypeValues.TEST.value,
         )
 
     def test_user_agent_priority_alwayson_over_bot(self):
@@ -163,6 +162,6 @@ def test_user_agent_priority_alwayson_over_bot(self):
         span = self.assert_span()
         # alwayson should be checked first and return 'test'
         self.assertEqual(
-            span.attributes.get(ATTR_USER_AGENT_SYNTHETIC_TYPE),
-            USER_AGENT_SYNTHETIC_TYPE_VALUE_TEST,
+            span.attributes.get(USER_AGENT_SYNTHETIC_TYPE),
+            UserAgentSyntheticTypeValues.TEST.value,
         )