Skip to content

Commit a937f6a

Browse files
ocelotlSergeyKanzhelevBogdan Drutu
authored and
Sergey Kanzhelev
committed
Fix discrepancy between status names (open-telemetry#385)
Fixes open-telemetry#384 Co-authored-by: Sergey Kanzhelev <[email protected]> Co-authored-by: Bogdan Drutu <[email protected]>
1 parent 37e4c42 commit a937f6a

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

specification/api-tracing.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ codes](https://github.com/grpc/grpc/blob/master/doc/statuscodes.md):
473473
- The operation completed successfully.
474474
- `Cancelled`
475475
- The operation was cancelled (typically by the caller).
476-
- `UnknownError`
476+
- `Unknown`
477477
- An unknown error.
478478
- `InvalidArgument`
479479
- Client specified an invalid argument. Note that this differs from
@@ -506,7 +506,7 @@ codes](https://github.com/grpc/grpc/blob/master/doc/statuscodes.md):
506506
fixed if the system state changes.
507507
- `Unimplemented`
508508
- Operation is not implemented or not supported/enabled in this service.
509-
- `InternalError`
509+
- `Internal`
510510
- Internal errors. Means some invariants expected by underlying system has been
511511
broken.
512512
- `Unavailable`

specification/data-http.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ Don't set a status message if the reason can be inferred from `http.status_code`
4949
| 501 Not Implemented | `Unimplemented` |
5050
| 503 Service Unavailable | `Unavailable` |
5151
| 504 Gateway Timeout | `DeadlineExceeded` |
52-
| Other 5xx code | `InternalError` [1] |
53-
| Any status code the client fails to interpret (e.g., 093 or 573) | `UnknownError` |
52+
| Other 5xx code | `Internal` [1] |
53+
| Any status code the client fails to interpret (e.g., 093 or 573) | `Unknown` |
5454

5555
Note that the items marked with [1] are different from the mapping defined in the [OpenCensus semantic conventions][oc-http-status].
5656

@@ -102,14 +102,14 @@ For status, the following special cases have canonical error codes assigned:
102102

103103
| Client error | Trace status code |
104104
|-----------------------------|--------------------|
105-
| DNS resolution failed | `UnknownError` |
105+
| DNS resolution failed | `Unknown` |
106106
| Request cancelled by caller | `Cancelled` |
107107
| URL cannot be parsed | `InvalidArgument` |
108108
| Request timed out | `DeadlineExceeded` |
109109

110110
This is not meant to be an exhaustive list
111111
but if there is no clear mapping for some error conditions,
112-
instrumentation developers are encouraged to use `UnknownError`
112+
instrumentation developers are encouraged to use `Unknown`
113113
and open a PR or issue in the specification repository.
114114

115115
## HTTP server
@@ -238,4 +238,4 @@ If set, it would be
238238
`"https://example.com:8080/webshop/articles/4?s=1"`
239239
but due to `http.scheme`, `http.host` and `http.target` being set, it would be redundant.
240240
As explained above, these separate values are preferred but if for some reason the URL is available but the other values are not,
241-
URL can replace `http.scheme`, `http.host` and `http.target`.
241+
URL can replace `http.scheme`, `http.host` and `http.target`.

0 commit comments

Comments
 (0)