Merge branch 'main' into rabbitmq-destination-name

open-telemetry · Dec 12, 2024 · 275e760 · 275e760
2 parents 210cea0 + f0974a8
commit 275e760
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 5 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -10,7 +10,7 @@
         "MD040": false,
     },
     "yaml.schemas": {
-        "https://raw.githubusercontent.com/open-telemetry/weaver/v0.11.0/schemas/semconv.schema.json": [
+        "https://raw.githubusercontent.com/open-telemetry/weaver/v0.12.0/schemas/semconv.schema.json": [
             "model/**/*.yaml"
         ]
     },

diff --git a/dependencies.Dockerfile b/dependencies.Dockerfile
@@ -3,7 +3,7 @@
 # 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.11.0 AS weaver
+FROM otel/weaver:v0.12.0 AS weaver
 
 # OPA is used to test policies enforced by weaver.
 FROM openpolicyagent/opa:0.70.0 AS opa

diff --git a/docs/attributes-registry/azure.md b/docs/attributes-registry/azure.md
@@ -6,7 +6,7 @@
 
 # Azure
 
-## Azure Sdk Attributes
+## Azure SDK Attributes
 
 This document defines generic attributes for Azure SDK.
 

diff --git a/docs/attributes-registry/cicd.md b/docs/attributes-registry/cicd.md
@@ -6,7 +6,7 @@
 
 # CICD
 
-## CICD Pipeline Attributes
+## CI/CD Pipeline Attributes
 
 This group describes attributes specific to pipelines within a Continuous Integration and Continuous Deployment (CI/CD) system. A [pipeline](https://wikipedia.org/wiki/Pipeline_(computing)) in this case is a series of steps that are performed in order to deliver a new version of software. This aligns with the [Britannica](https://www.britannica.com/dictionary/pipeline) definition of a pipeline where a **pipeline** is the system for developing and producing something. In the context of CI/CD, a pipeline produces or delivers software.
 

diff --git a/model/artifact/registry.yaml b/model/artifact/registry.yaml
@@ -1,6 +1,7 @@
 groups:
   - id: registry.artifact
     type: attribute_group
+    display_name: Artifact Attributes
     brief: >
       This group describes attributes specific to artifacts. Artifacts are
       files or other immutable objects that are intended for distribution. This

diff --git a/model/azure/registry.yaml b/model/azure/registry.yaml
@@ -1,6 +1,7 @@
 groups:
   - id: registry.azure.sdk
     type: attribute_group
+    display_name: Azure SDK Attributes
     brief: >
       This document defines generic attributes for Azure SDK.
     attributes:

diff --git a/model/cicd/registry.yaml b/model/cicd/registry.yaml
@@ -1,6 +1,7 @@
 groups:
   - id: registry.cicd.pipeline
     type: attribute_group
+    display_name: CI/CD Pipeline Attributes
     brief: >
       This group describes attributes specific to pipelines within a Continuous
       Integration and Continuous Deployment (CI/CD) system. A

diff --git a/model/cloudfoundry/registry.yaml b/model/cloudfoundry/registry.yaml
@@ -1,6 +1,7 @@
 groups:
   - id: registry.cloudfoundry
     type: attribute_group
+    display_name: CloudFoundry Attributes
     brief: >
       CloudFoundry resource attributes.
     attributes:

diff --git a/model/hardware/registry.yaml b/model/hardware/registry.yaml
@@ -1,6 +1,7 @@
 groups:
   - id: registry.hardware
     type: attribute_group
+    display_name: Hardware Attributes
     brief: >
       Attributes for hardware.
     attributes:

diff --git a/model/linux/registry.yaml b/model/linux/registry.yaml
@@ -2,6 +2,7 @@ groups:
   # linux.memory.* attribute group
   - id: registry.linux.memory
     type: attribute_group
+    display_name: Linux Memory Attributes
     brief: "Describes Linux Memory attributes"
     attributes:
       - id: linux.memory.slab.state

diff --git a/model/profile/registry.yaml b/model/profile/registry.yaml
@@ -2,6 +2,7 @@ groups:
 
   - id: registry.profile.frame
     type: attribute_group
+    display_name: Profile Frame Attributes
     brief: >
       Describes the origin of a single frame in a Profile.
     attributes:
@@ -11,7 +12,6 @@ groups:
           Describes the interpreter or compiler of a single frame.
         examples: ['cpython']
         type:
-          allow_custom_values: true
           members:
             - id: dotnet
               brief: >

diff --git a/model/test/registry.yaml b/model/test/registry.yaml
@@ -1,6 +1,7 @@
 groups:
   - id: registry.test
     type: attribute_group
+    display_name: Test Attributes
     brief: >
       This group describes attributes specific to
       [software tests](https://wikipedia.org/wiki/Software_testing).

diff --git a/model/vcs/registry.yaml b/model/vcs/registry.yaml
@@ -1,6 +1,7 @@
 groups:
   - id: registry.vcs.repository
     type: attribute_group
+    display_name: VCS Repository Attributes
     brief: >
       This group defines the attributes for
       [Version Control Systems (VCS)](https://wikipedia.org/wiki/Version_control).
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ @@
     # Azure
-    ## Azure Sdk Attributes
+    ## Azure SDK Attributes
     This document defines generic attributes for Azure SDK.
@@ Expand Down @@