Merge branch 'main' into update_summaries

CHANGELOG.md

@@ -7,6 +7,9 @@ release.
 
 ## Unreleased
 
+- Remove spaces from example exporter User-Agent header to conform to RFC7231 & RFC7230.
+  [#3052](/~https://github.com/open-telemetry/opentelemetry-specification/pull/3052)
+
 ### Context
 
 ### Traces
@@ -25,6 +28,9 @@ release.
 
 ### Semantic Conventions
 
+- Add `code.lineno` source code attribute
+  ([#3029](/~https://github.com/open-telemetry/opentelemetry-specification/pull/3029))
+
 ### Compatibility
 - Add condition with sum and count for prometheus summaries
 ([3059]/~https://github.com/open-telemetry/opentelemetry-specification/pull/3059)
@@ -76,6 +82,8 @@ release.
   ([#2969](/~https://github.com/open-telemetry/opentelemetry-specification/pull/2969))
 - Make sure it is very clear we are not building a Logging API.
   ([#2966](/~https://github.com/open-telemetry/opentelemetry-specification/pull/2966))
+- Clarify usage of log body for structured logs
+  ([#3023](/~https://github.com/open-telemetry/opentelemetry-specification/pull/3023))
 
 ### Resource
 
@@ -101,6 +109,8 @@ release.
   ([#2982](/~https://github.com/open-telemetry/opentelemetry-specification/pull/2982))
 - Update hardware metrics to use `direction` as per general semantic conventions
   ([#2942](/~https://github.com/open-telemetry/opentelemetry-specification/pull/2942))
+- Add ClickHouse to db.system semantic conventions
+  ([#3011](/~https://github.com/open-telemetry/opentelemetry-specification/pull/3011))
 
 ### Compatibility
 
@@ -134,6 +144,28 @@ release.
 
 - Rename `http.retry_count` to `http.resend_count` and clarify its meaning.
   ([#2743](/~https://github.com/open-telemetry/opentelemetry-specification/pull/2743))
+- BREAKING: rename `messaging.consumer_id` to `messaging.consumer.id`,
+  `messaging.destination` to `messaging.destination.name`,
+  `messaging.temp_destination` to `messaging.destination.temporary`,
+  `messaging.destination_kind` to `messaging.destination.kind`,
+  `messaging.message_id` to `messaging.message.id`,
+  `messaging.protocol` to `net.app.protocol.name`,
+  `messaging.protocol_version`, `net.app.protocol.version`,
+  `messaging.conversation_id` to `messaging.message.conversation_id`,
+  `messaging.message_payload_size_bytes` to `messaging.message.payload_size_bytes`,
+  `messaging.message_payload_compressed_size_bytes` to `messaging.message.payload_compressed_size_bytes`,
+  `messaging.rabbitmq.routing_key`: `messaging.rabbitmq.destination.routing_key`,
+  `messaging.kafka.message_key` to `messaging.kafka.message.key`,
+  `messaging.kafka.consumer_group` to `messaging.kafka.consumer.group`,
+  `messaging.kafka.partition` to `messaging.kafka.destination.partition`,
+  `messaging.kafka.tombstone` to `messaging.kafka.message.tombstone`,
+  `messaging.rocketmq.message_type` to `messaging.rocketmq.message.type`,
+  `messaging.rocketmq.message_tag` to `messaging.rocketmq.message.tag`,
+  `messaging.rocketmq.message_keys` to `messaging.rocketmq.message.keys`;
+  Removed `messaging.url`;
+  Renamed `send` operation to `publish`;
+  Split `destination` and `source` namespaces and clarify per-message attributes in batching scenarios.
+  ([#2763](/~https://github.com/open-telemetry/opentelemetry-specification/pull/2763)).
 
 ### Metrics
 

schemas/1.17.0

@@ -0,0 +1,59 @@
+file_format: 1.1.0
+schema_url: https://opentelemetry.io/schemas/1.17.0
+versions:
+  1.17.0:
+    spans:
+      changes:
+        # /~https://github.com/open-telemetry/opentelemetry-specification/pull/2763
+        - rename_attributes:
+            attribute_map:
+              messaging.consumer_id: messaging.consumer.id
+              messaging.protocol: net.app.protocol.name
+              messaging.protocol_version: net.app.protocol.version
+              messaging.destination: messaging.destination.name
+              messaging.temp_destination: messaging.destination.temporary
+              messaging.destination_kind: messaging.destination.kind
+              messaging.message_id: messaging.message.id
+              messaging.conversation_id: messaging.message.conversation_id
+              messaging.message_payload_size_bytes: messaging.message.payload_size_bytes
+              messaging.message_payload_compressed_size_bytes: messaging.message.payload_compressed_size_bytes
+              messaging.rabbitmq.routing_key: messaging.rabbitmq.destination.routing_key
+              messaging.kafka.message_key: messaging.kafka.message.key
+              messaging.kafka.partition: messaging.kafka.destination.partition
+              messaging.kafka.tombstone: messaging.kafka.message.tombstone
+              messaging.rocketmq.message_type: messaging.rocketmq.message.type
+              messaging.rocketmq.message_tag: messaging.rocketmq.message.tag
+              messaging.rocketmq.message_keys: messaging.rocketmq.message.keys
+              messaging.kafka.consumer_group: messaging.kafka.consumer.group
+  1.16.0:
+  1.15.0:
+    spans:
+      changes:
+        # /~https://github.com/open-telemetry/opentelemetry-specification/pull/2743
+        - rename_attributes:
+            attribute_map:
+              http.retry_count: http.resend_count
+  1.14.0:
+  1.13.0:
+    spans:
+      changes:
+        # /~https://github.com/open-telemetry/opentelemetry-specification/pull/2614
+        - rename_attributes:
+            attribute_map:
+              net.peer.ip: net.sock.peer.addr
+              net.host.ip: net.sock.host.addr
+  1.12.0:
+  1.11.0:
+  1.10.0:
+  1.9.0:
+  1.8.0:
+    spans:
+      changes:
+        - rename_attributes:
+            attribute_map:
+              db.cassandra.keyspace: db.name
+              db.hbase.namespace: db.name
+  1.7.0:
+  1.6.1:
+  1.5.0:
+  1.4.0:

semantic_conventions/exception.yaml

@@ -1,5 +1,6 @@
 groups:
   - id: exception
+    type: span
     prefix: exception
     brief: >
       This document defines the shared attributes used to

semantic_conventions/logs/events.yaml

@@ -1,5 +1,6 @@
 groups:
   - id: event
+    type: span
     prefix: event
     brief: >
         This document defines attributes for Events represented using Log Records.

semantic_conventions/logs/log-exception.yaml

@@ -1,5 +1,6 @@
 groups:
   - id: log-exception
+    type: span
     prefix: exception
     brief: >
       This document defines attributes for exceptions represented using Log

semantic_conventions/trace/database.yaml

@@ -157,6 +157,9 @@ groups:
             - id: opensearch
               value: 'opensearch'
               brief: 'OpenSearch'
+            - id: clickhouse
+              value: 'clickhouse'
+              brief: 'ClickHouse'
       - id: connection_string
         tag: connection-level
         type: string

semantic_conventions/trace/general.yaml

@@ -289,3 +289,8 @@ groups:
         brief: >
           The line number in `code.filepath` best representing the operation. It SHOULD point within the code unit named in `code.function`.
         examples: 42
+      - id: column
+        type: int
+        brief: >
+          The column number in `code.filepath` best representing the operation. It SHOULD point within the code unit named in `code.function`.
+        examples: 16