Fix merge conflicts.

Author: jsuereth

.chloggen/2444.yaml

@@ -0,0 +1,4 @@
+change_type: enhancement
+component: all
+note: Add `metric_value_type` code-generation annotation to all metric definitions.
+issues: [2444, 591]

.chloggen/2463.yaml

@@ -0,0 +1,4 @@
+change_type: enhancement
+component: http
+note: "Clarify how `server.address` and `server.port` should be populated by HTTP client instrumentations."
+issues: [2443, 2463]

.chloggen/sql-server-context-info-propagation.yaml renamed to .chloggen/add_k8s_fs_metrics.yaml

@@ -7,14 +7,14 @@
 change_type: enhancement
 
 # The name of the area of concern in the attributes-registry, (e.g. http, cloud, db)
-component: db
+component: k8s
 
 # A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
-note: Add database context propagation via `SET CONTEXT_INFO` for SQL Server
+note: Add k8s node, pod, container filesystem 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: [2162]
+issues: [1488]
 
 # (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.

.chloggen/wip-entity-registry.yaml renamed to .chloggen/add_k8s_volume_metrics.yaml

@@ -7,14 +7,14 @@
 change_type: enhancement
 
 # The name of the area of concern in the attributes-registry, (e.g. http, cloud, db)
-component: entities
+component: k8s
 
 # A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
-note: Adds support for Entity registry and Entity stabilization policies.
+note: Add k8s Pod Volume 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: [2246]
+issues: [1485]
 
 # (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.

.chloggen/gen-ai-system-naming.yaml

@@ -0,0 +1,10 @@
+change_type: breaking
+component: gen-ai
+note: |
+  Follow system-specific naming policy in GenAI semantic conventions.
+  - Rename `gen_ai.system` to `gen_ai.provider.name`
+  - Remove `gen_ai` prefix from `gen_ai.openai.*` attributes.
+  - Rename `az.ai.*` attribute names to `azure.ai.*`.
+
+issues: [ 2046 ]
+subtext:

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -72,6 +72,7 @@ body:
         - area:network
         - area:nodejs
         - area:oci
+        - area:openai
         - area:opentracing
         - area:os
         - area:otel

.github/ISSUE_TEMPLATE/change_proposal.yaml

@@ -64,6 +64,7 @@ body:
         - area:network
         - area:nodejs
         - area:oci
+        - area:openai
         - area:opentracing
         - area:os
         - area:otel

.github/ISSUE_TEMPLATE/new-conventions.yaml

@@ -75,6 +75,7 @@ body:
         - area:network
         - area:nodejs
         - area:oci
+        - area:openai
         - area:opentracing
         - area:os
         - area:otel

.github/PULL_REQUEST_TEMPLATE.md

@@ -11,4 +11,4 @@ Note: if the PR is touching an area that is not listed in the [existing areas](h
 * [ ] [CONTRIBUTING.md](https://github.com/open-telemetry/semantic-conventions/blob/main/CONTRIBUTING.md) guidelines followed.
 * [ ] Change log entry added, according to the guidelines in [When to add a changelog entry](https://github.com/open-telemetry/semantic-conventions/blob/main/CONTRIBUTING.md#when-to-add-a-changelog-entry).
   * If your PR does not need a change log, start the PR title with `[chore]`
-* [ ] [schema-next.yaml](https://github.com/open-telemetry/semantic-conventions/blob/main/schema-next.yaml) updated with changes to existing conventions.
+* [ ] Links to the prototypes or existing instrumentations (when adding or changing conventions)

.github/scripts/link-check.sh

@@ -0,0 +1,61 @@
+#!/bin/bash
+
+set -e
+
+export MSYS_NO_PATHCONV=1 # for Git Bash on Windows
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+ROOT_DIR="$SCRIPT_DIR/../.."
+DEPENDENCIES_DOCKERFILE="$ROOT_DIR/dependencies.Dockerfile"
+
+# Parse command line arguments
+LOCAL_LINKS_ONLY=false
+TARGET=""
+
+while [[ $# -gt 0 ]]; do
+    case $1 in
+        --local-links-only)
+            LOCAL_LINKS_ONLY=true
+            shift
+            ;;
+        *)
+            # Treat any other arguments as file paths
+            TARGET="$TARGET $1"
+            shift
+            ;;
+    esac
+done
+
+# Extract lychee version from dependencies.dockerfile
+LYCHEE_VERSION=$(grep "FROM lycheeverse/lychee:" "$DEPENDENCIES_DOCKERFILE" | sed 's/.*FROM lycheeverse\/lychee:\([^ ]*\).*/\1/')
+
+if [[ -z "$TARGET" ]]; then
+    TARGET="."
+fi
+
+# Build the lychee command with optional GitHub token
+CMD="lycheeverse/lychee:$LYCHEE_VERSION --verbose --root-dir /data"
+
+# Add GitHub token if available
+if [[ -n "$GITHUB_TOKEN" ]]; then
+    CMD="$CMD --github-token $GITHUB_TOKEN"
+fi
+
+if [[ "$LOCAL_LINKS_ONLY" == "true" ]]; then
+    CMD="$CMD --scheme file --include-fragments"
+else
+    CMD="$CMD --config .github/scripts/lychee-config.toml"
+fi
+
+CMD="$CMD $TARGET"
+
+# Determine if we should allocate a TTY
+DOCKER_FLAGS="--rm --init"
+if [[ -t 0 ]]; then
+    DOCKER_FLAGS="$DOCKER_FLAGS -it"
+else
+    DOCKER_FLAGS="$DOCKER_FLAGS -i"
+fi
+
+# Run lychee with proper signal handling
+exec docker run $DOCKER_FLAGS -v "$ROOT_DIR":/data -w /data $CMD