Merge branch 'main' into geo_fields

.chloggen/1156.yaml

@@ -0,0 +1,7 @@
+change_type: breaking
+
+component: messaging
+
+note: Rename `messaging.kafka.message.offset` to `messaging.kafka.offset`
+
+issues: [1156]

.chloggen/1166.yaml

@@ -0,0 +1,22 @@
+# Use this changelog template to create an entry for release notes.
+#
+# If your change doesn't affect end users you should instead start
+# your pull request title with [chore] or use the "Skip Changelog" label.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: breaking
+
+# The name of the area of concern in the attributes-registry, (e.g. http, cloud, db)
+component: db
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Sampling relevant attributes defined for database client spans
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+# The values here must be integers.
+issues: [ 1019 ]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:

.chloggen/1167.yaml

@@ -0,0 +1,4 @@
+change_type: bug_fix
+component: http
+note: "Relax requirement on when to set HTTP span status to Error from `MUST` to `SHOULD`."
+issues: [1167, 1003]

.chloggen/1200.yaml

@@ -0,0 +1,6 @@
+change_type: enhancement
+component: gen_ai
+note: >
+  Rename `gen_ai.usage.prompt_tokens` to `gen_ai.usage.input_tokens` and `gen_ai.usage.completion_tokens` to `gen_ai.usage.output_tokens`
+  to align terminology between spans and metrics.
+issues: [ 1200 ]

.chloggen/1202.yaml

@@ -0,0 +1,4 @@
+change_type: enhancement
+component: gen_ai
+note: Convert `gen_ai.operation.name` to enum and use it on spans
+issues: [ 1202 ]

.chloggen/1216.yaml

@@ -0,0 +1,5 @@
+change_type: breaking
+component: tls
+note: >
+  Deprecate `tls.client.server_name attribute` in favor of common `server.address`.
+issues: [ 1211, 1216 ]

.chloggen/1239.yaml

@@ -0,0 +1,4 @@
+change_type: enhancement
+component: network
+note: Add QUIC to the list of well known network transports
+issues: [ 1237, 1239 ]

.chloggen/1241.yaml

@@ -0,0 +1,4 @@
+change_type: breaking
+component: messaging
+note: Deprecate `messaging.destination_publish.*`` namespace and remove all usages.
+issues: [ 1178, 1241 ]

.chloggen/1243.yaml

@@ -0,0 +1,22 @@
+# Use this changelog template to create an entry for release notes.
+#
+# If your change doesn't affect end users you should instead start
+# your pull request title with [chore] or use the "Skip Changelog" label.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: enhancement
+
+# The name of the area of concern in the attributes-registry, (e.g. http, cloud, db)
+component: db
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: "`db.query.text` IN-clauses MAY be collapsed during the sanitization process"
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+# The values here must be integers.
+issues: [ 1053 ]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:

.chloggen/1244.yaml

@@ -0,0 +1,4 @@
+change_type: enhancement
+component: db, messaging
+note: Clarify that DB and messaging system-specific conventions override common ones
+issues: [ 1235, 1244 ]

.chloggen/1297.yaml

@@ -0,0 +1,4 @@
+change_type: enhancement
+component: gen_ai
+note: Add `server.address`, `server.port`, and `error.type` to GenAI spans.
+issues: [ 1297 ]

.chloggen/add_linux_memory_slab.yaml

@@ -0,0 +1,22 @@
+# Use this changelog template to create an entry for release notes.
+#
+# If your change doesn't affect end users you should instead start
+# your pull request title with [chore] or use the "Skip Changelog" label.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: enhancement
+
+# The name of the area of concern in the attributes-registry, (e.g. http, cloud, db)
+component: linux
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Add the `system.linux.memory.slab.usage` metric and the `linux.memory.slab.state` attributes.
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+# The values here must be integers.
+issues: [531]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:

.chloggen/cicd-reg-attr.yaml

@@ -0,0 +1,24 @@
+# Use this changelog template to create an entry for release notes.
+#
+# If your change doesn't affect end users you should instead start
+# your pull request title with [chore] or use the "Skip Changelog" label.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: breaking
+
+# The name of the area of concern in the attributes-registry, (e.g. http, cloud, db)
+component: cicd, deployment, artifact, test, vcs
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Adds CICD common attributes to the registry.
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+# The values here must be integers.
+issues: [915, 832, 833]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext: |
+  - CICD common attributes have been added to the registry.
+  - `deployment.environment` has been deprecated and moved to `deployment.environment.name`.

.chloggen/cloud-events-restructure.yaml

@@ -0,0 +1,5 @@
+change_type: 'enhancement'
+component: cloudevents
+note: CloudEvents conventions to follow HTTP/Messaging Span conventions
+issues: [654]
+subtext:

.chloggen/jvm_memory-buffer_metric_renaming.yaml

@@ -0,0 +1,22 @@
+# Use this changelog template to create an entry for release notes.
+#
+# If your change doesn't affect end users you should instead start
+# your pull request title with [chore] or use the "Skip Changelog" label.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: breaking
+
+# The name of the area of concern in the attributes-registry, (e.g. http, cloud, db)
+component: jvm
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: "Rename JVM metric `jvm.buffer.memory.usage` to `jvm.buffer.memory.used`"
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+# The values here must be integers.
+issues: [288]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:

.chloggen/log-original-body.yaml

@@ -0,0 +1,22 @@
+# Use this changelog template to create an entry for release notes.
+#
+# If your change doesn't affect end users you should instead start
+# your pull request title with [chore] or use the "Skip Changelog" label.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: enhancement
+
+# The name of the area of concern in the attributes-registry, (e.g. http, cloud, db)
+component: log
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Add 'log.record.original' attribute.
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+# The values here must be integers.
+issues: [1137]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:

.chloggen/v8js-metrics.yaml

@@ -0,0 +1,17 @@
+# Use this changelog template to create an entry for release notes.
+#
+# If your change doesn't affect end users you should instead start
+# your pull request title with [chore] or use the "Skip Changelog" label.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: new_component
+
+# The name of the area of concern in the attributes-registry, (e.g. http, cloud, db)
+component: v8js
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Introducing semantic conventions for V8 JS Engine runtime metrics.
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+# The values here must be integers.
+issues: [990]

.github/CODEOWNERS

@@ -23,7 +23,7 @@
 /model/logs/                        @open-telemetry/specs-semconv-approvers @tigrannajaryan
 /docs/exceptions/exceptions-logs.md       @open-telemetry/specs-semconv-approvers @tigrannajaryan
 /docs/feature-flags/feature-flags-logs.md @open-telemetry/specs-semconv-approvers @tigrannajaryan
-/docs/general/events-general.md           @open-telemetry/specs-semconv-approvers @tigrannajaryan
+/docs/general/events-general.md           @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-event-approvers @tigrannajaryan
 /docs/general/logs-general.md             @open-telemetry/specs-semconv-approvers @tigrannajaryan
 /docs/logs/                               @open-telemetry/specs-semconv-approvers @tigrannajaryan
 
@@ -88,4 +88,10 @@
 /model/resource/process.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-security-approvers
 /model/network.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-security-approvers
 
-# TODO - Add semconv area experts
+# CICD semantic conventions approvers
+/model/registry/artifact.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-cicd-approvers
+/model/registry/cicd.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-cicd-approvers
+/model/registry/code.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-cicd-approvers
+/model/registry/deployment.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-cicd-approvers
+/model/registry/test.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-cicd-approvers
+/model/registry/vcs.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-cicd-approvers

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -20,9 +20,11 @@ body:
         # DO NOT manually edit it.
         # Start semconv area list
         - area:android
+        - area:artifact
         - area:aspnetcore
         - area:aws
         - area:browser
+        - area:cicd
         - area:client
         - area:cloud
         - area:cloudevents
@@ -51,6 +53,7 @@ body:
         - area:http
         - area:jvm
         - area:k8s
+        - area:linux
         - area:log
         - area:messaging
         - area:network
@@ -68,11 +71,14 @@ body:
         - area:source
         - area:system
         - area:telemetry
+        - area:test
         - area:thread
         - area:tls
         - area:url
         - area:user-agent
         - area:user
+        - area:v8js
+        - area:vcs
         - area:webengine
         # End semconv area list
   - type: textarea

.github/ISSUE_TEMPLATE/change_proposal.yaml

@@ -13,9 +13,11 @@ body:
         # DO NOT manually edit it.
         # Start semconv area list
         - area:android
+        - area:artifact
         - area:aspnetcore
         - area:aws
         - area:browser
+        - area:cicd
         - area:client
         - area:cloud
         - area:cloudevents
@@ -44,6 +46,7 @@ body:
         - area:http
         - area:jvm
         - area:k8s
+        - area:linux
         - area:log
         - area:messaging
         - area:network
@@ -61,11 +64,14 @@ body:
         - area:source
         - area:system
         - area:telemetry
+        - area:test
         - area:thread
         - area:tls
         - area:url
         - area:user-agent
         - area:user
+        - area:v8js
+        - area:vcs
         - area:webengine
         # End semconv area list
   - type: textarea

.github/ISSUE_TEMPLATE/new-conventions.yaml

@@ -22,9 +22,11 @@ body:
         # DO NOT manually edit it.
         # Start semconv area list
         - area:android
+        - area:artifact
         - area:aspnetcore
         - area:aws
         - area:browser
+        - area:cicd
         - area:client
         - area:cloud
         - area:cloudevents
@@ -53,6 +55,7 @@ body:
         - area:http
         - area:jvm
         - area:k8s
+        - area:linux
         - area:log
         - area:messaging
         - area:network
@@ -70,11 +73,14 @@ body:
         - area:source
         - area:system
         - area:telemetry
+        - area:test
         - area:thread
         - area:tls
         - area:url
         - area:user-agent
         - area:user
+        - area:v8js
+        - area:vcs
         - area:webengine
         # End semconv area list
   - type: textarea

.github/workflows/scripts/prepare-new-issue.sh

@@ -15,6 +15,14 @@
 
 set -euo pipefail
 
+OS=$(uname | tr '[:upper:]' '[:lower:]')
+
+if [[ "${OS}" == "darwin" ]]; then
+  SED="gsed"
+else
+  SED="sed"
+fi
+
 if [[ -z "${ISSUE:-}" || -z "${BODY:-}" || -z "${OPENER:-}" ]]; then
   echo "Missing one of ISSUE, BODY, or OPENER, please ensure all are set."
   exit 0
@@ -25,7 +33,7 @@ AREAS_SECTION_START=$( (echo "${BODY}" | grep -n '### Area(s)' | awk '{ print $1
 BODY_AREAS=""
 
 if [[ "${AREAS_SECTION_START}" != '-1' ]]; then
-  BODY_AREAS=$(echo "${BODY}" | sed -n $((AREAS_SECTION_START+2))p)
+    BODY_AREAS=$(echo "${BODY}" | "${SED}" -n $((AREAS_SECTION_START+2))p)
 fi
 
 for AREA in ${BODY_AREAS}; do

.gitignore

@@ -34,4 +34,10 @@ package-lock.json
 .vscode
 
 # Visual Studio
-.vs/
+.vs/
+
+# Python
+venv
+
+# Brew package lock
+Brewfile.lock.json

.markdown_link_check_config.json

@@ -4,7 +4,7 @@
       "pattern": "^https://github\\.com/open-telemetry/opentelemetry-specification/(issues|pull)"
     },
     {
-      "pattern": "^https://github\\.com/open-telemetry/semantic-conventions/(issues|pull)"
+      "pattern": "^https://github\\.com/open-telemetry/semantic-conventions/(issues|pull|actions)"
     }
   ],
   "replacementPatterns": [

Brewfile

@@ -0,0 +1 @@
+brew "gsed"