Merge branch 'main' into gen-ai-align-naming

Author: Liudmila Molkova

.chloggen/hpa-resource.yaml

@@ -0,0 +1,27 @@
+# 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: k8s
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Add new resource attributes for `k8s.hpa` to capture the `scaleTargetRef` fields
+#
+
+# 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: [2008]
+
+# (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: |
+  Adds below attributes to the `k8s.hpa` resource:
+  - `k8s.hpa.scaletargetref.kind`
+  - `k8s.hpa.scaletargetref.name`
+  - `k8s.hpa.scaletargetref.api_version`

.chloggen/k8s-naming.yaml

@@ -0,0 +1,7 @@
+change_type: enhancement
+
+component: k8s
+
+note: Explains the rationale behind the Kubernetes resource naming convention.
+
+issues: [2245]

.chloggen/rrschulze_issue1687.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: new_component
+
+# The name of the area of concern in the attributes-registry, (e.g. http, cloud, db)
+component: mainframe, zos
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Add initial semantic conventions for mainframes
+
+# 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: [1687]
+
+# (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/rrschulze_issue1687_zos.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: deprecation
+
+# The name of the area of concern in the attributes-registry, (e.g. http, cloud, db)
+component: os
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: "Deprecate os.type='z_os' and replace with os.type='zos'"
+
+# 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: [1687]
+
+# (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:

.github/CODEOWNERS

@@ -77,10 +77,11 @@
 /model/mobile/                    @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-client-approvers
 
 # K8s semantic conventions
-/docs/resource/k8s.md                 @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-k8s-approvers
-/model/k8s/                           @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-k8s-approvers
-/docs/non-normative/k8s-attributes.md @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-k8s-approvers
-/docs/non-normative/k8s-migration.md  @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-k8s-approvers
+/docs/resource/k8s.md                           @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-k8s-approvers
+/model/k8s/                                     @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-k8s-approvers
+/docs/non-normative/k8s-attributes.md           @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-k8s-approvers
+/docs/non-normative/k8s-migration.md            @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-k8s-approvers
+/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
@@ -145,3 +146,9 @@
 /templates/                             @open-telemetry/specs-semconv-approvers @open-telemetry/weaver-approvers
 /internal/                              @open-telemetry/specs-semconv-approvers @open-telemetry/weaver-approvers
 /docs/non-normative/code-generation.md  @open-telemetry/specs-semconv-approvers @open-telemetry/weaver-approvers
+
+# Mainframe
+/docs/mainframe                   @open-telemetry/specs-semconv-approvers @open-telemetry/sig-mainframe-approvers
+/model/mainframe                  @open-telemetry/specs-semconv-approvers @open-telemetry/sig-mainframe-approvers
+/docs/zos                         @open-telemetry/specs-semconv-approvers @open-telemetry/sig-mainframe-approvers
+/model/zos                        @open-telemetry/specs-semconv-approvers @open-telemetry/sig-mainframe-approvers

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -67,6 +67,7 @@ body:
         - area:k8s
         - area:linux
         - area:log
+        - area:mainframe
         - area:messaging
         - area:network
         - area:nodejs
@@ -96,6 +97,7 @@ body:
         - area:v8js
         - area:vcs
         - area:webengine
+        - area:zos
         # End semconv area list
   - type: textarea
     attributes:

.github/ISSUE_TEMPLATE/change_proposal.yaml

@@ -59,6 +59,7 @@ body:
         - area:k8s
         - area:linux
         - area:log
+        - area:mainframe
         - area:messaging
         - area:network
         - area:nodejs
@@ -88,6 +89,7 @@ body:
         - area:v8js
         - area:vcs
         - area:webengine
+        - area:zos
         # End semconv area list
   - type: textarea
     attributes:

.github/ISSUE_TEMPLATE/new-conventions.yaml

@@ -14,6 +14,93 @@ body:
         pull requests, issues, and questions in this area.
 
         Creating a new issue here is a great first step to find others interested in collaborating.
+  - type: dropdown
+    id: area
+    attributes:
+      label: Area(s)
+      description: Which area(s) does your new conventions concern? If none fits, please select `area:new`
+      multiple: true
+      options:
+        - area:new
+        # NOTE: The list below is autogenerated using `make generate-gh-issue-templates`
+        # DO NOT manually edit it.
+        # Start semconv area list
+        - area:android
+        - area:app
+        - area:artifact
+        - area:aspnetcore
+        - area:aws
+        - area:azure
+        - area:browser
+        - area:cassandra
+        - area:cicd
+        - area:client
+        - area:cloud
+        - area:cloudevents
+        - area:cloudfoundry
+        - area:code
+        - area:container
+        - area:cpu
+        - area:cpython
+        - area:db
+        - area:deployment
+        - area:destination
+        - area:device
+        - area:disk
+        - area:dns
+        - area:dotnet
+        - area:elasticsearch
+        - area:enduser
+        - area:error
+        - area:exception
+        - area:faas
+        - area:feature-flag
+        - area:file
+        - area:gcp
+        - area:gen-ai
+        - area:geo
+        - area:go
+        - area:graphql
+        - area:hardware
+        - area:heroku
+        - area:host
+        - area:http
+        - area:ios
+        - area:jvm
+        - area:k8s
+        - area:linux
+        - area:log
+        - area:mainframe
+        - area:messaging
+        - area:network
+        - area:nodejs
+        - area:oci
+        - area:opentracing
+        - area:os
+        - area:otel
+        - area:peer
+        - area:process
+        - area:profile
+        - area:rpc
+        - area:security-rule
+        - area:server
+        - area:service
+        - area:session
+        - area:signalr
+        - area:source
+        - area:system
+        - area:telemetry
+        - area:test
+        - area:thread
+        - area:tls
+        - area:url
+        - area:user
+        - area:user-agent
+        - area:v8js
+        - area:vcs
+        - area:webengine
+        - area:zos
+        # End semconv area list
   - type: textarea
     attributes:
       label: Propose new conventions

.github/workflows/ossf-scorecard.yml

@@ -23,7 +23,7 @@ jobs:
         with:
           persist-credentials: false
 
-      - uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186  # v2.4.1
+      - uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde  # v2.4.2
         with:
           results_file: results.sarif
           results_format: sarif
@@ -42,6 +42,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f  # v3.28.18
+        uses: github/codeql-action/upload-sarif@fca7ace96b7d713c7035871441bd52efbe39e27e  # v3.28.19
         with:
           sarif_file: results.sarif

dependencies.Dockerfile

@@ -3,10 +3,10 @@
 # Dependabot can keep this file up to date with latest containers.
 
 # Weaver is used to generate markdown docs, and enforce policies on the model.
-FROM otel/weaver:v0.15.1@sha256:95c0aaa493d84ac72a1188756bd46eec1ead8e82004e7778ff5779736be8d578 AS weaver
+FROM otel/weaver:v0.15.2@sha256:b13acea09f721774daba36344861f689ac4bb8d6ecd94c4600b4d590c8fb34b9 AS weaver
 
 # OPA is used to test policies enforced by weaver.
-FROM openpolicyagent/opa:1.4.2@sha256:35a093d9ae828373cf88f68ecaa8189ab26287468074a3b78f0601d9c8b7a4f5 AS opa
+FROM openpolicyagent/opa:1.5.1@sha256:7d30d984125161b7f30599c6bdf80a6f2301dbbd526725714c231aad8179e4b9 AS opa
 
 # Lychee is used for checking links in documentation.
 FROM lycheeverse/lychee:sha-2aa22f8@sha256:2e3786630482c41f9f2dd081e06d7da1c36d66996e8cf6573409b8bc418d48c4 AS lychee