rename to rpc.server|client.call.duration

Author: lmolkova

docs/rpc/connect-rpc.md

@@ -12,7 +12,7 @@ described on this page.
 
 ## Client Span
 
-<!-- semconv span.rpc.connect_rpc.client -->
+<!-- semconv span.rpc.connect_rpc.call.client -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
@@ -161,7 +161,7 @@ the `rpc.connect_rpc.response.metadata.my-custom-key` attribute with value `["at
 
 ## Server Span
 
-<!-- semconv span.rpc.connect_rpc.server -->
+<!-- semconv span.rpc.connect_rpc.call.server -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->

docs/rpc/grpc.md

@@ -12,7 +12,7 @@ described on this page.
 
 ## Client Span
 
-<!-- semconv span.rpc.grpc.client -->
+<!-- semconv span.rpc.grpc.call.client -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
@@ -162,7 +162,7 @@ the `rpc.grpc.response.metadata.my-custom-key` attribute with value `["attribute
 
 ## Server Span
 
-<!-- semconv span.rpc.grpc.server -->
+<!-- semconv span.rpc.grpc.call.server -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->

docs/rpc/json-rpc.md

@@ -12,7 +12,7 @@ described on this page.
 
 ## Client Span
 
-<!-- semconv span.rpc.jsonrpc.client -->
+<!-- semconv span.rpc.jsonrpc.call.client -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
@@ -124,7 +124,7 @@ different processes could be listening on TCP port 12345 and UDP port 12345.
 
 ## Server Span
 
-<!-- semconv span.rpc.jsonrpc.server -->
+<!-- semconv span.rpc.jsonrpc.call.server -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->

docs/rpc/rpc-metrics.md

@@ -20,7 +20,7 @@ metrics can be filtered for finer grain analysis.
     - [Metric: `rpc.server.request.size`](#metric-rpcserverrequestsize)
     - [Metric: `rpc.server.response.size`](#metric-rpcserverresponsesize)
   - [RPC client](#rpc-client)
-    - [Metric: `rpc.client.duration`](#metric-rpcclientduration)
+    - [Metric: `rpc.client.call.duration`](#metric-rpcclientcallduration)
     - [Metric: `rpc.client.request.size`](#metric-rpcclientrequestsize)
     - [Metric: `rpc.client.response.size`](#metric-rpcclientresponsesize)
 - [Semantic Conventions for specific RPC technologies](#semantic-conventions-for-specific-rpc-technologies)
@@ -71,7 +71,7 @@ This metric SHOULD be specified with
 [`ExplicitBucketBoundaries`](https://github.com/open-telemetry/opentelemetry-specification/blob/v1.50.0/specification/metrics/api.md#instrument-advisory-parameters)
 of `[ 0.005, 0.01, 0.025, 0.05, 0.075, 0.1, 0.25, 0.5, 0.75, 1, 2.5, 5, 7.5, 10 ]`.
 
-<!-- semconv metric.rpc.server.duration -->
+<!-- semconv metric.rpc.server.call.duration -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
@@ -80,7 +80,7 @@ of `[ 0.005, 0.01, 0.025, 0.05, 0.075, 0.1, 0.25, 0.5, 0.75, 1, 2.5, 5, 7.5, 10
 
 | Name     | Instrument Type | Unit (UCUM) | Description    | Stability | Entity Associations |
 | -------- | --------------- | ----------- | -------------- | --------- | ------ |
-| `rpc.server.duration` | Histogram | `s` | Measures the duration of inbound remote procedure calls (RPC). [1] | ![Development](https://img.shields.io/badge/-development-blue) |  |
+| `rpc.server.call.duration` | Histogram | `s` | Measures the duration of inbound remote procedure calls (RPC). [1] | ![Development](https://img.shields.io/badge/-development-blue) |  |
 
 **[1]:** When this metric is reported alongside an RPC server span, the metric value
 SHOULD be the same as the RPC server span duration.
@@ -366,15 +366,15 @@ different processes could be listening on TCP port 12345 and UDP port 12345.
 
 Below is a list of RPC client metric instruments.
 
-#### Metric: `rpc.client.duration`
+#### Metric: `rpc.client.call.duration`
 
 This metric is [recommended][MetricRecommended].
 
 This metric SHOULD be specified with
 [`ExplicitBucketBoundaries`](https://github.com/open-telemetry/opentelemetry-specification/blob/v1.50.0/specification/metrics/api.md#instrument-advisory-parameters)
 of `[ 0.005, 0.01, 0.025, 0.05, 0.075, 0.1, 0.25, 0.5, 0.75, 1, 2.5, 5, 7.5, 10 ]`.
 
-<!-- semconv metric.rpc.client.duration -->
+<!-- semconv metric.rpc.client.call.duration -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
@@ -383,7 +383,7 @@ of `[ 0.005, 0.01, 0.025, 0.05, 0.075, 0.1, 0.25, 0.5, 0.75, 1, 2.5, 5, 7.5, 10
 
 | Name     | Instrument Type | Unit (UCUM) | Description    | Stability | Entity Associations |
 | -------- | --------------- | ----------- | -------------- | --------- | ------ |
-| `rpc.client.duration` | Histogram | `s` | Measures the duration of outbound remote procedure calls (RPC). [1] | ![Development](https://img.shields.io/badge/-development-blue) |  |
+| `rpc.client.call.duration` | Histogram | `s` | Measures the duration of outbound remote procedure calls (RPC). [1] | ![Development](https://img.shields.io/badge/-development-blue) |  |
 
 **[1]:** When this metric is reported alongside an RPC client span, the metric value
 SHOULD be the same as the RPC client span duration.

docs/rpc/rpc-spans.md

@@ -86,7 +86,7 @@ Generally, a user SHOULD NOT set `peer.service` to a fully qualified RPC service
 
 ### RPC client span
 
-<!-- semconv span.rpc.client -->
+<!-- semconv span.rpc.call.client -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->
@@ -104,6 +104,9 @@ or the RPC is terminated due to an error or cancellation.
 For streaming RPCs, the span covers the full lifetime of the request and/or
 response streams until they are closed or terminated.
 
+If a transient issue happened and was retried within this RPC, the corresponding
+span SHOULD cover the duration of the logical call with all retries.
+
 **Span name:** refer to the [Span Name](/docs/rpc/rpc-spans.md#span-name) section.
 
 **Span kind** MUST be `CLIENT`.
@@ -217,7 +220,7 @@ different processes could be listening on TCP port 12345 and UDP port 12345.
 
 ### RPC server span
 
-<!-- semconv span.rpc.server -->
+<!-- semconv span.rpc.call.server -->
 <!-- NOTE: THIS TEXT IS AUTOGENERATED. DO NOT EDIT BY HAND. -->
 <!-- see templates/registry/markdown/snippet.md.j2 -->
 <!-- prettier-ignore-start -->

model/rpc/deprecated/metrics-deprecated.yaml

@@ -74,3 +74,43 @@ groups:
     deprecated:
       reason: obsoleted
       note: Removed, no replacement at this time.
+
+  - id: metric.rpc.server.duration
+    type: metric
+    metric_name: rpc.server.duration
+    annotations:
+      code_generation:
+        metric_value_type: double
+    stability: development
+    instrument: histogram
+    unit: "ms"
+    note: |
+      While streaming RPCs may record this metric as start-of-batch
+      to end-of-batch, it's hard to interpret in practice.
+
+      **Streaming**: N/A.
+    extends: attributes.metrics.rpc.server
+    deprecated:
+      reason: uncategorized
+      note: Replaced by `rpc.server.call.duration` with unit `s`.
+    brief: "Deprecated, use `rpc.server.call.duration` instead. Note: the unit also changed from `ms` to `s`."
+
+  - id: metric.rpc.client.duration
+    type: metric
+    metric_name: rpc.client.duration
+    annotations:
+      code_generation:
+        metric_value_type: double
+    stability: development
+    instrument: histogram
+    unit: "ms"
+    note: |
+      While streaming RPCs may record this metric as start-of-batch
+      to end-of-batch, it's hard to interpret in practice.
+
+      **Streaming**: N/A.
+    extends: attributes.metrics.rpc.client
+    deprecated:
+      reason: uncategorized
+      note: Replaced by `rpc.client.call.duration` with unit `s`.
+    brief: "Deprecated, use `rpc.client.call.duration` instead. Note: the unit also changed from `ms` to `s`."

model/rpc/metrics.yaml

@@ -1,8 +1,8 @@
 groups:
   # RPC Server metrics
-  - id: metric.rpc.server.duration
+  - id: metric.rpc.server.call.duration
     type: metric
-    metric_name: rpc.server.duration
+    metric_name: rpc.server.call.duration
     annotations:
       code_generation:
         metric_value_type: double
@@ -46,9 +46,9 @@ groups:
 
 
   # RPC Client metrics
-  - id: metric.rpc.client.duration
+  - id: metric.rpc.client.call.duration
     type: metric
-    metric_name: rpc.client.duration
+    metric_name: rpc.client.call.duration
     annotations:
       code_generation:
         metric_value_type: double

model/rpc/spans.yaml

@@ -1,5 +1,5 @@
 groups:
-  - id: span.rpc.client
+  - id: span.rpc.call.client
     type: span
     stability: development
     brief: This span represents an outgoing Remote Procedure Call (RPC).
@@ -11,6 +11,9 @@ groups:
       For streaming RPCs, the span covers the full lifetime of the request and/or
       response streams until they are closed or terminated.
 
+      If a transient issue happened and was retried within this RPC, the corresponding
+      span SHOULD cover the duration of the logical call with all retries.
+
       **Span name:** refer to the [Span Name](/docs/rpc/rpc-spans.md#span-name) section.
 
       **Span kind** MUST be `CLIENT`.
@@ -21,7 +24,7 @@ groups:
       - ref: rpc.system
         requirement_level: required
 
-  - id: span.rpc.server
+  - id: span.rpc.call.server
     type: span
     stability: development
     extends: rpc_service.server
@@ -43,7 +46,7 @@ groups:
       - ref: rpc.system
         requirement_level: required
 
-  - id: span.rpc.connect_rpc.client
+  - id: span.rpc.connect_rpc.call.client
     type: span
     stability: development
     brief: This span represents an outgoing Remote Procedure Call (RPC).
@@ -64,7 +67,7 @@ groups:
       - ref: rpc.connect_rpc.response.metadata
         requirement_level: opt_in
 
-  - id: span.rpc.connect_rpc.server
+  - id: span.rpc.connect_rpc.call.server
     type: span
     stability: development
     extends: rpc_service.server
@@ -85,7 +88,7 @@ groups:
       - ref: rpc.connect_rpc.response.metadata
         requirement_level: opt_in
 
-  - id: span.rpc.grpc.client
+  - id: span.rpc.grpc.call.client
     type: span
     stability: development
     brief: This span represents an outgoing Remote Procedure Call (RPC).
@@ -111,7 +114,7 @@ groups:
       - ref: rpc.grpc.response.metadata
         requirement_level: opt_in
 
-  - id: span.rpc.grpc.server
+  - id: span.rpc.grpc.call.server
     type: span
     stability: development
     extends: rpc_service.server
@@ -133,7 +136,7 @@ groups:
       - ref: rpc.grpc.response.metadata
         requirement_level: opt_in
 
-  - id: span.rpc.jsonrpc.client
+  - id: span.rpc.jsonrpc.call.client
     type: span
     stability: development
     brief: This span represents an outgoing Remote Procedure Call (RPC).
@@ -159,7 +162,7 @@ groups:
       - ref: rpc.jsonrpc.error_message
         requirement_level: recommended
 
-  - id: span.rpc.jsonrpc.server
+  - id: span.rpc.jsonrpc.call.server
     type: span
     stability: development
     extends: rpc.server