From 3d64d2a224118e9e12f281a64fb9c12da830dbd5 Mon Sep 17 00:00:00 2001 From: Liudmila Molkova Date: Wed, 13 Dec 2023 10:33:02 -0800 Subject: [PATCH] remove azure_ --- docs/attributes-registry/messaging.md | 18 +++++++++--------- docs/messaging/azure-messaging.md | 20 ++++++++++---------- docs/messaging/messaging-metrics.md | 6 +++--- docs/messaging/messaging-spans.md | 6 +++--- model/registry/messaging.yaml | 24 ++++++++++++------------ model/trace/messaging.yaml | 16 ++++++++-------- 6 files changed, 45 insertions(+), 45 deletions(-) diff --git a/docs/attributes-registry/messaging.md b/docs/attributes-registry/messaging.md index 9614e8eeee..847b24075e 100644 --- a/docs/attributes-registry/messaging.md +++ b/docs/attributes-registry/messaging.md @@ -8,12 +8,6 @@ | Attribute | Type | Description | Examples | |---|---|---|---| -| `messaging.azure_eventhubs.consumer.group` | string | The name of the consumer group the event consumer is associated with. | `indexer` | -| `messaging.azure_eventhubs.destination.partition.id` | string | The identifier of the partition messages are sent to or received from, unique to the Event Hub which contains it. | `1` | -| `messaging.azure_eventhubs.message.enqueued_time` | int | The UTC epoch seconds at which the message has been accepted and stored in the entity. | `1701393730` | -| `messaging.azure_servicebus.destination.subscription_name` | string | The name of the subscription in the topic messages are received from. | `mySubscription` | -| `messaging.azure_servicebus.message.delivery_count` | int | Number of deliveries that have been attempted for this message. | `2` | -| `messaging.azure_servicebus.message.enqueued_time` | int | The UTC epoch seconds at which the message has been accepted and stored in the entity. | `1701393730` | | `messaging.batch.message_count` | int | The number of messages sent, received, or processed in the scope of the batching operation. [1] | `0`; `1`; `2` | | `messaging.client_id` | string | A unique identifier for the client that consumes or produces a message. | `client-5`; `myhost@8742@s8083jm` | | `messaging.destination.anonymous` | boolean | A boolean that is true if the message destination is anonymous (could be unnamed or have auto-generated name). | | @@ -22,6 +16,9 @@ | `messaging.destination.temporary` | boolean | A boolean that is true if the message destination is temporary and might not exist anymore after messages are processed. | | | `messaging.destination_publish.anonymous` | boolean | A boolean that is true if the publish message destination is anonymous (could be unnamed or have auto-generated name). | | | `messaging.destination_publish.name` | string | The name of the original destination the message was published to [4] | `MyQueue`; `MyTopic` | +| `messaging.eventhubs.consumer.group` | string | The name of the consumer group the event consumer is associated with. | `indexer` | +| `messaging.eventhubs.destination.partition.id` | string | The identifier of the partition messages are sent to or received from, unique to the Event Hub which contains it. | `1` | +| `messaging.eventhubs.message.enqueued_time` | int | The UTC epoch seconds at which the message has been accepted and stored in the entity. | `1701393730` | | `messaging.gcp_pubsub.message.ordering_key` | string | The ordering key for a given message. If the attribute is not present, the message does not have an ordering key. | `ordering_key` | | `messaging.kafka.consumer.group` | string | Name of the Kafka Consumer Group that is handling the message. Only applies to consumers, not producers. | `my-group` | | `messaging.kafka.destination.partition` | int | Partition the message is sent to. | `2` | @@ -43,6 +40,9 @@ | `messaging.rocketmq.message.tag` | string | The secondary classifier of message besides topic. | `tagA` | | `messaging.rocketmq.message.type` | string | Type of message. | `normal` | | `messaging.rocketmq.namespace` | string | Namespace of RocketMQ resources, resources in different namespaces are individual. | `myNamespace` | +| `messaging.servicebus.destination.subscription_name` | string | The name of the subscription in the topic messages are received from. | `mySubscription` | +| `messaging.servicebus.message.delivery_count` | int | Number of deliveries that have been attempted for this message. | `2` | +| `messaging.servicebus.message.enqueued_time` | int | The UTC epoch seconds at which the message has been accepted and stored in the entity. | `1701393730` | | `messaging.system` | string | An identifier for the messaging system being used. See below for a list of well-known identifiers. | `activemq` | **[1]:** Instrumentations SHOULD NOT set `messaging.batch.message_count` on spans that operate with a single message. When a messaging client library supports both batch and single-message API for the same operation, instrumentations SHOULD use `messaging.batch.message_count` for batching APIs and SHOULD NOT use it for single-message APIs. @@ -96,9 +96,9 @@ size should be used. |---|---| | `activemq` | Apache ActiveMQ | | `aws_sqs` | Amazon Simple Queue Service (SQS) | -| `azure_eventgrid` | Azure Event Grid | -| `azure_eventhubs` | Azure Event Hubs | -| `azure_servicebus` | Azure Service Bus | +| `eventgrid` | Azure Event Grid | +| `eventhubs` | Azure Event Hubs | +| `servicebus` | Azure Service Bus | | `gcp_pubsub` | Google Cloud Pub/Sub | | `jms` | Java Message Service | | `kafka` | Apache Kafka | diff --git a/docs/messaging/azure-messaging.md b/docs/messaging/azure-messaging.md index 20ef496b0e..35e17ec2c3 100644 --- a/docs/messaging/azure-messaging.md +++ b/docs/messaging/azure-messaging.md @@ -10,34 +10,34 @@ The Semantic Conventions for [Azure Service Bus](https://learn.microsoft.com/azu ## Azure Service Bus -`messaging.system` MUST be set to `"azure_servicebus"`. +`messaging.system` MUST be set to `"servicebus"`. ### Span attributes The following additional attributes are defined: - + | Attribute | Type | Description | Examples | Requirement Level | |---|---|---|---|---| -| [`messaging.azure_servicebus.destination.subscription_name`](../attributes-registry/messaging.md) | string | The name of the subscription in the topic messages are received from. | `mySubscription` | Conditionally Required: If messages are received from the subscription. | -| [`messaging.azure_servicebus.message.delivery_count`](../attributes-registry/messaging.md) | int | Number of deliveries that have been attempted for this message. | `2` | Conditionally Required: [1] | -| [`messaging.azure_servicebus.message.enqueued_time`](../attributes-registry/messaging.md) | int | The UTC epoch seconds at which the message has been accepted and stored in the entity. | `1701393730` | Recommended | +| [`messaging.servicebus.destination.subscription_name`](../attributes-registry/messaging.md) | string | The name of the subscription in the topic messages are received from. | `mySubscription` | Conditionally Required: If messages are received from the subscription. | +| [`messaging.servicebus.message.delivery_count`](../attributes-registry/messaging.md) | int | Number of deliveries that have been attempted for this message. | `2` | Conditionally Required: [1] | +| [`messaging.servicebus.message.enqueued_time`](../attributes-registry/messaging.md) | int | The UTC epoch seconds at which the message has been accepted and stored in the entity. | `1701393730` | Recommended | **[1]:** If delivery count is available and is bigger than 0. ## Azure Event Hubs -`messaging.system` MUST be set to `"azure_eventhubs"`. +`messaging.system` MUST be set to `"eventhubs"`. ### Span attributes The following additional attributes are defined: - + | Attribute | Type | Description | Examples | Requirement Level | |---|---|---|---|---| -| [`messaging.azure_eventhubs.consumer.group`](../attributes-registry/messaging.md) | string | The name of the consumer group the event consumer is associated with. | `indexer` | Conditionally Required: If not default ("$Default"). | -| [`messaging.azure_eventhubs.destination.partition.id`](../attributes-registry/messaging.md) | string | The identifier of the partition messages are sent to or received from, unique to the Event Hub which contains it. | `1` | Conditionally Required: If available. | -| [`messaging.azure_eventhubs.message.enqueued_time`](../attributes-registry/messaging.md) | int | The UTC epoch seconds at which the message has been accepted and stored in the entity. | `1701393730` | Recommended | +| [`messaging.eventhubs.consumer.group`](../attributes-registry/messaging.md) | string | The name of the consumer group the event consumer is associated with. | `indexer` | Conditionally Required: If not default ("$Default"). | +| [`messaging.eventhubs.destination.partition.id`](../attributes-registry/messaging.md) | string | The identifier of the partition messages are sent to or received from, unique to the Event Hub which contains it. | `1` | Conditionally Required: If available. | +| [`messaging.eventhubs.message.enqueued_time`](../attributes-registry/messaging.md) | int | The UTC epoch seconds at which the message has been accepted and stored in the entity. | `1701393730` | Recommended | [DocumentStatus]: https://github.com/open-telemetry/opentelemetry-specification/tree/v1.26.0/specification/document-status.md diff --git a/docs/messaging/messaging-metrics.md b/docs/messaging/messaging-metrics.md index b2f7046bdd..d13e62a216 100644 --- a/docs/messaging/messaging-metrics.md +++ b/docs/messaging/messaging-metrics.md @@ -79,9 +79,9 @@ the broker doesn't have such notion, the destination name SHOULD uniquely identi |---|---| | `activemq` | Apache ActiveMQ | | `aws_sqs` | Amazon Simple Queue Service (SQS) | -| `azure_eventgrid` | Azure Event Grid | -| `azure_eventhubs` | Azure Event Hubs | -| `azure_servicebus` | Azure Service Bus | +| `eventgrid` | Azure Event Grid | +| `eventhubs` | Azure Event Hubs | +| `servicebus` | Azure Service Bus | | `gcp_pubsub` | Google Cloud Pub/Sub | | `jms` | Java Message Service | | `kafka` | Apache Kafka | diff --git a/docs/messaging/messaging-spans.md b/docs/messaging/messaging-spans.md index 7562e2972b..6c9979f612 100644 --- a/docs/messaging/messaging-spans.md +++ b/docs/messaging/messaging-spans.md @@ -385,9 +385,9 @@ different processes could be listening on TCP port 12345 and UDP port 12345. |---|---| | `activemq` | Apache ActiveMQ | | `aws_sqs` | Amazon Simple Queue Service (SQS) | -| `azure_eventgrid` | Azure Event Grid | -| `azure_eventhubs` | Azure Event Hubs | -| `azure_servicebus` | Azure Service Bus | +| `eventgrid` | Azure Event Grid | +| `eventhubs` | Azure Event Hubs | +| `servicebus` | Azure Service Bus | | `gcp_pubsub` | Google Cloud Pub/Sub | | `jms` | Java Message Service | | `kafka` | Apache Kafka | diff --git a/model/registry/messaging.yaml b/model/registry/messaging.yaml index 707661c38a..6d8dc2a663 100644 --- a/model/registry/messaging.yaml +++ b/model/registry/messaging.yaml @@ -219,14 +219,14 @@ groups: - id: aws_sqs value: 'aws_sqs' brief: 'Amazon Simple Queue Service (SQS)' - - id: azure_eventgrid - value: 'azure_eventgrid' + - id: eventgrid + value: 'eventgrid' brief: 'Azure Event Grid' - - id: azure_eventhubs - value: 'azure_eventhubs' + - id: eventhubs + value: 'eventhubs' brief: 'Azure Event Hubs' - - id: azure_servicebus - value: 'azure_servicebus' + - id: servicebus + value: 'servicebus' brief: 'Azure Service Bus' - id: gcp_pubsub value: 'gcp_pubsub' @@ -243,32 +243,32 @@ groups: - id: rocketmq value: 'rocketmq' brief: 'Apache RocketMQ' - - id: azure_servicebus.message.delivery_count + - id: servicebus.message.delivery_count type: int brief: > Number of deliveries that have been attempted for this message. examples: 2 - - id: azure_servicebus.message.enqueued_time + - id: servicebus.message.enqueued_time type: int brief: > The UTC epoch seconds at which the message has been accepted and stored in the entity. examples: 1701393730 - - id: azure_servicebus.destination.subscription_name + - id: servicebus.destination.subscription_name type: string brief: > The name of the subscription in the topic messages are received from. examples: "mySubscription" - - id: azure_eventhubs.message.enqueued_time + - id: eventhubs.message.enqueued_time type: int brief: > The UTC epoch seconds at which the message has been accepted and stored in the entity. examples: 1701393730 - - id: azure_eventhubs.destination.partition.id + - id: eventhubs.destination.partition.id type: string brief: > The identifier of the partition messages are sent to or received from, unique to the Event Hub which contains it. examples: '1' - - id: azure_eventhubs.consumer.group + - id: eventhubs.consumer.group type: string brief: > The name of the consumer group the event consumer is associated with. diff --git a/model/trace/messaging.yaml b/model/trace/messaging.yaml index 7ba75250a0..7d91e17bd7 100644 --- a/model/trace/messaging.yaml +++ b/model/trace/messaging.yaml @@ -172,29 +172,29 @@ groups: tag: tech-specific-gcp-pubsub requirement_level: conditionally_required: If the message type has an ordering key set. - - id: messaging.azure_servicebus + - id: messaging.servicebus type: attribute_group extends: messaging brief: > Attributes for Azure Service Bus attributes: - - ref: messaging.azure_servicebus.message.delivery_count + - ref: messaging.servicebus.message.delivery_count requirement_level: conditionally_required: If delivery count is available and is bigger than 0. - - ref: messaging.azure_servicebus.message.enqueued_time - - ref: messaging.azure_servicebus.destination.subscription_name + - ref: messaging.servicebus.message.enqueued_time + - ref: messaging.servicebus.destination.subscription_name requirement_level: conditionally_required: If messages are received from the subscription. - - id: messaging.azure_eventhubs + - id: messaging.eventhubs type: attribute_group extends: messaging brief: > Attributes for Azure Event Hubs attributes: - - ref: messaging.azure_eventhubs.message.enqueued_time - - ref: messaging.azure_eventhubs.destination.partition.id + - ref: messaging.eventhubs.message.enqueued_time + - ref: messaging.eventhubs.destination.partition.id requirement_level: conditionally_required: If available. - - ref: messaging.azure_eventhubs.consumer.group + - ref: messaging.eventhubs.consumer.group requirement_level: conditionally_required: If not default ("$Default").