Skip to content

Commit c793cf5

Browse files
authored
Merge branch 'main' into kafka-messaging-offset
2 parents cd7381e + 17decc3 commit c793cf5

File tree

9 files changed

+30
-6
lines changed

9 files changed

+30
-6
lines changed

.chloggen/1239.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
change_type: enhancement
2+
component: network
3+
note: Add QUIC to the list of well known network transports
4+
issues: [ 1237, 1239 ]

docs/attributes-registry/network.md

+7-6
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,13 @@ different processes could be listening on TCP port 12345 and UDP port 12345.
8888

8989
`network.transport` has the following list of well-known values. If one of them applies, then the respective value MUST be used; otherwise, a custom value MAY be used.
9090

91-
| Value | Description | Stability |
92-
| ------ | ------------------------ | ---------------------------------------------------------- |
93-
| `pipe` | Named or anonymous pipe. | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
94-
| `tcp` | TCP | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
95-
| `udp` | UDP | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
96-
| `unix` | Unix domain socket | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
91+
| Value | Description | Stability |
92+
| ------ | ------------------------ | ---------------------------------------------------------------- |
93+
| `pipe` | Named or anonymous pipe. | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
94+
| `quic` | QUIC | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
95+
| `tcp` | TCP | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
96+
| `udp` | UDP | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
97+
| `unix` | Unix domain socket | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
9798

9899
`network.type` has the following list of well-known values. If one of them applies, then the respective value MUST be used; otherwise, a custom value MAY be used.
99100

docs/dotnet/dotnet-kestrel-metrics.md

+8
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ different processes could be listening on TCP port 12345 and UDP port 12345.
8686
| Value | Description | Stability |
8787
|---|---|---|
8888
| `pipe` | Named or anonymous pipe. | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
89+
| `quic` | QUIC | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
8990
| `tcp` | TCP | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
9091
| `udp` | UDP | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
9192
| `unix` | Unix domain socket | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
@@ -182,6 +183,7 @@ different processes could be listening on TCP port 12345 and UDP port 12345.
182183
| Value | Description | Stability |
183184
|---|---|---|
184185
| `pipe` | Named or anonymous pipe. | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
186+
| `quic` | QUIC | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
185187
| `tcp` | TCP | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
186188
| `udp` | UDP | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
187189
| `unix` | Unix domain socket | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
@@ -258,6 +260,7 @@ different processes could be listening on TCP port 12345 and UDP port 12345.
258260
| Value | Description | Stability |
259261
|---|---|---|
260262
| `pipe` | Named or anonymous pipe. | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
263+
| `quic` | QUIC | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
261264
| `tcp` | TCP | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
262265
| `udp` | UDP | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
263266
| `unix` | Unix domain socket | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
@@ -333,6 +336,7 @@ different processes could be listening on TCP port 12345 and UDP port 12345.
333336
| Value | Description | Stability |
334337
|---|---|---|
335338
| `pipe` | Named or anonymous pipe. | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
339+
| `quic` | QUIC | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
336340
| `tcp` | TCP | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
337341
| `udp` | UDP | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
338342
| `unix` | Unix domain socket | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
@@ -414,6 +418,7 @@ different processes could be listening on TCP port 12345 and UDP port 12345.
414418
| Value | Description | Stability |
415419
|---|---|---|
416420
| `pipe` | Named or anonymous pipe. | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
421+
| `quic` | QUIC | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
417422
| `tcp` | TCP | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
418423
| `udp` | UDP | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
419424
| `unix` | Unix domain socket | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
@@ -491,6 +496,7 @@ different processes could be listening on TCP port 12345 and UDP port 12345.
491496
| Value | Description | Stability |
492497
|---|---|---|
493498
| `pipe` | Named or anonymous pipe. | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
499+
| `quic` | QUIC | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
494500
| `tcp` | TCP | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
495501
| `udp` | UDP | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
496502
| `unix` | Unix domain socket | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
@@ -581,6 +587,7 @@ different processes could be listening on TCP port 12345 and UDP port 12345.
581587
| Value | Description | Stability |
582588
|---|---|---|
583589
| `pipe` | Named or anonymous pipe. | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
590+
| `quic` | QUIC | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
584591
| `tcp` | TCP | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
585592
| `udp` | UDP | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
586593
| `unix` | Unix domain socket | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
@@ -656,6 +663,7 @@ different processes could be listening on TCP port 12345 and UDP port 12345.
656663
| Value | Description | Stability |
657664
|---|---|---|
658665
| `pipe` | Named or anonymous pipe. | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
666+
| `quic` | QUIC | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
659667
| `tcp` | TCP | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
660668
| `udp` | UDP | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
661669
| `unix` | Unix domain socket | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |

docs/general/attributes.md

+1
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,7 @@ different processes could be listening on TCP port 12345 and UDP port 12345.
245245
| Value | Description | Stability |
246246
|---|---|---|
247247
| `pipe` | Named or anonymous pipe. | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
248+
| `quic` | QUIC | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
248249
| `tcp` | TCP | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
249250
| `udp` | UDP | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
250251
| `unix` | Unix domain socket | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |

docs/http/http-spans.md

+2
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,7 @@ and SHOULD be provided **at span creation time** (if provided at all):
258258
| Value | Description | Stability |
259259
|---|---|---|
260260
| `pipe` | Named or anonymous pipe. | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
261+
| `quic` | QUIC | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
261262
| `tcp` | TCP | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
262263
| `udp` | UDP | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
263264
| `unix` | Unix domain socket | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
@@ -522,6 +523,7 @@ and SHOULD be provided **at span creation time** (if provided at all):
522523
| Value | Description | Stability |
523524
|---|---|---|
524525
| `pipe` | Named or anonymous pipe. | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
526+
| `quic` | QUIC | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
525527
| `tcp` | TCP | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
526528
| `udp` | UDP | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
527529
| `unix` | Unix domain socket | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |

docs/rpc/rpc-metrics.md

+1
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,7 @@ different processes could be listening on TCP port 12345 and UDP port 12345.
386386
| Value | Description | Stability |
387387
|---|---|---|
388388
| `pipe` | Named or anonymous pipe. | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
389+
| `quic` | QUIC | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
389390
| `tcp` | TCP | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
390391
| `udp` | UDP | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
391392
| `unix` | Unix domain socket | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |

docs/rpc/rpc-spans.md

+2
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ different processes could be listening on TCP port 12345 and UDP port 12345.
138138
| Value | Description | Stability |
139139
|---|---|---|
140140
| `pipe` | Named or anonymous pipe. | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
141+
| `quic` | QUIC | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
141142
| `tcp` | TCP | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
142143
| `udp` | UDP | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
143144
| `unix` | Unix domain socket | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
@@ -220,6 +221,7 @@ different processes could be listening on TCP port 12345 and UDP port 12345.
220221
| Value | Description | Stability |
221222
|---|---|---|
222223
| `pipe` | Named or anonymous pipe. | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
224+
| `quic` | QUIC | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
223225
| `tcp` | TCP | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
224226
| `udp` | UDP | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
225227
| `unix` | Unix domain socket | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |

docs/system/system-metrics.md

+1
Original file line numberDiff line numberDiff line change
@@ -1305,6 +1305,7 @@ different processes could be listening on TCP port 12345 and UDP port 12345.
13051305
| Value | Description | Stability |
13061306
|---|---|---|
13071307
| `pipe` | Named or anonymous pipe. | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
1308+
| `quic` | QUIC | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
13081309
| `tcp` | TCP | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
13091310
| `udp` | UDP | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
13101311
| `unix` | Unix domain socket | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |

model/registry/network.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,10 @@ groups:
195195
value: 'unix'
196196
brief: "Unix domain socket"
197197
stability: stable
198+
- id: quic
199+
value: 'quic'
200+
brief: "QUIC"
201+
stability: experimental
198202
brief: >
199203
[OSI transport layer](https://osi-model.com/transport-layer/) or
200204
[inter-process communication method](https://wikipedia.org/wiki/Inter-process_communication).

0 commit comments

Comments
 (0)