Sync with auto generated semantic convention constants (#428)

Author: srikanthccv

.github/workflows/test.yml

@@ -6,7 +6,7 @@ on:
     - 'release/*'
   pull_request:
 env:
-  CORE_REPO_SHA: 6bd163f6d670319eba6693b8465a068a1828f484
+  CORE_REPO_SHA: 3af190ca973ccef33d8e0816f79ae47b52824a98
 
 jobs:
   build:

exporter/opentelemetry-exporter-datadog/setup.cfg

@@ -41,6 +41,7 @@ install_requires =
     ddtrace>=0.34.0,<0.47.0
     opentelemetry-api == 1.0.1.dev0
     opentelemetry-sdk == 1.0.1.dev0
+    opentelemetry-semantic-conventions == 0.20.dev0
 
 [options.packages.find]
 where = src

exporter/opentelemetry-exporter-datadog/src/opentelemetry/exporter/datadog/exporter.py

@@ -30,6 +30,7 @@
 )
 from opentelemetry.sdk.trace import sampling
 from opentelemetry.sdk.trace.export import SpanExporter, SpanExportResult
+from opentelemetry.semconv.trace import SpanAttributes
 
 logger = logging.getLogger(__name__)
 
@@ -225,12 +226,12 @@ def _get_span_name(span):
 
 def _get_resource(span):
     """Get resource name for span"""
-    if "http.method" in span.attributes:
-        route = span.attributes.get("http.route")
+    if SpanAttributes.HTTP_METHOD in span.attributes:
+        route = span.attributes.get(SpanAttributes.HTTP_ROUTE)
         return (
-            span.attributes["http.method"] + " " + route
+            span.attributes[SpanAttributes.HTTP_METHOD] + " " + route
             if route
-            else span.attributes["http.method"]
+            else span.attributes[SpanAttributes.HTTP_METHOD]
         )
 
     return span.name

exporter/opentelemetry-exporter-datadog/tests/test_datadog_exporter.py

@@ -27,6 +27,7 @@
 from opentelemetry.sdk import trace
 from opentelemetry.sdk.trace import Resource, sampling
 from opentelemetry.sdk.util.instrumentation import InstrumentationInfo
+from opentelemetry.semconv.trace import SpanAttributes
 
 
 class MockDatadogSpanExporter(datadog.DatadogSpanExporter):
@@ -302,8 +303,14 @@ def test_export(self):
     def test_resources(self):
         test_attributes = [
             {},
-            {"http.method": "GET", "http.route": "/foo/<int:id>"},
-            {"http.method": "GET", "http.target": "/foo/200"},
+            {
+                SpanAttributes.HTTP_METHOD: "GET",
+                SpanAttributes.HTTP_ROUTE: "/foo/<int:id>",
+            },
+            {
+                SpanAttributes.HTTP_METHOD: "GET",
+                SpanAttributes.HTTP_TARGET: "/foo/200",
+            },
         ]
 
         for index, test in enumerate(test_attributes):

instrumentation/opentelemetry-instrumentation-aiohttp-client/setup.cfg

@@ -39,6 +39,7 @@ package_dir=
 packages=find_namespace:
 install_requires =
     opentelemetry-api == 1.0.1.dev0
+    opentelemetry-semantic-conventions == 0.20.dev0
     opentelemetry-instrumentation == 0.20.dev0
     aiohttp ~= 3.0
     wrapt >= 1.0.0, < 2.0.0

instrumentation/opentelemetry-instrumentation-aiohttp-client/src/opentelemetry/instrumentation/aiohttp_client/__init__.py

@@ -77,6 +77,7 @@ def strip_query_params(url: yarl.URL) -> str:
     unwrap,
 )
 from opentelemetry.propagate import inject
+from opentelemetry.semconv.trace import SpanAttributes
 from opentelemetry.trace import SpanKind, TracerProvider, get_tracer
 from opentelemetry.trace.status import Status, StatusCode
 
@@ -169,8 +170,10 @@ async def on_request_start(
 
         if trace_config_ctx.span.is_recording():
             attributes = {
-                "http.method": http_method,
-                "http.url": trace_config_ctx.url_filter(params.url)
+                SpanAttributes.HTTP_METHOD: http_method,
+                SpanAttributes.HTTP_URL: trace_config_ctx.url_filter(
+                    params.url
+                )
                 if callable(trace_config_ctx.url_filter)
                 else str(params.url),
             }
@@ -196,7 +199,7 @@ async def on_request_end(
                 Status(http_status_to_status_code(int(params.response.status)))
             )
             trace_config_ctx.span.set_attribute(
-                "http.status_code", params.response.status
+                SpanAttributes.HTTP_STATUS_CODE, params.response.status
             )
         _end_trace(trace_config_ctx)
 

instrumentation/opentelemetry-instrumentation-aiohttp-client/tests/test_aiohttp_client_integration.py

@@ -30,6 +30,7 @@
 from opentelemetry.instrumentation.aiohttp_client import (
     AioHttpClientInstrumentor,
 )
+from opentelemetry.semconv.trace import SpanAttributes
 from opentelemetry.test.test_base import TestBase
 from opentelemetry.trace import StatusCode
 
@@ -129,11 +130,13 @@ def test_status_codes(self):
                             "HTTP GET",
                             (span_status, None),
                             {
-                                "http.method": "GET",
-                                "http.url": "http://{}:{}/test-path?query=param#foobar".format(
+                                SpanAttributes.HTTP_METHOD: "GET",
+                                SpanAttributes.HTTP_URL: "http://{}:{}/test-path?query=param#foobar".format(
                                     host, port
                                 ),
-                                "http.status_code": int(status_code),
+                                SpanAttributes.HTTP_STATUS_CODE: int(
+                                    status_code
+                                ),
                             },
                         )
                     ]
@@ -185,11 +188,13 @@ def test_span_name_option(self):
                             expected,
                             (StatusCode.UNSET, None),
                             {
-                                "http.method": method,
-                                "http.url": "http://{}:{}{}".format(
+                                SpanAttributes.HTTP_METHOD: method,
+                                SpanAttributes.HTTP_URL: "http://{}:{}{}".format(
                                     host, port, path
                                 ),
-                                "http.status_code": int(HTTPStatus.OK),
+                                SpanAttributes.HTTP_STATUS_CODE: int(
+                                    HTTPStatus.OK
+                                ),
                             },
                         )
                     ]
@@ -215,11 +220,11 @@ def strip_query_params(url: yarl.URL) -> str:
                     "HTTP GET",
                     (StatusCode.UNSET, None),
                     {
-                        "http.method": "GET",
-                        "http.url": "http://{}:{}/some/path".format(
+                        SpanAttributes.HTTP_METHOD: "GET",
+                        SpanAttributes.HTTP_URL: "http://{}:{}/some/path".format(
                             host, port
                         ),
-                        "http.status_code": int(HTTPStatus.OK),
+                        SpanAttributes.HTTP_STATUS_CODE: int(HTTPStatus.OK),
                     },
                 )
             ]
@@ -250,7 +255,10 @@ async def do_request(url):
                     (
                         "HTTP GET",
                         (expected_status, None),
-                        {"http.method": "GET", "http.url": url},
+                        {
+                            SpanAttributes.HTTP_METHOD: "GET",
+                            SpanAttributes.HTTP_URL: url,
+                        },
                     )
                 ]
             )
@@ -275,8 +283,8 @@ async def request_handler(request):
                     "HTTP GET",
                     (StatusCode.ERROR, None),
                     {
-                        "http.method": "GET",
-                        "http.url": "http://{}:{}/test_timeout".format(
+                        SpanAttributes.HTTP_METHOD: "GET",
+                        SpanAttributes.HTTP_URL: "http://{}:{}/test_timeout".format(
                             host, port
                         ),
                     },
@@ -304,8 +312,8 @@ async def request_handler(request):
                     "HTTP GET",
                     (StatusCode.ERROR, None),
                     {
-                        "http.method": "GET",
-                        "http.url": "http://{}:{}/test_too_many_redirects".format(
+                        SpanAttributes.HTTP_METHOD: "GET",
+                        SpanAttributes.HTTP_URL: "http://{}:{}/test_too_many_redirects".format(
                             host, port
                         ),
                     },
@@ -352,12 +360,12 @@ def test_instrument(self):
             self.get_default_request(), self.URL, self.default_handler
         )
         span = self.assert_spans(1)
-        self.assertEqual("GET", span.attributes["http.method"])
+        self.assertEqual("GET", span.attributes[SpanAttributes.HTTP_METHOD])
         self.assertEqual(
             "http://{}:{}/test-path".format(host, port),
-            span.attributes["http.url"],
+            span.attributes[SpanAttributes.HTTP_URL],
         )
-        self.assertEqual(200, span.attributes["http.status_code"])
+        self.assertEqual(200, span.attributes[SpanAttributes.HTTP_STATUS_CODE])
 
     def test_instrument_with_existing_trace_config(self):
         trace_config = aiohttp.TraceConfig()
@@ -458,7 +466,7 @@ def strip_query_params(url: yarl.URL) -> str:
         span = self.assert_spans(1)
         self.assertEqual(
             "http://{}:{}/test-path".format(host, port),
-            span.attributes["http.url"],
+            span.attributes[SpanAttributes.HTTP_URL],
         )
 
     def test_span_name(self):

instrumentation/opentelemetry-instrumentation-aiopg/setup.cfg

@@ -39,6 +39,7 @@ package_dir=
 packages=find_namespace:
 install_requires =
     opentelemetry-api == 1.0.1.dev0
+    opentelemetry-semantic-conventions == 0.20.dev0
     opentelemetry-instrumentation-dbapi == 0.20.dev0
     opentelemetry-instrumentation == 0.20.dev0
     aiopg >= 0.13.0

instrumentation/opentelemetry-instrumentation-aiopg/tests/test_aiopg_integration.py

@@ -26,6 +26,7 @@
     AiopgIntegration,
 )
 from opentelemetry.sdk import resources
+from opentelemetry.semconv.trace import SpanAttributes
 from opentelemetry.test.test_base import TestBase
 
 
@@ -258,16 +259,24 @@ def test_span_succeeded(self):
         self.assertEqual(span.name, "Test")
         self.assertIs(span.kind, trace_api.SpanKind.CLIENT)
 
-        self.assertEqual(span.attributes["db.system"], "testcomponent")
-        self.assertEqual(span.attributes["db.name"], "testdatabase")
-        self.assertEqual(span.attributes["db.statement"], "Test query")
+        self.assertEqual(
+            span.attributes[SpanAttributes.DB_SYSTEM], "testcomponent"
+        )
+        self.assertEqual(
+            span.attributes[SpanAttributes.DB_NAME], "testdatabase"
+        )
+        self.assertEqual(
+            span.attributes[SpanAttributes.DB_STATEMENT], "Test query"
+        )
         self.assertEqual(
             span.attributes["db.statement.parameters"],
             "('param1Value', False)",
         )
-        self.assertEqual(span.attributes["db.user"], "testuser")
-        self.assertEqual(span.attributes["net.peer.name"], "testhost")
-        self.assertEqual(span.attributes["net.peer.port"], 123)
+        self.assertEqual(span.attributes[SpanAttributes.DB_USER], "testuser")
+        self.assertEqual(
+            span.attributes[SpanAttributes.NET_PEER_NAME], "testhost"
+        )
+        self.assertEqual(span.attributes[SpanAttributes.NET_PEER_PORT], 123)
         self.assertIs(span.status.status_code, trace_api.StatusCode.UNSET)
 
     def test_span_not_recording(self):
@@ -314,7 +323,9 @@ def test_span_failed(self):
         spans_list = self.memory_exporter.get_finished_spans()
         self.assertEqual(len(spans_list), 1)
         span = spans_list[0]
-        self.assertEqual(span.attributes["db.statement"], "Test query")
+        self.assertEqual(
+            span.attributes[SpanAttributes.DB_STATEMENT], "Test query"
+        )
         self.assertIs(span.status.status_code, trace_api.StatusCode.ERROR)
         self.assertEqual(span.status.description, "Exception: Test Exception")
 
@@ -329,7 +340,9 @@ def test_executemany(self):
 
         self.assertEqual(len(spans_list), 1)
         span = spans_list[0]
-        self.assertEqual(span.attributes["db.statement"], "Test query")
+        self.assertEqual(
+            span.attributes[SpanAttributes.DB_STATEMENT], "Test query"
+        )
 
     def test_callproc(self):
         db_integration = AiopgIntegration(self.tracer, "testcomponent")
@@ -343,7 +356,8 @@ def test_callproc(self):
         self.assertEqual(len(spans_list), 1)
         span = spans_list[0]
         self.assertEqual(
-            span.attributes["db.statement"], "Test stored procedure"
+            span.attributes[SpanAttributes.DB_STATEMENT],
+            "Test stored procedure",
         )
 
     def test_wrap_connect(self):

instrumentation/opentelemetry-instrumentation-asgi/setup.cfg

@@ -39,6 +39,7 @@ package_dir=
 packages=find_namespace:
 install_requires =
     opentelemetry-api == 1.0.1.dev0
+    opentelemetry-semantic-conventions == 0.20.dev0
     opentelemetry-instrumentation == 0.20.dev0
     asgiref ~= 3.0
 

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

@@ -30,6 +30,7 @@
 from opentelemetry.instrumentation.utils import http_status_to_status_code
 from opentelemetry.propagate import extract
 from opentelemetry.propagators.textmap import Getter
+from opentelemetry.semconv.trace import SpanAttributes
 from opentelemetry.trace.status import Status, StatusCode
 
 
@@ -80,27 +81,29 @@ def collect_request_attributes(scope):
         http_url = http_url + ("?" + urllib.parse.unquote(query_string))
 
     result = {
-        "http.scheme": scope.get("scheme"),
-        "http.host": server_host,
-        "net.host.port": port,
-        "http.flavor": scope.get("http_version"),
-        "http.target": scope.get("path"),
-        "http.url": http_url,
+        SpanAttributes.HTTP_SCHEME: scope.get("scheme"),
+        SpanAttributes.HTTP_HOST: server_host,
+        SpanAttributes.NET_HOST_PORT: port,
+        SpanAttributes.HTTP_FLAVOR: scope.get("http_version"),
+        SpanAttributes.HTTP_TARGET: scope.get("path"),
+        SpanAttributes.HTTP_URL: http_url,
     }
     http_method = scope.get("method")
     if http_method:
-        result["http.method"] = http_method
+        result[SpanAttributes.HTTP_METHOD] = http_method
 
     http_host_value_list = asgi_getter.get(scope, "host")
     if http_host_value_list:
-        result["http.server_name"] = ",".join(http_host_value_list)
+        result[SpanAttributes.HTTP_SERVER_NAME] = ",".join(
+            http_host_value_list
+        )
     http_user_agent = asgi_getter.get(scope, "user-agent")
     if http_user_agent:
-        result["http.user_agent"] = http_user_agent[0]
+        result[SpanAttributes.HTTP_USER_AGENT] = http_user_agent[0]
 
     if "client" in scope and scope["client"] is not None:
-        result["net.peer.ip"] = scope.get("client")[0]
-        result["net.peer.port"] = scope.get("client")[1]
+        result[SpanAttributes.NET_PEER_IP] = scope.get("client")[0]
+        result[SpanAttributes.NET_PEER_PORT] = scope.get("client")[1]
 
     # remove None values
     result = {k: v for k, v in result.items() if v is not None}
@@ -133,7 +136,7 @@ def set_status_code(span, status_code):
             )
         )
     else:
-        span.set_attribute("http.status_code", status_code)
+        span.set_attribute(SpanAttributes.HTTP_STATUS_CODE, status_code)
         span.set_status(Status(http_status_to_status_code(status_code)))