U/eojeah/otel-semantic-attributes-http

.github/workflows/build.yaml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.7', '3.8']
+        python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
 
     steps:
     - uses: actions/checkout@v2

.gitignore

@@ -10,3 +10,5 @@ dist/
 venv
 tags
 *.swp
+.idea/
+.vscode/

.pre-commit-config.yaml

@@ -1,19 +1,18 @@
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v0.9.1
+    rev: v4.5.0
     hooks:
     -   id: trailing-whitespace
     -   id: end-of-file-fixer
-    -   id: autopep8-wrapper
     -   id: check-json
         files: \.(bowerrc|jshintrc|json)$
     -   id: check-yaml
     -   id: debug-statements
     -   id: name-tests-test
         exclude: tests/acceptance/test_helper.py
     -   id: requirements-txt-fixer
--   repo: https://gitlab.com/pycqa/flake8
-    rev: 5.0.4
+-   repo: https://github.com/pycqa/flake8
+    rev: 7.0.0
     hooks:
     -   id: flake8
         args:
@@ -23,9 +22,9 @@ repos:
     rev: v0.3.5
     hooks:
     -   id: reorder-python-imports
-        language_version: python3.7
+        language_version: python3.8
 -   repo: https://github.com/asottile/pyupgrade
     rev: v2.38.2
     hooks:
     -   id: pyupgrade
-        args: ['--py37-plus']
+        args: ['--py38-plus']

mypy.ini

@@ -1,5 +1,5 @@
 [mypy]
-python_version = 3.7
+python_version = 3.8
 pretty = true
 show_error_codes = true
 show_error_context = true

pyramid_zipkin/request_helper.py

@@ -174,6 +174,7 @@ def get_binary_annotations(
     }
     if response:
         annotations['response_status_code'] = str(response.status_code)
+        annotations['http.response.status_code'] = str(response.status_code)
 
     settings = request.registry.settings
     if 'zipkin.set_extra_binary_annotations' in settings:

pyramid_zipkin/tween.py

@@ -198,7 +198,8 @@ def tween(request: Request) -> Response:
             except Exception as e:
                 zipkin_context.update_binary_annotations({
                     'error.type': type(e).__name__,
-                    'response_status_code': '500'
+                    'response_status_code': '500',
+                    'http.response.status_code': '500',
                 })
                 raise e
             finally:

requirements-dev.txt

@@ -2,4 +2,5 @@ coverage
 mypy
 ordereddict
 pytest
+tox
 webtest

setup.py

@@ -28,8 +28,7 @@
         "Topic :: Software Development :: Libraries :: Python Modules",
         "License :: OSI Approved :: Apache Software License",
         "Operating System :: OS Independent",
-        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
     ],
-    python_requires=">=3.7",
+    python_requires=">=3.8",
 )

tests/acceptance/conftest.py

@@ -25,6 +25,7 @@ def get_span():
             'http.uri.qs': '/sample',
             'http.route': '/sample',
             'response_status_code': '200',
+            'http.response.status_code': '200',
         },
         'name': 'GET /sample',
         'traceId': '17133d482ba4f605',

tests/acceptance/server_span_test.py

@@ -173,6 +173,7 @@ def set_extra_binary_annotations(dummy_request, response):
         'http.uri.qs': '/pet/123?test=1',
         'http.route': '/pet/{petId}',
         'response_status_code': '200',
+        'http.response.status_code': '200',
         'other': '42',
     }
 
@@ -196,6 +197,7 @@ def test_binary_annotations_404(default_trace_id_generator):
         'http.uri.qs': '/abcd?test=1',
         'http.route': '',
         'response_status_code': '404',
+        'http.response.status_code': '404',
     }
 
 

tests/tween_test.py

@@ -90,7 +90,8 @@ def test_zipkin_tween_exception(
     called,
 ):
     """
-    If request processing has an exception set response_status_code to 500
+    If request processing has an exception set
+    response_status_code and http.response.status_code to 500
     """
 
     mock_post_handler_hook = mock.Mock()
@@ -116,6 +117,7 @@ def test_zipkin_tween_exception(
     assert len(spans) == 1
     span = json.loads(spans[0])[0]
     span['tags']['response_status_code'] = '500'
+    span['tags']['http.response.status_code'] = '500'
     span['tags']['error.type'] = 'Exception'
 
     assert handler.call_count == 1
@@ -149,6 +151,7 @@ def test_zipkin_tween_no_exception(
     assert len(spans) == 1
     span = json.loads(spans[0])[0]
     span['tags']['response_status_code'] = '200'
+    span['tags']['http.response.status_code'] = '200'
 
     assert handler.call_count == 1
     assert mock_post_handler_hook.call_count == called

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = pre-commit, py37, py38, flake8, pre-commit
+envlist = pre-commit, py38, py39, py310, py311, py312, flake8, pre-commit
 
 [testenv]
 deps = -rrequirements-dev.txt