Align HTTP status code as span data field http.response.status_code#2113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
antonpirker merged 18 commits into from
Jun 6, 2023
Merged

Align HTTP status code as span data field http.response.status_code#2113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
c2c7aa9
Save http status code everywhere in same format
antonpirker May 15, 2023
815d724
Fixed some tests
antonpirker May 15, 2023
47d42e5
Fixed some tests
antonpirker May 15, 2023
e083fed
Merge branch 'master' into antonpirker/2099-http-status-code
antonpirker May 15, 2023
ada9d62
Merge branch 'master' into antonpirker/2099-http-status-code
antonpirker May 23, 2023
3fef8e9
Merge branch 'antonpirker/2099-http-status-code' of github.com:getsen…
antonpirker May 23, 2023
6a23630
Made http status code a string and kept the tag for backwards compati…
antonpirker May 23, 2023
f40da08
Fixed some tests
antonpirker May 23, 2023
8984fb1
Fixed typing
antonpirker May 23, 2023
98da569
Renamed statuc_code field and made it int to make it like otel has it.
antonpirker Jun 5, 2023
21fa164
Merge branch 'master' into antonpirker/2099-http-status-code
antonpirker Jun 5, 2023
68bf7a5
Merge branch 'master' into antonpirker/2099-http-status-code
antonpirker Jun 5, 2023
2d5579f
Fixed tests
antonpirker Jun 5, 2023
b2d667c
Merge branch 'antonpirker/2099-http-status-code' of github.com:getsen…
antonpirker Jun 5, 2023
6a3da24
Fixed tests
antonpirker Jun 5, 2023
dc0d8f7
Backwards compatibility
antonpirker Jun 5, 2023
19835d2
Cleanup
antonpirker Jun 5, 2023
e3b04e1
Update sentry_sdk/consts.py
antonpirker Jun 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions sentry_sdk/consts.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -101,6 +101,12 @@ class SPANDATA:
Example: GET
"""

HTTP_STATUS_CODE = "http.response.status_code"
"""
The HTTP status code as an integer.
Example: 418
"""


class OP:
CACHE_GET_ITEM = "cache.get_item"
Expand Down
2 changes: 0 additions & 2 deletions sentry_sdk/integrations/httpx.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,6 @@ def send(self, request, **kwargs):

rv = real_send(self, request, **kwargs)

span.set_data("status_code", rv.status_code)
span.set_http_status(rv.status_code)
span.set_data("reason", rv.reason_phrase)

Expand DownExpand Up@@ -105,7 +104,6 @@ async def send(self, request, **kwargs):

rv = await real_send(self, request, **kwargs)

span.set_data("status_code", rv.status_code)
span.set_http_status(rv.status_code)
span.set_data("reason", rv.reason_phrase)

Expand Down
1 change: 0 additions & 1 deletion sentry_sdk/integrations/stdlib.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -120,7 +120,6 @@ def getresponse(self, *args, **kwargs):

rv = real_getresponse(self, *args, **kwargs)

span.set_data("status_code", rv.status)
span.set_http_status(int(rv.status))
span.set_data("reason", rv.reason)
span.finish()
Expand Down
6 changes: 5 additions & 1 deletion sentry_sdk/tracing.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
from sentry_sdk.consts import INSTRUMENTER
from sentry_sdk.utils import is_valid_sample_rate, logger, nanosecond_time
from sentry_sdk._compat import PY2
from sentry_sdk.consts import SPANDATA
from sentry_sdk._types import TYPE_CHECKING


Expand DownExpand Up@@ -370,7 +371,10 @@ def set_status(self, value):

def set_http_status(self, http_status):
# type: (int) -> None
self.set_tag("http.status_code", str(http_status))
self.set_tag(
"http.status_code", str(http_status)
) # we keep this for backwards compatability
self.set_data(SPANDATA.HTTP_STATUS_CODE, http_status)

if http_status < 400:
self.set_status("ok")
Expand Down
2 changes: 1 addition & 1 deletion tests/integrations/httpx/test_httpx.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ def before_breadcrumb(crumb, hint):
SPANDATA.HTTP_METHOD: "GET",
SPANDATA.HTTP_FRAGMENT: "",
SPANDATA.HTTP_QUERY: "",
"status_code": 200,
SPANDATA.HTTP_STATUS_CODE: 200,
"reason": "OK",
"extra": "foo",
}
Expand Down
6 changes: 2 additions & 4 deletions tests/integrations/opentelemetry/test_span_processor.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -190,11 +190,10 @@ def test_update_span_with_otel_data_http_method():

assert sentry_span.op == "http.client"
assert sentry_span.description == "GET example.com /"
assert sentry_span._tags["http.status_code"] == "429"
assert sentry_span.status == "resource_exhausted"

assert sentry_span._data["http.method"] == "GET"
assert sentry_span._data["http.status_code"] == 429
assert sentry_span._data["http.response.status_code"] == 429
assert sentry_span._data["http.status_text"] == "xxx"
assert sentry_span._data["http.user_agent"] == "curl/7.64.1"
assert sentry_span._data["net.peer.name"] == "example.com"
Expand All@@ -220,11 +219,10 @@ def test_update_span_with_otel_data_http_method2():

assert sentry_span.op == "http.server"
assert sentry_span.description == "GET https://example.com/status/403"
assert sentry_span._tags["http.status_code"] == "429"
assert sentry_span.status == "resource_exhausted"

assert sentry_span._data["http.method"] == "GET"
assert sentry_span._data["http.status_code"] == 429
assert sentry_span._data["http.response.status_code"] == 429
assert sentry_span._data["http.status_text"] == "xxx"
assert sentry_span._data["http.user_agent"] == "curl/7.64.1"
assert (
Expand Down
2 changes: 1 addition & 1 deletion tests/integrations/requests/test_requests.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,6 @@ def test_crumb_capture(sentry_init, capture_events):
SPANDATA.HTTP_METHOD: "GET",
SPANDATA.HTTP_FRAGMENT: "",
SPANDATA.HTTP_QUERY: "",
"status_code": response.status_code,
SPANDATA.HTTP_STATUS_CODE: response.status_code,
"reason": response.reason,
}
6 changes: 3 additions & 3 deletions tests/integrations/stdlib/test_httplib.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ def test_crumb_capture(sentry_init, capture_events):
assert crumb["data"] == {
"url": url,
SPANDATA.HTTP_METHOD: "GET",
"status_code": 200,
SPANDATA.HTTP_STATUS_CODE: 200,
"reason": "OK",
SPANDATA.HTTP_FRAGMENT: "",
SPANDATA.HTTP_QUERY: "",
Expand All@@ -76,7 +76,7 @@ def before_breadcrumb(crumb, hint):
assert crumb["data"] == {
"url": url,
SPANDATA.HTTP_METHOD: "GET",
"status_code": 200,
SPANDATA.HTTP_STATUS_CODE: 200,
"reason": "OK",
"extra": "foo",
SPANDATA.HTTP_FRAGMENT: "",
Expand DownExpand Up@@ -134,7 +134,7 @@ def test_httplib_misuse(sentry_init, capture_events, request):
assert crumb["data"] == {
"url": "http://localhost:{}/200".format(PORT),
SPANDATA.HTTP_METHOD: "GET",
"status_code": 200,
SPANDATA.HTTP_STATUS_CODE: 200,
"reason": "OK",
SPANDATA.HTTP_FRAGMENT: "",
SPANDATA.HTTP_QUERY: "",
Expand Down
2 changes: 1 addition & 1 deletion tests/tracing/test_noop_span.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ def test_noop_start_span(sentry_init):
assert isinstance(span, NoOpSpan)
assert sentry_sdk.Hub.current.scope.span is span

span.set_tag("http.status_code", "418")
span.set_tag("http.response.status_code", 418)
span.set_data("http.entity_type", "teapot")


Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Align HTTP status code as span data field http.response.status_code#2113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

antonpirker
merged 18 commits into

from

Jun 6, 2023
 Merged


Align HTTP status code as span data field http.response.status_code#2113
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


18 commits


Select commit
Hold shift + click to select a range
c2c7aa9

Save http status code everywhere in same format


antonpirker May 15, 2023
815d724

Fixed some tests


antonpirker May 15, 2023
47d42e5

Fixed some tests


antonpirker May 15, 2023
e083fed

Merge branch 'master' into antonpirker/2099-http-status-code


antonpirker May 15, 2023
ada9d62

Merge branch 'master' into antonpirker/2099-http-status-code


antonpirker May 23, 2023
3fef8e9

Merge branch 'antonpirker/2099-http-status-code' of github.com:getsen…


antonpirker May 23, 2023
6a23630

Made http status code a string and kept the tag for backwards compati…


antonpirker May 23, 2023
f40da08

Fixed some tests


antonpirker May 23, 2023
8984fb1

Fixed typing


antonpirker May 23, 2023
98da569

Renamed statuc_code field and made it int to make it like otel has it.


antonpirker Jun 5, 2023
21fa164

Merge branch 'master' into antonpirker/2099-http-status-code


antonpirker Jun 5, 2023
68bf7a5

Merge branch 'master' into antonpirker/2099-http-status-code


antonpirker Jun 5, 2023
2d5579f

Fixed tests


antonpirker Jun 5, 2023
b2d667c

Merge branch 'antonpirker/2099-http-status-code' of github.com:getsen…


antonpirker Jun 5, 2023
6a3da24

Fixed tests


antonpirker Jun 5, 2023
dc0d8f7

Backwards compatibility


antonpirker Jun 5, 2023
19835d2

Cleanup


antonpirker Jun 5, 2023
e3b04e1

Update sentry_sdk/consts.py


antonpirker Jun 6, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 6 additions & 0 deletions
sentry_sdk/consts.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,6 +101,12 @@ class SPANDATA:
 Example: GET
 """

 HTTP_STATUS_CODE = "http.response.status_code"
 """
 The HTTP status code as an integer.
 Example: 418
 """


class OP:
 CACHE_GET_ITEM = "cache.get_item"
Expand Down

2 changes: 0 additions & 2 deletions
sentry_sdk/integrations/httpx.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,6 @@ def send(self, request, **kwargs):

 rv = real_send(self, request, **kwargs)

 span.set_data("status_code", rv.status_code)
 span.set_http_status(rv.status_code)
 span.set_data("reason", rv.reason_phrase)

Expand DownExpand Up@@ -105,7 +104,6 @@ async def send(self, request, **kwargs):

 rv = await real_send(self, request, **kwargs)

 span.set_data("status_code", rv.status_code)
 span.set_http_status(rv.status_code)
 span.set_data("reason", rv.reason_phrase)

Expand Down

1 change: 0 additions & 1 deletion
sentry_sdk/integrations/stdlib.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -120,7 +120,6 @@ def getresponse(self, *args, **kwargs):

 rv = real_getresponse(self, *args, **kwargs)

 span.set_data("status_code", rv.status)
 span.set_http_status(int(rv.status))
 span.set_data("reason", rv.reason)
 span.finish()
Expand Down

6 changes: 5 additions & 1 deletion
sentry_sdk/tracing.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
from sentry_sdk.consts import INSTRUMENTER
from sentry_sdk.utils import is_valid_sample_rate, logger, nanosecond_time
from sentry_sdk._compat import PY2
from sentry_sdk.consts import SPANDATA
from sentry_sdk._types import TYPE_CHECKING


Expand DownExpand Up@@ -370,7 +371,10 @@ def set_status(self, value):

 def set_http_status(self, http_status):
 # type: (int) -> None
 self.set_tag("http.status_code", str(http_status))
 self.set_tag(
 "http.status_code", str(http_status)
 ) # we keep this for backwards compatability
 self.set_data(SPANDATA.HTTP_STATUS_CODE, http_status)

 if http_status < 400:
 self.set_status("ok")
Expand Down

2 changes: 1 addition & 1 deletion
tests/integrations/httpx/test_httpx.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ def before_breadcrumb(crumb, hint):
 SPANDATA.HTTP_METHOD: "GET",
 SPANDATA.HTTP_FRAGMENT: "",
 SPANDATA.HTTP_QUERY: "",
"status_code": 200,
SPANDATA.HTTP_STATUS_CODE: 200,
 "reason": "OK",
 "extra": "foo",
 }
Expand Down

6 changes: 2 additions & 4 deletions
tests/integrations/opentelemetry/test_span_processor.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -190,11 +190,10 @@ def test_update_span_with_otel_data_http_method():

 assert sentry_span.op == "http.client"
 assert sentry_span.description == "GET example.com /"
 assert sentry_span._tags["http.status_code"] == "429"
 assert sentry_span.status == "resource_exhausted"

 assert sentry_span._data["http.method"] == "GET"
 assert sentry_span._data["http.status_code"] == 429
 assert sentry_span._data["http.response.status_code"] == 429
 assert sentry_span._data["http.status_text"] == "xxx"
 assert sentry_span._data["http.user_agent"] == "curl/7.64.1"
 assert sentry_span._data["net.peer.name"] == "example.com"
Expand All@@ -220,11 +219,10 @@ def test_update_span_with_otel_data_http_method2():

 assert sentry_span.op == "http.server"
 assert sentry_span.description == "GET https://example.com/status/403"
 assert sentry_span._tags["http.status_code"] == "429"
 assert sentry_span.status == "resource_exhausted"

 assert sentry_span._data["http.method"] == "GET"
 assert sentry_span._data["http.status_code"] == 429
 assert sentry_span._data["http.response.status_code"] == 429
 assert sentry_span._data["http.status_text"] == "xxx"
 assert sentry_span._data["http.user_agent"] == "curl/7.64.1"
 assert (
Expand Down

2 changes: 1 addition & 1 deletion
tests/integrations/requests/test_requests.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,6 @@ def test_crumb_capture(sentry_init, capture_events):
 SPANDATA.HTTP_METHOD: "GET",
 SPANDATA.HTTP_FRAGMENT: "",
 SPANDATA.HTTP_QUERY: "",
"status_code": response.status_code,
SPANDATA.HTTP_STATUS_CODE: response.status_code,
 "reason": response.reason,
 }

6 changes: 3 additions & 3 deletions
tests/integrations/stdlib/test_httplib.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ def test_crumb_capture(sentry_init, capture_events):
 assert crumb["data"] == {
 "url": url,
 SPANDATA.HTTP_METHOD: "GET",
"status_code": 200,
SPANDATA.HTTP_STATUS_CODE: 200,
 "reason": "OK",
 SPANDATA.HTTP_FRAGMENT: "",
 SPANDATA.HTTP_QUERY: "",
Expand All@@ -76,7 +76,7 @@ def before_breadcrumb(crumb, hint):
 assert crumb["data"] == {
 "url": url,
 SPANDATA.HTTP_METHOD: "GET",
"status_code": 200,
SPANDATA.HTTP_STATUS_CODE: 200,
 "reason": "OK",
 "extra": "foo",
 SPANDATA.HTTP_FRAGMENT: "",
Expand DownExpand Up@@ -134,7 +134,7 @@ def test_httplib_misuse(sentry_init, capture_events, request):
 assert crumb["data"] == {
 "url": "http://localhost:{}/200".format(PORT),
 SPANDATA.HTTP_METHOD: "GET",
"status_code": 200,
SPANDATA.HTTP_STATUS_CODE: 200,
 "reason": "OK",
 SPANDATA.HTTP_FRAGMENT: "",
 SPANDATA.HTTP_QUERY: "",
Expand Down

2 changes: 1 addition & 1 deletion
tests/tracing/test_noop_span.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ def test_noop_start_span(sentry_init):
 assert isinstance(span, NoOpSpan)
 assert sentry_sdk.Hub.current.scope.span is span

 span.set_tag("http.status_code", "418")
 span.set_tag("http.response.status_code", 418)
 span.set_data("http.entity_type", "teapot")


Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Align HTTP status code as span data field http.response.status_code#2113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

antonpirker
merged 18 commits into

from

Jun 6, 2023
 Merged


Align HTTP status code as span data field http.response.status_code#2113
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


18 commits


Select commit
Hold shift + click to select a range
c2c7aa9

Save http status code everywhere in same format


antonpirker May 15, 2023
815d724

Fixed some tests


antonpirker May 15, 2023
47d42e5

Fixed some tests


antonpirker May 15, 2023
e083fed

Merge branch 'master' into antonpirker/2099-http-status-code


antonpirker May 15, 2023
ada9d62

Merge branch 'master' into antonpirker/2099-http-status-code


antonpirker May 23, 2023
3fef8e9

Merge branch 'antonpirker/2099-http-status-code' of github.com:getsen…


antonpirker May 23, 2023
6a23630

Made http status code a string and kept the tag for backwards compati…


antonpirker May 23, 2023
f40da08

Fixed some tests


antonpirker May 23, 2023
8984fb1

Fixed typing


antonpirker May 23, 2023
98da569

Renamed statuc_code field and made it int to make it like otel has it.


antonpirker Jun 5, 2023
21fa164

Merge branch 'master' into antonpirker/2099-http-status-code


antonpirker Jun 5, 2023
68bf7a5

Merge branch 'master' into antonpirker/2099-http-status-code


antonpirker Jun 5, 2023
2d5579f

Fixed tests


antonpirker Jun 5, 2023
b2d667c

Merge branch 'antonpirker/2099-http-status-code' of github.com:getsen…


antonpirker Jun 5, 2023
6a3da24

Fixed tests


antonpirker Jun 5, 2023
dc0d8f7

Backwards compatibility


antonpirker Jun 5, 2023
19835d2

Cleanup


antonpirker Jun 5, 2023
e3b04e1

Update sentry_sdk/consts.py


antonpirker Jun 6, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 6 additions & 0 deletions
sentry_sdk/consts.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,6 +101,12 @@ class SPANDATA:
 Example: GET
 """

 HTTP_STATUS_CODE = "http.response.status_code"
 """
 The HTTP status code as an integer.
 Example: 418
 """


class OP:
 CACHE_GET_ITEM = "cache.get_item"
Expand Down

2 changes: 0 additions & 2 deletions
sentry_sdk/integrations/httpx.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,6 @@ def send(self, request, **kwargs):

 rv = real_send(self, request, **kwargs)

 span.set_data("status_code", rv.status_code)
 span.set_http_status(rv.status_code)
 span.set_data("reason", rv.reason_phrase)

Expand DownExpand Up@@ -105,7 +104,6 @@ async def send(self, request, **kwargs):

 rv = await real_send(self, request, **kwargs)

 span.set_data("status_code", rv.status_code)
 span.set_http_status(rv.status_code)
 span.set_data("reason", rv.reason_phrase)

Expand Down

1 change: 0 additions & 1 deletion
sentry_sdk/integrations/stdlib.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -120,7 +120,6 @@ def getresponse(self, *args, **kwargs):

 rv = real_getresponse(self, *args, **kwargs)

 span.set_data("status_code", rv.status)
 span.set_http_status(int(rv.status))
 span.set_data("reason", rv.reason)
 span.finish()
Expand Down

6 changes: 5 additions & 1 deletion
sentry_sdk/tracing.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
from sentry_sdk.consts import INSTRUMENTER
from sentry_sdk.utils import is_valid_sample_rate, logger, nanosecond_time
from sentry_sdk._compat import PY2
from sentry_sdk.consts import SPANDATA
from sentry_sdk._types import TYPE_CHECKING


Expand DownExpand Up@@ -370,7 +371,10 @@ def set_status(self, value):

 def set_http_status(self, http_status):
 # type: (int) -> None
 self.set_tag("http.status_code", str(http_status))
 self.set_tag(
 "http.status_code", str(http_status)
 ) # we keep this for backwards compatability
 self.set_data(SPANDATA.HTTP_STATUS_CODE, http_status)

 if http_status < 400:
 self.set_status("ok")
Expand Down

2 changes: 1 addition & 1 deletion
tests/integrations/httpx/test_httpx.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ def before_breadcrumb(crumb, hint):
 SPANDATA.HTTP_METHOD: "GET",
 SPANDATA.HTTP_FRAGMENT: "",
 SPANDATA.HTTP_QUERY: "",
"status_code": 200,
SPANDATA.HTTP_STATUS_CODE: 200,
 "reason": "OK",
 "extra": "foo",
 }
Expand Down

6 changes: 2 additions & 4 deletions
tests/integrations/opentelemetry/test_span_processor.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -190,11 +190,10 @@ def test_update_span_with_otel_data_http_method():

 assert sentry_span.op == "http.client"
 assert sentry_span.description == "GET example.com /"
 assert sentry_span._tags["http.status_code"] == "429"
 assert sentry_span.status == "resource_exhausted"

 assert sentry_span._data["http.method"] == "GET"
 assert sentry_span._data["http.status_code"] == 429
 assert sentry_span._data["http.response.status_code"] == 429
 assert sentry_span._data["http.status_text"] == "xxx"
 assert sentry_span._data["http.user_agent"] == "curl/7.64.1"
 assert sentry_span._data["net.peer.name"] == "example.com"
Expand All@@ -220,11 +219,10 @@ def test_update_span_with_otel_data_http_method2():

 assert sentry_span.op == "http.server"
 assert sentry_span.description == "GET https://example.com/status/403"
 assert sentry_span._tags["http.status_code"] == "429"
 assert sentry_span.status == "resource_exhausted"

 assert sentry_span._data["http.method"] == "GET"
 assert sentry_span._data["http.status_code"] == 429
 assert sentry_span._data["http.response.status_code"] == 429
 assert sentry_span._data["http.status_text"] == "xxx"
 assert sentry_span._data["http.user_agent"] == "curl/7.64.1"
 assert (
Expand Down

2 changes: 1 addition & 1 deletion
tests/integrations/requests/test_requests.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,6 @@ def test_crumb_capture(sentry_init, capture_events):
 SPANDATA.HTTP_METHOD: "GET",
 SPANDATA.HTTP_FRAGMENT: "",
 SPANDATA.HTTP_QUERY: "",
"status_code": response.status_code,
SPANDATA.HTTP_STATUS_CODE: response.status_code,
 "reason": response.reason,
 }

6 changes: 3 additions & 3 deletions
tests/integrations/stdlib/test_httplib.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ def test_crumb_capture(sentry_init, capture_events):
 assert crumb["data"] == {
 "url": url,
 SPANDATA.HTTP_METHOD: "GET",
"status_code": 200,
SPANDATA.HTTP_STATUS_CODE: 200,
 "reason": "OK",
 SPANDATA.HTTP_FRAGMENT: "",
 SPANDATA.HTTP_QUERY: "",
Expand All@@ -76,7 +76,7 @@ def before_breadcrumb(crumb, hint):
 assert crumb["data"] == {
 "url": url,
 SPANDATA.HTTP_METHOD: "GET",
"status_code": 200,
SPANDATA.HTTP_STATUS_CODE: 200,
 "reason": "OK",
 "extra": "foo",
 SPANDATA.HTTP_FRAGMENT: "",
Expand DownExpand Up@@ -134,7 +134,7 @@ def test_httplib_misuse(sentry_init, capture_events, request):
 assert crumb["data"] == {
 "url": "http://localhost:{}/200".format(PORT),
 SPANDATA.HTTP_METHOD: "GET",
"status_code": 200,
SPANDATA.HTTP_STATUS_CODE: 200,
 "reason": "OK",
 SPANDATA.HTTP_FRAGMENT: "",
 SPANDATA.HTTP_QUERY: "",
Expand Down

2 changes: 1 addition & 1 deletion
tests/tracing/test_noop_span.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ def test_noop_start_span(sentry_init):
 assert isinstance(span, NoOpSpan)
 assert sentry_sdk.Hub.current.scope.span is span

 span.set_tag("http.status_code", "418")
 span.set_tag("http.response.status_code", 418)
 span.set_data("http.entity_type", "teapot")


Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Align HTTP status code as span data field http.response.status_code#2113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

antonpirker
merged 18 commits into

from

Jun 6, 2023
 Merged


Align HTTP status code as span data field http.response.status_code#2113
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


18 commits


Select commit
Hold shift + click to select a range
c2c7aa9

Save http status code everywhere in same format


antonpirker May 15, 2023
815d724

Fixed some tests


antonpirker May 15, 2023
47d42e5

Fixed some tests


antonpirker May 15, 2023
e083fed

Merge branch 'master' into antonpirker/2099-http-status-code


antonpirker May 15, 2023
ada9d62

Merge branch 'master' into antonpirker/2099-http-status-code


antonpirker May 23, 2023
3fef8e9

Merge branch 'antonpirker/2099-http-status-code' of github.com:getsen…


antonpirker May 23, 2023
6a23630

Made http status code a string and kept the tag for backwards compati…


antonpirker May 23, 2023
f40da08

Fixed some tests


antonpirker May 23, 2023
8984fb1

Fixed typing


antonpirker May 23, 2023
98da569

Renamed statuc_code field and made it int to make it like otel has it.


antonpirker Jun 5, 2023
21fa164

Merge branch 'master' into antonpirker/2099-http-status-code


antonpirker Jun 5, 2023
68bf7a5

Merge branch 'master' into antonpirker/2099-http-status-code


antonpirker Jun 5, 2023
2d5579f

Fixed tests


antonpirker Jun 5, 2023
b2d667c

Merge branch 'antonpirker/2099-http-status-code' of github.com:getsen…


antonpirker Jun 5, 2023
6a3da24

Fixed tests


antonpirker Jun 5, 2023
dc0d8f7

Backwards compatibility


antonpirker Jun 5, 2023
19835d2

Cleanup


antonpirker Jun 5, 2023
e3b04e1

Update sentry_sdk/consts.py


antonpirker Jun 6, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 6 additions & 0 deletions
sentry_sdk/consts.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,6 +101,12 @@ class SPANDATA:
 Example: GET
 """

 HTTP_STATUS_CODE = "http.response.status_code"
 """
 The HTTP status code as an integer.
 Example: 418
 """


class OP:
 CACHE_GET_ITEM = "cache.get_item"
Expand Down

2 changes: 0 additions & 2 deletions
sentry_sdk/integrations/httpx.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,6 @@ def send(self, request, **kwargs):

 rv = real_send(self, request, **kwargs)

 span.set_data("status_code", rv.status_code)
 span.set_http_status(rv.status_code)
 span.set_data("reason", rv.reason_phrase)

Expand DownExpand Up@@ -105,7 +104,6 @@ async def send(self, request, **kwargs):

 rv = await real_send(self, request, **kwargs)

 span.set_data("status_code", rv.status_code)
 span.set_http_status(rv.status_code)
 span.set_data("reason", rv.reason_phrase)

Expand Down

1 change: 0 additions & 1 deletion
sentry_sdk/integrations/stdlib.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -120,7 +120,6 @@ def getresponse(self, *args, **kwargs):

 rv = real_getresponse(self, *args, **kwargs)

 span.set_data("status_code", rv.status)
 span.set_http_status(int(rv.status))
 span.set_data("reason", rv.reason)
 span.finish()
Expand Down

6 changes: 5 additions & 1 deletion
sentry_sdk/tracing.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
from sentry_sdk.consts import INSTRUMENTER
from sentry_sdk.utils import is_valid_sample_rate, logger, nanosecond_time
from sentry_sdk._compat import PY2
from sentry_sdk.consts import SPANDATA
from sentry_sdk._types import TYPE_CHECKING


Expand DownExpand Up@@ -370,7 +371,10 @@ def set_status(self, value):

 def set_http_status(self, http_status):
 # type: (int) -> None
 self.set_tag("http.status_code", str(http_status))
 self.set_tag(
 "http.status_code", str(http_status)
 ) # we keep this for backwards compatability
 self.set_data(SPANDATA.HTTP_STATUS_CODE, http_status)

 if http_status < 400:
 self.set_status("ok")
Expand Down

2 changes: 1 addition & 1 deletion
tests/integrations/httpx/test_httpx.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ def before_breadcrumb(crumb, hint):
 SPANDATA.HTTP_METHOD: "GET",
 SPANDATA.HTTP_FRAGMENT: "",
 SPANDATA.HTTP_QUERY: "",
"status_code": 200,
SPANDATA.HTTP_STATUS_CODE: 200,
 "reason": "OK",
 "extra": "foo",
 }
Expand Down

6 changes: 2 additions & 4 deletions
tests/integrations/opentelemetry/test_span_processor.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -190,11 +190,10 @@ def test_update_span_with_otel_data_http_method():

 assert sentry_span.op == "http.client"
 assert sentry_span.description == "GET example.com /"
 assert sentry_span._tags["http.status_code"] == "429"
 assert sentry_span.status == "resource_exhausted"

 assert sentry_span._data["http.method"] == "GET"
 assert sentry_span._data["http.status_code"] == 429
 assert sentry_span._data["http.response.status_code"] == 429
 assert sentry_span._data["http.status_text"] == "xxx"
 assert sentry_span._data["http.user_agent"] == "curl/7.64.1"
 assert sentry_span._data["net.peer.name"] == "example.com"
Expand All@@ -220,11 +219,10 @@ def test_update_span_with_otel_data_http_method2():

 assert sentry_span.op == "http.server"
 assert sentry_span.description == "GET https://example.com/status/403"
 assert sentry_span._tags["http.status_code"] == "429"
 assert sentry_span.status == "resource_exhausted"

 assert sentry_span._data["http.method"] == "GET"
 assert sentry_span._data["http.status_code"] == 429
 assert sentry_span._data["http.response.status_code"] == 429
 assert sentry_span._data["http.status_text"] == "xxx"
 assert sentry_span._data["http.user_agent"] == "curl/7.64.1"
 assert (
Expand Down

2 changes: 1 addition & 1 deletion
tests/integrations/requests/test_requests.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,6 @@ def test_crumb_capture(sentry_init, capture_events):
 SPANDATA.HTTP_METHOD: "GET",
 SPANDATA.HTTP_FRAGMENT: "",
 SPANDATA.HTTP_QUERY: "",
"status_code": response.status_code,
SPANDATA.HTTP_STATUS_CODE: response.status_code,
 "reason": response.reason,
 }

6 changes: 3 additions & 3 deletions
tests/integrations/stdlib/test_httplib.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ def test_crumb_capture(sentry_init, capture_events):
 assert crumb["data"] == {
 "url": url,
 SPANDATA.HTTP_METHOD: "GET",
"status_code": 200,
SPANDATA.HTTP_STATUS_CODE: 200,
 "reason": "OK",
 SPANDATA.HTTP_FRAGMENT: "",
 SPANDATA.HTTP_QUERY: "",
Expand All@@ -76,7 +76,7 @@ def before_breadcrumb(crumb, hint):
 assert crumb["data"] == {
 "url": url,
 SPANDATA.HTTP_METHOD: "GET",
"status_code": 200,
SPANDATA.HTTP_STATUS_CODE: 200,
 "reason": "OK",
 "extra": "foo",
 SPANDATA.HTTP_FRAGMENT: "",
Expand DownExpand Up@@ -134,7 +134,7 @@ def test_httplib_misuse(sentry_init, capture_events, request):
 assert crumb["data"] == {
 "url": "http://localhost:{}/200".format(PORT),
 SPANDATA.HTTP_METHOD: "GET",
"status_code": 200,
SPANDATA.HTTP_STATUS_CODE: 200,
 "reason": "OK",
 SPANDATA.HTTP_FRAGMENT: "",
 SPANDATA.HTTP_QUERY: "",
Expand Down

2 changes: 1 addition & 1 deletion
tests/tracing/test_noop_span.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ def test_noop_start_span(sentry_init):
 assert isinstance(span, NoOpSpan)
 assert sentry_sdk.Hub.current.scope.span is span

 span.set_tag("http.status_code", "418")
 span.set_tag("http.response.status_code", 418)
 span.set_data("http.entity_type", "teapot")


Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Align HTTP status code as span data field http.response.status_code#2113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

antonpirker
merged 18 commits into

from

Jun 6, 2023
 Merged


Align HTTP status code as span data field http.response.status_code#2113
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


18 commits


Select commit
Hold shift + click to select a range
c2c7aa9

Save http status code everywhere in same format


antonpirker May 15, 2023
815d724

Fixed some tests


antonpirker May 15, 2023
47d42e5

Fixed some tests


antonpirker May 15, 2023
e083fed

Merge branch 'master' into antonpirker/2099-http-status-code


antonpirker May 15, 2023
ada9d62

Merge branch 'master' into antonpirker/2099-http-status-code


antonpirker May 23, 2023
3fef8e9

Merge branch 'antonpirker/2099-http-status-code' of github.com:getsen…


antonpirker May 23, 2023
6a23630

Made http status code a string and kept the tag for backwards compati…


antonpirker May 23, 2023
f40da08

Fixed some tests


antonpirker May 23, 2023
8984fb1

Fixed typing


antonpirker May 23, 2023
98da569

Renamed statuc_code field and made it int to make it like otel has it.


antonpirker Jun 5, 2023
21fa164

Merge branch 'master' into antonpirker/2099-http-status-code


antonpirker Jun 5, 2023
68bf7a5

Merge branch 'master' into antonpirker/2099-http-status-code


antonpirker Jun 5, 2023
2d5579f

Fixed tests


antonpirker Jun 5, 2023
b2d667c

Merge branch 'antonpirker/2099-http-status-code' of github.com:getsen…


antonpirker Jun 5, 2023
6a3da24

Fixed tests


antonpirker Jun 5, 2023
dc0d8f7

Backwards compatibility


antonpirker Jun 5, 2023
19835d2

Cleanup


antonpirker Jun 5, 2023
e3b04e1

Update sentry_sdk/consts.py


antonpirker Jun 6, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 6 additions & 0 deletions
sentry_sdk/consts.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,6 +101,12 @@ class SPANDATA:
 Example: GET
 """

 HTTP_STATUS_CODE = "http.response.status_code"
 """
 The HTTP status code as an integer.
 Example: 418
 """


class OP:
 CACHE_GET_ITEM = "cache.get_item"
Expand Down

2 changes: 0 additions & 2 deletions
sentry_sdk/integrations/httpx.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,6 @@ def send(self, request, **kwargs):

 rv = real_send(self, request, **kwargs)

 span.set_data("status_code", rv.status_code)
 span.set_http_status(rv.status_code)
 span.set_data("reason", rv.reason_phrase)

Expand DownExpand Up@@ -105,7 +104,6 @@ async def send(self, request, **kwargs):

 rv = await real_send(self, request, **kwargs)

 span.set_data("status_code", rv.status_code)
 span.set_http_status(rv.status_code)
 span.set_data("reason", rv.reason_phrase)

Expand Down

1 change: 0 additions & 1 deletion
sentry_sdk/integrations/stdlib.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -120,7 +120,6 @@ def getresponse(self, *args, **kwargs):

 rv = real_getresponse(self, *args, **kwargs)

 span.set_data("status_code", rv.status)
 span.set_http_status(int(rv.status))
 span.set_data("reason", rv.reason)
 span.finish()
Expand Down

6 changes: 5 additions & 1 deletion
sentry_sdk/tracing.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
from sentry_sdk.consts import INSTRUMENTER
from sentry_sdk.utils import is_valid_sample_rate, logger, nanosecond_time
from sentry_sdk._compat import PY2
from sentry_sdk.consts import SPANDATA
from sentry_sdk._types import TYPE_CHECKING


Expand DownExpand Up@@ -370,7 +371,10 @@ def set_status(self, value):

 def set_http_status(self, http_status):
 # type: (int) -> None
 self.set_tag("http.status_code", str(http_status))
 self.set_tag(
 "http.status_code", str(http_status)
 ) # we keep this for backwards compatability
 self.set_data(SPANDATA.HTTP_STATUS_CODE, http_status)

 if http_status < 400:
 self.set_status("ok")
Expand Down

2 changes: 1 addition & 1 deletion
tests/integrations/httpx/test_httpx.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ def before_breadcrumb(crumb, hint):
 SPANDATA.HTTP_METHOD: "GET",
 SPANDATA.HTTP_FRAGMENT: "",
 SPANDATA.HTTP_QUERY: "",
"status_code": 200,
SPANDATA.HTTP_STATUS_CODE: 200,
 "reason": "OK",
 "extra": "foo",
 }
Expand Down

6 changes: 2 additions & 4 deletions
tests/integrations/opentelemetry/test_span_processor.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -190,11 +190,10 @@ def test_update_span_with_otel_data_http_method():

 assert sentry_span.op == "http.client"
 assert sentry_span.description == "GET example.com /"
 assert sentry_span._tags["http.status_code"] == "429"
 assert sentry_span.status == "resource_exhausted"

 assert sentry_span._data["http.method"] == "GET"
 assert sentry_span._data["http.status_code"] == 429
 assert sentry_span._data["http.response.status_code"] == 429
 assert sentry_span._data["http.status_text"] == "xxx"
 assert sentry_span._data["http.user_agent"] == "curl/7.64.1"
 assert sentry_span._data["net.peer.name"] == "example.com"
Expand All@@ -220,11 +219,10 @@ def test_update_span_with_otel_data_http_method2():

 assert sentry_span.op == "http.server"
 assert sentry_span.description == "GET https://example.com/status/403"
 assert sentry_span._tags["http.status_code"] == "429"
 assert sentry_span.status == "resource_exhausted"

 assert sentry_span._data["http.method"] == "GET"
 assert sentry_span._data["http.status_code"] == 429
 assert sentry_span._data["http.response.status_code"] == 429
 assert sentry_span._data["http.status_text"] == "xxx"
 assert sentry_span._data["http.user_agent"] == "curl/7.64.1"
 assert (
Expand Down

2 changes: 1 addition & 1 deletion
tests/integrations/requests/test_requests.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,6 @@ def test_crumb_capture(sentry_init, capture_events):
 SPANDATA.HTTP_METHOD: "GET",
 SPANDATA.HTTP_FRAGMENT: "",
 SPANDATA.HTTP_QUERY: "",
"status_code": response.status_code,
SPANDATA.HTTP_STATUS_CODE: response.status_code,
 "reason": response.reason,
 }

6 changes: 3 additions & 3 deletions
tests/integrations/stdlib/test_httplib.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ def test_crumb_capture(sentry_init, capture_events):
 assert crumb["data"] == {
 "url": url,
 SPANDATA.HTTP_METHOD: "GET",
"status_code": 200,
SPANDATA.HTTP_STATUS_CODE: 200,
 "reason": "OK",
 SPANDATA.HTTP_FRAGMENT: "",
 SPANDATA.HTTP_QUERY: "",
Expand All@@ -76,7 +76,7 @@ def before_breadcrumb(crumb, hint):
 assert crumb["data"] == {
 "url": url,
 SPANDATA.HTTP_METHOD: "GET",
"status_code": 200,
SPANDATA.HTTP_STATUS_CODE: 200,
 "reason": "OK",
 "extra": "foo",
 SPANDATA.HTTP_FRAGMENT: "",
Expand DownExpand Up@@ -134,7 +134,7 @@ def test_httplib_misuse(sentry_init, capture_events, request):
 assert crumb["data"] == {
 "url": "http://localhost:{}/200".format(PORT),
 SPANDATA.HTTP_METHOD: "GET",
"status_code": 200,
SPANDATA.HTTP_STATUS_CODE: 200,
 "reason": "OK",
 SPANDATA.HTTP_FRAGMENT: "",
 SPANDATA.HTTP_QUERY: "",
Expand Down

2 changes: 1 addition & 1 deletion
tests/tracing/test_noop_span.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ def test_noop_start_span(sentry_init):
 assert isinstance(span, NoOpSpan)
 assert sentry_sdk.Hub.current.scope.span is span

 span.set_tag("http.status_code", "418")
 span.set_tag("http.response.status_code", 418)
 span.set_data("http.entity_type", "teapot")


Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Align HTTP status code as span data field http.response.status_code#2113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

antonpirker
merged 18 commits into

from

Jun 6, 2023
 Merged


Align HTTP status code as span data field http.response.status_code#2113
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


18 commits


Select commit
Hold shift + click to select a range
c2c7aa9

Save http status code everywhere in same format


antonpirker May 15, 2023
815d724

Fixed some tests


antonpirker May 15, 2023
47d42e5

Fixed some tests


antonpirker May 15, 2023
e083fed

Merge branch 'master' into antonpirker/2099-http-status-code


antonpirker May 15, 2023
ada9d62

Merge branch 'master' into antonpirker/2099-http-status-code


antonpirker May 23, 2023
3fef8e9

Merge branch 'antonpirker/2099-http-status-code' of github.com:getsen…


antonpirker May 23, 2023
6a23630

Made http status code a string and kept the tag for backwards compati…


antonpirker May 23, 2023
f40da08

Fixed some tests


antonpirker May 23, 2023
8984fb1

Fixed typing


antonpirker May 23, 2023
98da569

Renamed statuc_code field and made it int to make it like otel has it.


antonpirker Jun 5, 2023
21fa164

Merge branch 'master' into antonpirker/2099-http-status-code


antonpirker Jun 5, 2023
68bf7a5

Merge branch 'master' into antonpirker/2099-http-status-code


antonpirker Jun 5, 2023
2d5579f

Fixed tests


antonpirker Jun 5, 2023
b2d667c

Merge branch 'antonpirker/2099-http-status-code' of github.com:getsen…


antonpirker Jun 5, 2023
6a3da24

Fixed tests


antonpirker Jun 5, 2023
dc0d8f7

Backwards compatibility


antonpirker Jun 5, 2023
19835d2

Cleanup


antonpirker Jun 5, 2023
e3b04e1

Update sentry_sdk/consts.py


antonpirker Jun 6, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 6 additions & 0 deletions
sentry_sdk/consts.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,6 +101,12 @@ class SPANDATA:
 Example: GET
 """

 HTTP_STATUS_CODE = "http.response.status_code"
 """
 The HTTP status code as an integer.
 Example: 418
 """


class OP:
 CACHE_GET_ITEM = "cache.get_item"
Expand Down

2 changes: 0 additions & 2 deletions
sentry_sdk/integrations/httpx.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,6 @@ def send(self, request, **kwargs):

 rv = real_send(self, request, **kwargs)

 span.set_data("status_code", rv.status_code)
 span.set_http_status(rv.status_code)
 span.set_data("reason", rv.reason_phrase)

Expand DownExpand Up@@ -105,7 +104,6 @@ async def send(self, request, **kwargs):

 rv = await real_send(self, request, **kwargs)

 span.set_data("status_code", rv.status_code)
 span.set_http_status(rv.status_code)
 span.set_data("reason", rv.reason_phrase)

Expand Down

1 change: 0 additions & 1 deletion
sentry_sdk/integrations/stdlib.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -120,7 +120,6 @@ def getresponse(self, *args, **kwargs):

 rv = real_getresponse(self, *args, **kwargs)

 span.set_data("status_code", rv.status)
 span.set_http_status(int(rv.status))
 span.set_data("reason", rv.reason)
 span.finish()
Expand Down

6 changes: 5 additions & 1 deletion
sentry_sdk/tracing.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
from sentry_sdk.consts import INSTRUMENTER
from sentry_sdk.utils import is_valid_sample_rate, logger, nanosecond_time
from sentry_sdk._compat import PY2
from sentry_sdk.consts import SPANDATA
from sentry_sdk._types import TYPE_CHECKING


Expand DownExpand Up@@ -370,7 +371,10 @@ def set_status(self, value):

 def set_http_status(self, http_status):
 # type: (int) -> None
 self.set_tag("http.status_code", str(http_status))
 self.set_tag(
 "http.status_code", str(http_status)
 ) # we keep this for backwards compatability
 self.set_data(SPANDATA.HTTP_STATUS_CODE, http_status)

 if http_status < 400:
 self.set_status("ok")
Expand Down

2 changes: 1 addition & 1 deletion
tests/integrations/httpx/test_httpx.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ def before_breadcrumb(crumb, hint):
 SPANDATA.HTTP_METHOD: "GET",
 SPANDATA.HTTP_FRAGMENT: "",
 SPANDATA.HTTP_QUERY: "",
"status_code": 200,
SPANDATA.HTTP_STATUS_CODE: 200,
 "reason": "OK",
 "extra": "foo",
 }
Expand Down

6 changes: 2 additions & 4 deletions
tests/integrations/opentelemetry/test_span_processor.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -190,11 +190,10 @@ def test_update_span_with_otel_data_http_method():

 assert sentry_span.op == "http.client"
 assert sentry_span.description == "GET example.com /"
 assert sentry_span._tags["http.status_code"] == "429"
 assert sentry_span.status == "resource_exhausted"

 assert sentry_span._data["http.method"] == "GET"
 assert sentry_span._data["http.status_code"] == 429
 assert sentry_span._data["http.response.status_code"] == 429
 assert sentry_span._data["http.status_text"] == "xxx"
 assert sentry_span._data["http.user_agent"] == "curl/7.64.1"
 assert sentry_span._data["net.peer.name"] == "example.com"
Expand All@@ -220,11 +219,10 @@ def test_update_span_with_otel_data_http_method2():

 assert sentry_span.op == "http.server"
 assert sentry_span.description == "GET https://example.com/status/403"
 assert sentry_span._tags["http.status_code"] == "429"
 assert sentry_span.status == "resource_exhausted"

 assert sentry_span._data["http.method"] == "GET"
 assert sentry_span._data["http.status_code"] == 429
 assert sentry_span._data["http.response.status_code"] == 429
 assert sentry_span._data["http.status_text"] == "xxx"
 assert sentry_span._data["http.user_agent"] == "curl/7.64.1"
 assert (
Expand Down

2 changes: 1 addition & 1 deletion
tests/integrations/requests/test_requests.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,6 @@ def test_crumb_capture(sentry_init, capture_events):
 SPANDATA.HTTP_METHOD: "GET",
 SPANDATA.HTTP_FRAGMENT: "",
 SPANDATA.HTTP_QUERY: "",
"status_code": response.status_code,
SPANDATA.HTTP_STATUS_CODE: response.status_code,
 "reason": response.reason,
 }

6 changes: 3 additions & 3 deletions
tests/integrations/stdlib/test_httplib.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ def test_crumb_capture(sentry_init, capture_events):
 assert crumb["data"] == {
 "url": url,
 SPANDATA.HTTP_METHOD: "GET",
"status_code": 200,
SPANDATA.HTTP_STATUS_CODE: 200,
 "reason": "OK",
 SPANDATA.HTTP_FRAGMENT: "",
 SPANDATA.HTTP_QUERY: "",
Expand All@@ -76,7 +76,7 @@ def before_breadcrumb(crumb, hint):
 assert crumb["data"] == {
 "url": url,
 SPANDATA.HTTP_METHOD: "GET",
"status_code": 200,
SPANDATA.HTTP_STATUS_CODE: 200,
 "reason": "OK",
 "extra": "foo",
 SPANDATA.HTTP_FRAGMENT: "",
Expand DownExpand Up@@ -134,7 +134,7 @@ def test_httplib_misuse(sentry_init, capture_events, request):
 assert crumb["data"] == {
 "url": "http://localhost:{}/200".format(PORT),
 SPANDATA.HTTP_METHOD: "GET",
"status_code": 200,
SPANDATA.HTTP_STATUS_CODE: 200,
 "reason": "OK",
 SPANDATA.HTTP_FRAGMENT: "",
 SPANDATA.HTTP_QUERY: "",
Expand Down

2 changes: 1 addition & 1 deletion
tests/tracing/test_noop_span.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ def test_noop_start_span(sentry_init):
 assert isinstance(span, NoOpSpan)
 assert sentry_sdk.Hub.current.scope.span is span

 span.set_tag("http.status_code", "418")
 span.set_tag("http.response.status_code", 418)
 span.set_data("http.entity_type", "teapot")


Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Align HTTP status code as span data field http.response.status_code#2113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

antonpirker
merged 18 commits into

from

Jun 6, 2023
 Merged


Align HTTP status code as span data field http.response.status_code#2113
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


18 commits


Select commit
Hold shift + click to select a range
c2c7aa9

Save http status code everywhere in same format


antonpirker May 15, 2023
815d724

Fixed some tests


antonpirker May 15, 2023
47d42e5

Fixed some tests


antonpirker May 15, 2023
e083fed

Merge branch 'master' into antonpirker/2099-http-status-code


antonpirker May 15, 2023
ada9d62

Merge branch 'master' into antonpirker/2099-http-status-code


antonpirker May 23, 2023
3fef8e9

Merge branch 'antonpirker/2099-http-status-code' of github.com:getsen…


antonpirker May 23, 2023
6a23630

Made http status code a string and kept the tag for backwards compati…


antonpirker May 23, 2023
f40da08

Fixed some tests


antonpirker May 23, 2023
8984fb1

Fixed typing


antonpirker May 23, 2023
98da569

Renamed statuc_code field and made it int to make it like otel has it.


antonpirker Jun 5, 2023
21fa164

Merge branch 'master' into antonpirker/2099-http-status-code


antonpirker Jun 5, 2023
68bf7a5

Merge branch 'master' into antonpirker/2099-http-status-code


antonpirker Jun 5, 2023
2d5579f

Fixed tests


antonpirker Jun 5, 2023
b2d667c

Merge branch 'antonpirker/2099-http-status-code' of github.com:getsen…


antonpirker Jun 5, 2023
6a3da24

Fixed tests


antonpirker Jun 5, 2023
dc0d8f7

Backwards compatibility


antonpirker Jun 5, 2023
19835d2

Cleanup


antonpirker Jun 5, 2023
e3b04e1

Update sentry_sdk/consts.py


antonpirker Jun 6, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 6 additions & 0 deletions
sentry_sdk/consts.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,6 +101,12 @@ class SPANDATA:
 Example: GET
 """

 HTTP_STATUS_CODE = "http.response.status_code"
 """
 The HTTP status code as an integer.
 Example: 418
 """


class OP:
 CACHE_GET_ITEM = "cache.get_item"
Expand Down

2 changes: 0 additions & 2 deletions
sentry_sdk/integrations/httpx.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,6 @@ def send(self, request, **kwargs):

 rv = real_send(self, request, **kwargs)

 span.set_data("status_code", rv.status_code)
 span.set_http_status(rv.status_code)
 span.set_data("reason", rv.reason_phrase)

Expand DownExpand Up@@ -105,7 +104,6 @@ async def send(self, request, **kwargs):

 rv = await real_send(self, request, **kwargs)

 span.set_data("status_code", rv.status_code)
 span.set_http_status(rv.status_code)
 span.set_data("reason", rv.reason_phrase)

Expand Down

1 change: 0 additions & 1 deletion
sentry_sdk/integrations/stdlib.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -120,7 +120,6 @@ def getresponse(self, *args, **kwargs):

 rv = real_getresponse(self, *args, **kwargs)

 span.set_data("status_code", rv.status)
 span.set_http_status(int(rv.status))
 span.set_data("reason", rv.reason)
 span.finish()
Expand Down

6 changes: 5 additions & 1 deletion
sentry_sdk/tracing.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
from sentry_sdk.consts import INSTRUMENTER
from sentry_sdk.utils import is_valid_sample_rate, logger, nanosecond_time
from sentry_sdk._compat import PY2
from sentry_sdk.consts import SPANDATA
from sentry_sdk._types import TYPE_CHECKING


Expand DownExpand Up@@ -370,7 +371,10 @@ def set_status(self, value):

 def set_http_status(self, http_status):
 # type: (int) -> None
 self.set_tag("http.status_code", str(http_status))
 self.set_tag(
 "http.status_code", str(http_status)
 ) # we keep this for backwards compatability
 self.set_data(SPANDATA.HTTP_STATUS_CODE, http_status)

 if http_status < 400:
 self.set_status("ok")
Expand Down

2 changes: 1 addition & 1 deletion
tests/integrations/httpx/test_httpx.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ def before_breadcrumb(crumb, hint):
 SPANDATA.HTTP_METHOD: "GET",
 SPANDATA.HTTP_FRAGMENT: "",
 SPANDATA.HTTP_QUERY: "",
"status_code": 200,
SPANDATA.HTTP_STATUS_CODE: 200,
 "reason": "OK",
 "extra": "foo",
 }
Expand Down

6 changes: 2 additions & 4 deletions
tests/integrations/opentelemetry/test_span_processor.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -190,11 +190,10 @@ def test_update_span_with_otel_data_http_method():

 assert sentry_span.op == "http.client"
 assert sentry_span.description == "GET example.com /"
 assert sentry_span._tags["http.status_code"] == "429"
 assert sentry_span.status == "resource_exhausted"

 assert sentry_span._data["http.method"] == "GET"
 assert sentry_span._data["http.status_code"] == 429
 assert sentry_span._data["http.response.status_code"] == 429
 assert sentry_span._data["http.status_text"] == "xxx"
 assert sentry_span._data["http.user_agent"] == "curl/7.64.1"
 assert sentry_span._data["net.peer.name"] == "example.com"
Expand All@@ -220,11 +219,10 @@ def test_update_span_with_otel_data_http_method2():

 assert sentry_span.op == "http.server"
 assert sentry_span.description == "GET https://example.com/status/403"
 assert sentry_span._tags["http.status_code"] == "429"
 assert sentry_span.status == "resource_exhausted"

 assert sentry_span._data["http.method"] == "GET"
 assert sentry_span._data["http.status_code"] == 429
 assert sentry_span._data["http.response.status_code"] == 429
 assert sentry_span._data["http.status_text"] == "xxx"
 assert sentry_span._data["http.user_agent"] == "curl/7.64.1"
 assert (
Expand Down

2 changes: 1 addition & 1 deletion
tests/integrations/requests/test_requests.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,6 @@ def test_crumb_capture(sentry_init, capture_events):
 SPANDATA.HTTP_METHOD: "GET",
 SPANDATA.HTTP_FRAGMENT: "",
 SPANDATA.HTTP_QUERY: "",
"status_code": response.status_code,
SPANDATA.HTTP_STATUS_CODE: response.status_code,
 "reason": response.reason,
 }

6 changes: 3 additions & 3 deletions
tests/integrations/stdlib/test_httplib.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ def test_crumb_capture(sentry_init, capture_events):
 assert crumb["data"] == {
 "url": url,
 SPANDATA.HTTP_METHOD: "GET",
"status_code": 200,
SPANDATA.HTTP_STATUS_CODE: 200,
 "reason": "OK",
 SPANDATA.HTTP_FRAGMENT: "",
 SPANDATA.HTTP_QUERY: "",
Expand All@@ -76,7 +76,7 @@ def before_breadcrumb(crumb, hint):
 assert crumb["data"] == {
 "url": url,
 SPANDATA.HTTP_METHOD: "GET",
"status_code": 200,
SPANDATA.HTTP_STATUS_CODE: 200,
 "reason": "OK",
 "extra": "foo",
 SPANDATA.HTTP_FRAGMENT: "",
Expand DownExpand Up@@ -134,7 +134,7 @@ def test_httplib_misuse(sentry_init, capture_events, request):
 assert crumb["data"] == {
 "url": "http://localhost:{}/200".format(PORT),
 SPANDATA.HTTP_METHOD: "GET",
"status_code": 200,
SPANDATA.HTTP_STATUS_CODE: 200,
 "reason": "OK",
 SPANDATA.HTTP_FRAGMENT: "",
 SPANDATA.HTTP_QUERY: "",
Expand Down

2 changes: 1 addition & 1 deletion
tests/tracing/test_noop_span.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ def test_noop_start_span(sentry_init):
 assert isinstance(span, NoOpSpan)
 assert sentry_sdk.Hub.current.scope.span is span

 span.set_tag("http.status_code", "418")
 span.set_tag("http.response.status_code", 418)
 span.set_data("http.entity_type", "teapot")


Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Align HTTP status code as span data field http.response.status_code#2113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

antonpirker
merged 18 commits into

from

Jun 6, 2023
 Merged


Align HTTP status code as span data field http.response.status_code#2113
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


18 commits


Select commit
Hold shift + click to select a range
c2c7aa9

Save http status code everywhere in same format


antonpirker May 15, 2023
815d724

Fixed some tests


antonpirker May 15, 2023
47d42e5

Fixed some tests


antonpirker May 15, 2023
e083fed

Merge branch 'master' into antonpirker/2099-http-status-code


antonpirker May 15, 2023
ada9d62

Merge branch 'master' into antonpirker/2099-http-status-code


antonpirker May 23, 2023
3fef8e9

Merge branch 'antonpirker/2099-http-status-code' of github.com:getsen…


antonpirker May 23, 2023
6a23630

Made http status code a string and kept the tag for backwards compati…


antonpirker May 23, 2023
f40da08

Fixed some tests


antonpirker May 23, 2023
8984fb1

Fixed typing


antonpirker May 23, 2023
98da569

Renamed statuc_code field and made it int to make it like otel has it.


antonpirker Jun 5, 2023
21fa164

Merge branch 'master' into antonpirker/2099-http-status-code


antonpirker Jun 5, 2023
68bf7a5

Merge branch 'master' into antonpirker/2099-http-status-code


antonpirker Jun 5, 2023
2d5579f

Fixed tests


antonpirker Jun 5, 2023
b2d667c

Merge branch 'antonpirker/2099-http-status-code' of github.com:getsen…


antonpirker Jun 5, 2023
6a3da24

Fixed tests


antonpirker Jun 5, 2023
dc0d8f7

Backwards compatibility


antonpirker Jun 5, 2023
19835d2

Cleanup


antonpirker Jun 5, 2023
e3b04e1

Update sentry_sdk/consts.py


antonpirker Jun 6, 2023

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


6 changes: 6 additions & 0 deletions
sentry_sdk/consts.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -101,6 +101,12 @@ class SPANDATA:
 Example: GET
 """

 HTTP_STATUS_CODE = "http.response.status_code"
 """
 The HTTP status code as an integer.
 Example: 418
 """


class OP:
 CACHE_GET_ITEM = "cache.get_item"
Expand Down

2 changes: 0 additions & 2 deletions
sentry_sdk/integrations/httpx.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -64,7 +64,6 @@ def send(self, request, **kwargs):

 rv = real_send(self, request, **kwargs)

 span.set_data("status_code", rv.status_code)
 span.set_http_status(rv.status_code)
 span.set_data("reason", rv.reason_phrase)

Expand DownExpand Up@@ -105,7 +104,6 @@ async def send(self, request, **kwargs):

 rv = await real_send(self, request, **kwargs)

 span.set_data("status_code", rv.status_code)
 span.set_http_status(rv.status_code)
 span.set_data("reason", rv.reason_phrase)

Expand Down

1 change: 0 additions & 1 deletion
sentry_sdk/integrations/stdlib.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -120,7 +120,6 @@ def getresponse(self, *args, **kwargs):

 rv = real_getresponse(self, *args, **kwargs)

 span.set_data("status_code", rv.status)
 span.set_http_status(int(rv.status))
 span.set_data("reason", rv.reason)
 span.finish()
Expand Down

6 changes: 5 additions & 1 deletion
sentry_sdk/tracing.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
from sentry_sdk.consts import INSTRUMENTER
from sentry_sdk.utils import is_valid_sample_rate, logger, nanosecond_time
from sentry_sdk._compat import PY2
from sentry_sdk.consts import SPANDATA
from sentry_sdk._types import TYPE_CHECKING


Expand DownExpand Up@@ -370,7 +371,10 @@ def set_status(self, value):

 def set_http_status(self, http_status):
 # type: (int) -> None
 self.set_tag("http.status_code", str(http_status))
 self.set_tag(
 "http.status_code", str(http_status)
 ) # we keep this for backwards compatability
 self.set_data(SPANDATA.HTTP_STATUS_CODE, http_status)

 if http_status < 400:
 self.set_status("ok")
Expand Down

2 changes: 1 addition & 1 deletion
tests/integrations/httpx/test_httpx.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,7 +46,7 @@ def before_breadcrumb(crumb, hint):
 SPANDATA.HTTP_METHOD: "GET",
 SPANDATA.HTTP_FRAGMENT: "",
 SPANDATA.HTTP_QUERY: "",
"status_code": 200,
SPANDATA.HTTP_STATUS_CODE: 200,
 "reason": "OK",
 "extra": "foo",
 }
Expand Down

6 changes: 2 additions & 4 deletions
tests/integrations/opentelemetry/test_span_processor.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -190,11 +190,10 @@ def test_update_span_with_otel_data_http_method():

 assert sentry_span.op == "http.client"
 assert sentry_span.description == "GET example.com /"
 assert sentry_span._tags["http.status_code"] == "429"
 assert sentry_span.status == "resource_exhausted"

 assert sentry_span._data["http.method"] == "GET"
 assert sentry_span._data["http.status_code"] == 429
 assert sentry_span._data["http.response.status_code"] == 429
 assert sentry_span._data["http.status_text"] == "xxx"
 assert sentry_span._data["http.user_agent"] == "curl/7.64.1"
 assert sentry_span._data["net.peer.name"] == "example.com"
Expand All@@ -220,11 +219,10 @@ def test_update_span_with_otel_data_http_method2():

 assert sentry_span.op == "http.server"
 assert sentry_span.description == "GET https://example.com/status/403"
 assert sentry_span._tags["http.status_code"] == "429"
 assert sentry_span.status == "resource_exhausted"

 assert sentry_span._data["http.method"] == "GET"
 assert sentry_span._data["http.status_code"] == 429
 assert sentry_span._data["http.response.status_code"] == 429
 assert sentry_span._data["http.status_text"] == "xxx"
 assert sentry_span._data["http.user_agent"] == "curl/7.64.1"
 assert (
Expand Down

2 changes: 1 addition & 1 deletion
tests/integrations/requests/test_requests.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,6 @@ def test_crumb_capture(sentry_init, capture_events):
 SPANDATA.HTTP_METHOD: "GET",
 SPANDATA.HTTP_FRAGMENT: "",
 SPANDATA.HTTP_QUERY: "",
"status_code": response.status_code,
SPANDATA.HTTP_STATUS_CODE: response.status_code,
 "reason": response.reason,
 }

6 changes: 3 additions & 3 deletions
tests/integrations/stdlib/test_httplib.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -49,7 +49,7 @@ def test_crumb_capture(sentry_init, capture_events):
 assert crumb["data"] == {
 "url": url,
 SPANDATA.HTTP_METHOD: "GET",
"status_code": 200,
SPANDATA.HTTP_STATUS_CODE: 200,
 "reason": "OK",
 SPANDATA.HTTP_FRAGMENT: "",
 SPANDATA.HTTP_QUERY: "",
Expand All@@ -76,7 +76,7 @@ def before_breadcrumb(crumb, hint):
 assert crumb["data"] == {
 "url": url,
 SPANDATA.HTTP_METHOD: "GET",
"status_code": 200,
SPANDATA.HTTP_STATUS_CODE: 200,
 "reason": "OK",
 "extra": "foo",
 SPANDATA.HTTP_FRAGMENT: "",
Expand DownExpand Up@@ -134,7 +134,7 @@ def test_httplib_misuse(sentry_init, capture_events, request):
 assert crumb["data"] == {
 "url": "http://localhost:{}/200".format(PORT),
 SPANDATA.HTTP_METHOD: "GET",
"status_code": 200,
SPANDATA.HTTP_STATUS_CODE: 200,
 "reason": "OK",
 SPANDATA.HTTP_FRAGMENT: "",
 SPANDATA.HTTP_QUERY: "",
Expand Down

2 changes: 1 addition & 1 deletion
tests/tracing/test_noop_span.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ def test_noop_start_span(sentry_init):
 assert isinstance(span, NoOpSpan)
 assert sentry_sdk.Hub.current.scope.span is span

 span.set_tag("http.status_code", "418")
 span.set_tag("http.response.status_code", 418)
 span.set_data("http.entity_type", "teapot")


Expand Down