Skip to content
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.

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

Fix server.port to be not required on HTTP server spans when server.address is not set #429

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ release.
- Remove `thread.daemon`, and introduce `jvm.thread.daemon` instead.
Introduce `jvm.thread.state` attribute and add it to `jvm.thread.count` metric.
([#297](https://github.com/open-telemetry/semantic-conventions/pull/297))
- Fix `server.port` to be not required when `server.address` is not set.
([#429](https://github.com/open-telemetry/semantic-conventions/pull/429))

### Features

Expand Down
2 changes: 1 addition & 1 deletion docs/http/http-spans.md
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ MUST NOT include the port identifier.
[X-Forwarded-Host](https://developer.mozilla.org/docs/Web/HTTP/Headers/X-Forwarded-Host), or a similar header.
- Port identifier of the `Host` header.

**[6]:** If not default (`80` for `http` scheme, `443` for `https`).
**[6]:** If `server.address` is set and the port is not default (`80` for `http` scheme, `443` for `https`).

**[7]:** When missing, the value is assumed to be `/`

Expand Down
2 changes: 1 addition & 1 deletion model/http-common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ groups:
[X-Forwarded-Host](https://developer.mozilla.org/docs/Web/HTTP/Headers/X-Forwarded-Host), or a similar header.
- Port identifier of the `Host` header.
requirement_level:
conditionally_required: If not default (`80` for `http` scheme, `443` for `https`).
conditionally_required: If `server.address` is set and the port is not default (`80` for `http` scheme, `443` for `https`).
- ref: url.scheme
requirement_level: required
examples: ["http", "https"]
Expand Down