lint

docs/messaging/messaging-metrics.md

@@ -7,14 +7,12 @@
 <!-- toc -->
 
 - [Common attributes](#common-attributes)
+- [Metric: `messaging.client.operation.duration`](#metric-messagingclientoperationduration)
 - [Producer metrics](#producer-metrics)
-  - [Metric: `messaging.publish.duration`](#metric-messagingpublishduration)
-  - [Metric: `messaging.publish.messages`](#metric-messagingpublishmessages)
+  - [Metric: `messaging.client.published.messages`](#metric-messagingclientpublishedmessages)
 - [Consumer metrics](#consumer-metrics)
-  - [Metric: `messaging.receive.duration`](#metric-messagingreceiveduration)
-  - [Metric: `messaging.receive.messages`](#metric-messagingreceivemessages)
-  - [Metric: `messaging.process.duration`](#metric-messagingprocessduration)
-  - [Metric: `messaging.process.messages`](#metric-messagingprocessmessages)
+  - [Metric: `messaging.client.consumed.messages`](#metric-messagingclientconsumedmessages)
+  - [Metric: `messaging.consumer.process.duration`](#metric-messagingconsumerprocessduration)
 
 <!-- tocstop -->
 
@@ -101,7 +99,7 @@ This metric is [required][MetricRequired].
 When this metric is reported alongside a messaging span, the metric value SHOULD be the same as the corresponding span duration.
 
 This metric applies measures duration of operations that application initiates to communicate with the broker. It SHOULD NOT be used
-to report processing duration. Processing is covered by [`messaging.consumer.process.duration`](#metric-messagingprocessduration) metric.
+to report processing duration. Processing is covered by [`messaging.consumer.process.duration`](#metric-messagingconsumerprocessduration) metric.
 
 This metric SHOULD be specified with
 [`ExplicitBucketBoundaries`](https://github.com/open-telemetry/opentelemetry-specification/tree/v1.31.0/specification/metrics/api.md#instrument-advice)
@@ -152,7 +150,7 @@ _Note: The need to report `messaging.client.consumed.messages` depends on the me
 
 This metric is [required][MetricRequired] for operations that are not initiated by the application code (push-based deliver), and [recommended][MetricRecommended] for processing operations instrumented for pull-based scenarios.
 
-Processing operation covers application-specific message processing logic and errors. Processing duration SHOULD NOT be reported as a part of the [`messaging.consumer.process.duration`](#metric-messagingclientoperationduration).
+Processing operation covers application-specific message processing logic and errors. Processing duration SHOULD NOT be reported as a part of the [`messaging.client.operation.duration`](#metric-messagingclientoperationduration).
 
 When this metric is reported alongside a messaging process span, the metric value SHOULD be the same as the corresponding span duration.
 

docs/messaging/messaging-spans.md

@@ -18,7 +18,7 @@
 - [Conventions](#conventions)
   - [Context propagation](#context-propagation)
   - [Span name](#span-name)
-  - [Operation types](#operation-types)
+  - [Common messaging operations](#common-messaging-operations)
   - [Span kind](#span-kind)
   - [Trace structure](#trace-structure)
     - [Producer spans](#producer-spans)
@@ -157,7 +157,7 @@ Messaging spans MUST follow the overall [guidelines for span names](https://gith
 
 <!-- markdown-link-check-disable -->
 <!-- HTML anchors are not supported https://github.com/tcort/markdown-link-check/issues/225-->
-The **span name** SHOULD be `{messaging.operation.name} {destination}` (see below for the exact definition of the [`{target}`](#target-placeholder) placeholder).
+The **span name** SHOULD be `{messaging.operation.name} {destination}` (see below for the exact definition of the [`{destination}`](#destination-placeholder) placeholder).
 <!-- markdown-link-check-enable -->
 
 Semantic conventions for individual messaging systems MAY specify different span name format and then MUST document it in [semantic conventions for specific messaging technologies](#semantic-conventions-for-specific-messaging-technologies).

model/messaging-common.yaml

@@ -19,4 +19,3 @@ groups:
       - ref: server.port
       - ref: messaging.operation.name
         requirement_level: required
-

model/metrics/deprecated/messaging-metrics.yaml

@@ -57,4 +57,4 @@ groups:
     stability: experimental
     instrument: counter
     unit: "{message}"
-    extends: metric.messaging.attributes
+    extends: metric.messaging.attributes