Merge branch 'main' into feat/service-criticality-attribute

Author: bachgarash

.github/CODEOWNERS

@@ -36,7 +36,6 @@
 /docs/http/                            @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
 /docs/url/                             @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
 /model/http/                           @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
-/model/error/                          @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
 /model/client/                         @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
 /model/network/                        @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers @open-telemetry/semconv-system-approvers @open-telemetry/semconv-security-approvers
 /model/server/                         @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
@@ -91,16 +90,16 @@
 /docs/non-normative/naming-known-exceptions.md  @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-k8s-approvers
 
 # Container semantic conventions
-/docs/resource/container.md       @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-container-approvers
-/model/container/                 @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-container-approvers
-/model/oci/                       @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-container-approvers
+/docs/resource/container.md       @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-k8s-approvers @open-telemetry/semconv-container-approvers
+/model/container/                 @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-k8s-approvers @open-telemetry/semconv-container-approvers
+/model/oci/                       @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-k8s-approvers @open-telemetry/semconv-container-approvers
 
 # .NET semantic conventions approvers
-/docs/dotnet/                     @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-dotnet-approver @open-telemetry/semconv-http-approvers
+/docs/dotnet/                     @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-dotnet-approver
 /docs/runtime/dotnet-metrics.md   @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-dotnet-approver
-/model/aspnetcore/                @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-dotnet-approver @open-telemetry/semconv-http-approvers
-/model/dotnet/                    @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-dotnet-approver @open-telemetry/semconv-http-approvers
-/model/signalr/                   @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-dotnet-approver @open-telemetry/semconv-http-approvers
+/model/aspnetcore/                @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-dotnet-approver
+/model/dotnet/                    @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-dotnet-approver
+/model/signalr/                   @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-dotnet-approver
 
 # Gen-AI semantic conventions
 /docs/gen-ai/                     @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-genai-approvers
@@ -118,9 +117,10 @@
 
 # CICD semantic conventions
 /docs/cicd/                       @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-cicd-approvers
+/docs/resource/deployment-environment.md  @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-cicd-approvers @open-telemetry/semconv-service-and-deployment-approvers
 /model/artifact/                  @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-cicd-approvers
 /model/cicd/                      @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-cicd-approvers
-/model/deployment/                @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-cicd-approvers
+/model/deployment/                @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-cicd-approvers @open-telemetry/semconv-service-and-deployment-approvers
 /model/test/                      @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-cicd-approvers
 /model/vcs/                       @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-cicd-approvers
 
@@ -130,8 +130,8 @@
 /docs/non-normative/code-attrs-migration.md     @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-code-attribute-approvers
 
 # Database semantic conventions
-/docs/database/                             @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-db-approvers
-/model/database/                            @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-db-approvers
+/docs/db/                             @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-db-approvers
+/model/db/                            @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-db-approvers
 /docs/non-normative/database-test-cases/    @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-db-approvers
 /docs/non-normative/db-migration.md         @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-db-approvers
 
@@ -165,6 +165,9 @@
 /docs/zos                         @open-telemetry/specs-semconv-approvers @open-telemetry/sig-mainframe-approvers
 /model/zos                        @open-telemetry/specs-semconv-approvers @open-telemetry/sig-mainframe-approvers
 
+# Service semantic conventions
+/model/service/                   @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-service-and-deployment-approvers
+
 # NFS
 /docs/nfs                         @open-telemetry/semconv-system-approvers @open-telemetry/specs-semconv-approvers
 /model/nfs                        @open-telemetry/semconv-system-approvers @open-telemetry/specs-semconv-approvers

.github/renovate.json5

@@ -1,8 +1,7 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
-    "config:recommended",
-    "docker:pinDigests",
+    "config:best-practices",
     "helpers:pinGitHubActionDigestsToSemver"
   ],
   "postUpdateOptions" : [
@@ -23,6 +22,10 @@
       "schedule": ["before 8am on Monday"]
     }
   ],
+  "lockFileMaintenance": {
+    "enabled": true,
+    "schedule": ["before 8am on Monday"]
+  },
   "labels": [
     "dependencies"
   ]

.github/scripts/triage/check-changes-ownership.ts

@@ -8,17 +8,23 @@ const prNumber: number = +process.env.PR_NUMBER!;
 const changes: string[] = process.env.CHANGED_FILES!.split(',');
 
 /**
- * Checks if the PR already has the 'triage:accepted:ready' label, meaning the triage checks should be skipped.
- * @returns true if the PR has the 'triage:accepted:ready' assigned to it, false otherwise.
+ * Checks if the PR already has the 'triage:accepted:ready' or 'triage:accepted:ready-with-sig' label, meaning the triage checks should be skipped.
+ * Also checks if the PR title starts with '[chore]' which indicates a maintenance PR that should skip checks.
+ * @returns true if the PR has the 'triage:accepted:ready' or 'triage:accepted:ready-with-sig' label or title starts with '[chore]', false otherwise.
  */
 async function shouldSkipCheck() {
-    const result = await octokit.request("GET /repos/{owner}/{repo}/issues/{issue_number}/labels", {
+    const result = await octokit.request("GET /repos/{owner}/{repo}/issues/{issue_number}", {
         owner: owner,
         repo: repo,
         issue_number: prNumber
     });
 
-    return result.data.some(l => l.name === "triage:accepted:ready");
+    const hasAcceptedLabel = result.data.labels?.some(l =>
+        l.name === "triage:accepted:ready" || l.name === "triage:accepted:ready-with-sig"
+    ) ?? false;
+    const isChore = result.data.title.toLowerCase().startsWith('[chore]');
+
+    return hasAcceptedLabel || isChore;
 }
 
 function getCommentText(changesWithoutOwners: string[]): string {

.github/scripts/triage/package-lock.json

@@ -9,6 +9,6 @@
     "yaml": "^2.8.1"
   },
   "devDependencies": {
-    "@types/node": "^24.6.2"
+    "@types/node": "24.10.1"
   }
 }

.github/scripts/triage/package.json

@@ -5,7 +5,7 @@
 # ./internal/tools/update-spec-repo-links.sh v1.41.0
 
 # this version should be kept up-to-date with the spec version that links use
-PREVIOUS_SPECIFICATION_VERSION=v1.50.0
+PREVIOUS_SPECIFICATION_VERSION=v1.51.0
 
 # Set this to the version number you want to KEEP in URLs in the repository.
 LATEST_SPECIFICATION_VERSION=$1

.github/scripts/update-spec-repo-links.sh

@@ -17,7 +17,7 @@ jobs:
       latest-version: ${{ steps.check-versions.outputs.latest-version }}
       already-opened: ${{ steps.check-versions.outputs.already-opened }}
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - id: check-versions
         name: Check versions
@@ -55,7 +55,7 @@ jobs:
     needs:
       - check-versions
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Use CLA approved github bot
         run: .github/scripts/use-cla-approved-github-bot.sh
@@ -67,7 +67,7 @@ jobs:
           .github/scripts/update-spec-repo-links.sh $VERSION
           sed -i "s/^PREVIOUS_SPECIFICATION_VERSION=.*/PREVIOUS_SPECIFICATION_VERSION=$VERSION/" .github/scripts/update-spec-repo-links.sh
 
-      - uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
+      - uses: actions/create-github-app-token@7e473efe3cb98aa54f8d4bac15400b15fad77d94 # v2.2.0
         id: otelbot-token
         with:
           app-id: ${{ vars.OTELBOT_APP_ID }}

.github/workflows/auto-update-spec-repo-links.yml

@@ -32,10 +32,10 @@ jobs:
       run: sudo apt-get install podman podman-docker
 
     - name: check out code
-      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
     - name: install dependencies
-      run: npm install
+      run: npm ci --ignore-scripts
 
     - name: invoke make
       run: make
@@ -57,10 +57,10 @@ jobs:
       run: sudo apt-get install podman podman-docker
 
     - name: check out code
-      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
     - name: install dependencies
-      run: npm install
+      run: npm ci --ignore-scripts
 
     - name: invoke make
       run: make table-generation registry-generation
@@ -79,10 +79,10 @@ jobs:
       run: sudo apt-get install podman podman-docker
 
     - name: check out code
-      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
     - name: install dependencies
-      run: npm install
+      run: npm ci --ignore-scripts
 
     - name: invoke make
       run: make check-policies
@@ -101,10 +101,10 @@ jobs:
       run: sudo apt-get install podman podman-docker
 
     - name: check out code
-      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
     - name: install dependencies
-      run: npm install
+      run: npm ci --ignore-scripts
 
     - name: invoke make
       run: make check

.github/workflows/build-system-check.yml

@@ -32,11 +32,11 @@ jobs:
       }}
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           fetch-depth: 0
       - name: Setup Go
-        uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
+        uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
         with:
           go-version: ~1.25.0
       - name: Cache Go

.github/workflows/changelog.yml

@@ -1,7 +1,7 @@
 name: 'Check changes ownership'
 on:
   pull_request_target:
-    types: [opened, synchronize]
+    types: [opened, synchronize, edited, labeled, unlabeled]
     branches: [ 'main' ]
     paths:
       - 'model/**'
@@ -19,7 +19,7 @@ jobs:
       any_changed: ${{ steps.changed-files.outputs.any_changed }}
     steps:
        # Checkout the PR branch only to get the changed files from the .git folder
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           ref: ${{ github.event.pull_request.head.ref }}
           repository: ${{ github.event.pull_request.head.repo.full_name }}
@@ -40,7 +40,7 @@ jobs:
     if: ${{ needs.get-changed-files.outputs.any_changed == 'true' && github.repository_owner == 'open-telemetry' }}
     steps:
       # Checkout the base branch (main, secure context)
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           ref: ${{ github.event.pull_request.base.ref }}