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

Deprecate tls.client.server_name attribute in favor of common server.address #1216

Merged
merged 6 commits into from
Jul 22, 2024
Merged
Show file tree
Hide file tree
Changes from 4 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
5 changes: 5 additions & 0 deletions .chloggen/1216.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
change_type: breaking
component: tls
note: >
Deprecate `tls.client.server_name attribute` in favor of common `server.address`.
issues: [ 1211, 1216 ]
12 changes: 11 additions & 1 deletion docs/attributes-registry/tls.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@

# TLS

- [Tls](#tls-attributes)
- [Tls Deprecated](#tls-deprecated-attributes)

## TLS Attributes

This document defines semantic convention attributes in the TLS namespace.
Expand All @@ -22,7 +25,6 @@ This document defines semantic convention attributes in the TLS namespace.
| `tls.client.ja3` | string | A hash that identifies clients based on how they perform an SSL/TLS handshake. | `d4e5b18d6b55c71272893221c96ba240` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
| `tls.client.not_after` | string | Date/Time indicating when client certificate is no longer considered valid. | `2021-01-01T00:00:00.000Z` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
| `tls.client.not_before` | string | Date/Time indicating when client certificate is first considered valid. | `1970-01-01T00:00:00.000Z` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
| `tls.client.server_name` | string | Also called an SNI, this tells the server which hostname to which the client is attempting to connect to. | `opentelemetry.io` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
| `tls.client.subject` | string | Distinguished name of subject of the x.509 certificate presented by the client. | `CN=myclient, OU=Documentation Team, DC=example, DC=com` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
| `tls.client.supported_ciphers` | string[] | Array of ciphers offered by the client during the client hello. | `["TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384", "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384", "..."]` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
| `tls.curve` | string | String indicating the curve used for the given cipher, when applicable | `secp256r1` | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
Expand Down Expand Up @@ -50,3 +52,11 @@ This document defines semantic convention attributes in the TLS namespace.
| ----- | ----------- | ---------------------------------------------------------------- |
| `ssl` | ssl | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
| `tls` | tls | ![Experimental](https://img.shields.io/badge/-experimental-blue) |

## TLS Deprecated Attributes

Describes deprecated `tls` attributes.

| Attribute | Type | Description | Examples | Stability |
| ------------------------ | ------ | ----------------------------------------- | ------------------ | ------------------------------------------------------------------------------------------- |
| `tls.client.server_name` | string | Deprecated, use `server.address` instead. | `opentelemetry.io` | ![Deprecated](https://img.shields.io/badge/-deprecated-red)<br>Replaced by `server.address. |
11 changes: 11 additions & 0 deletions model/registry/deprecated/tls.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
groups:
- id: registry.tls.deprecated
type: attribute_group
brief: Describes deprecated `tls` attributes.
attributes:
- id: tls.client.server_name
type: string
stability: experimental
deprecated: "Replaced by `server.address."
brief: "Deprecated, use `server.address` instead."
examples: ["opentelemetry.io"]
5 changes: 0 additions & 5 deletions model/registry/tls.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,6 @@ groups:
stability: experimental
brief: "Date/Time indicating when client certificate is first considered valid."
examples: ["1970-01-01T00:00:00.000Z"]
- id: client.server_name
type: string
stability: experimental
brief: "Also called an SNI, this tells the server which hostname to which the client is attempting to connect to."
examples: ["opentelemetry.io"]
- id: client.subject
type: string
stability: experimental
Expand Down
4 changes: 4 additions & 0 deletions schema-next.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ versions:
next:
all:
changes:
# https://github.com/open-telemetry/semantic-conventions/pull/1216
- rename_attributes:
attribute_map:
tls.client.server_name: server.address
joaopgrassi marked this conversation as resolved.
Show resolved Hide resolved
# https://github.com/open-telemetry/semantic-conventions/pull/815
- rename_attributes:
attribute_map:
Expand Down
Loading