codeowners and remove folder name from path

open-telemetry · Sep 16, 2024 · 12d3674 · 12d3674
1 parent d4ecc1f
commit 12d3674
Show file tree

Hide file tree

Showing 169 changed files with 36 additions and 35 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -19,70 +19,71 @@
 /schemas/                                 @open-telemetry/specs-semconv-approvers @tigrannajaryan
 /internal/tools/schema_check.sh           @open-telemetry/specs-semconv-approvers @tigrannajaryan
 
-# Logs semantic conventions
+# Logs and events semantic conventions
 /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 @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
 /model/log/                               @open-telemetry/specs-semconv-approvers @tigrannajaryan
+/model/event/                             @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-event-approvers
 
-# JVM semantic conventions approvers
+# JVM semantic conventions
 /docs/jvm/                        @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-jvm-approvers
 /model/jvm/                       @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-jvm-approvers
 
-# HTTP semantic conventions approvers
+# HTTP semantic conventions
 /docs/http/                       @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
 /model/http/                      @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
-/model/server/*-registry.yaml     @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
-/model/client/*-registry.yaml     @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
-/model/network/*-registry.yaml    @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers @open-telemetry/semconv-security-approvers
-/model/error/*-registry.yaml      @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
-/model/url/*-registry.yaml        @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
-/model/user-agent/*-registry.yaml @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-security-approvers
+/model/server/                    @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
+/model/url/                       @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
+/model/user-agent/                @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers
 
-# System semantic conventions approvers
+# System semantic conventions
 /docs/system/                     @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-system-approvers
 /docs/resource/host.md            @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-system-approvers
+/model/host/                      @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-system-approvers
 /model/system/                    @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-system-approvers
-/model/host/*-registry.yaml       @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-system-approvers
 
-# Mobile semantic conventions approvers
+# Mobile semantic conventions
 /docs/mobile/                     @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-mobile-approvers
-/model/device/device-events.yaml  @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-mobile-approvers
+/model/device/                    @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-mobile-approvers
 
-# K8s semantic conventions 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
 
-# Container semantic conventions 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
 
-# .NET semantic conventions approvers
+# .NET semantic conventions
 /docs/dotnet/                     @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-dotnet-approver @open-telemetry/semconv-http-approvers
 /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
 
-# Gen-AI semantic conventions approvers
+# Gen-AI semantic conventions
 /docs/gen-ai/                     @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-llm-approvers
 /model/gen-ai/                    @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-llm-approvers
 
-# Security semantic conventions approvers
+# Security semantic conventions
 /model/dns/                       @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-security-approvers
 /model/file/                      @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-security-approvers
-/model/network/                   @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-security-approvers
+# /model/network/                 is defined in HTTP section
 /model/process/                   @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-security-approvers
 /model/tls/                       @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-security-approvers
-/model/user/*-registry.yaml       @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-security-approvers
+/model/user/                      @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-security-approvers
 
-# CICD semantic conventions approvers
+# CICD semantic conventions
+/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/code/                      @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-cicd-approvers
+/model/deployment/                @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-cicd-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
-/model/artifact/*-registry.yaml   @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-cicd-approvers
-/model/code/*-registry.yaml       @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-cicd-approvers
-/model/deployment/*-registry.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-cicd-approvers
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -106,25 +106,25 @@ The YAML (model definition) and Markdown (documentation) files are organized in
 │   │   ├── ....md
 ├── model
 │   ├── {root-namespace}
-│   │   ├── {root-namespace}-events.yaml
-│   │   ├── {root-namespace}-metrics.yaml
-│   │   ├── {root-namespace}-registry.yaml
-│   │   ├── {root-namespace}-resources.yaml
-│   │   ├── {root-namespace}-spans.yaml
+│   │   ├── events.yaml
+│   │   ├── metrics.yaml
+│   │   ├── registry.yaml
+│   │   ├── resources.yaml
+│   │   ├── spans.yaml
 ```
 
-All attributes must be defined in the folder matching its root namespace under
-`/{root-namespace}/{root-namespace}-registry.yaml` file.
+All attributes must be defined in the folder matching their root namespace under
+`/{root-namespace}/*registry.yaml` file.
 
 Corresponding markdown files are auto-generated (see [Update the markdown files](#2-update-the-markdown-files))
 in `/docs/attribute_registry` folder.
 
 All semantic conventions definitions for telemetry signals should be placed under
-`/model/{root-namespace}` and should follow `{root-namespace}-{signal}.yaml` pattern. For example,
-HTTP spans are defined in `model/http/http-spans.yaml`.
+`/model/{root-namespace}` and should follow `*{signal}.yaml` pattern. For example,
+HTTP spans are defined in `model/http/spans.yaml`.
 
 YAML definitions could be broken down into multiple files. For example, AWS spans
-are defined in `/model/aws/aws-lambda-spans.yaml` and `/model/aws/aws-sdk-spans.yaml` files.
+are defined in `/model/aws/lambda-spans.yaml` and `/model/aws/sdk-spans.yaml` files.
 
 #### Schema files
 

diff --git a/docs/azure/events.md b/docs/azure/events.md
@@ -52,6 +52,6 @@ The event name MUST be `az.resource.log`.
 | `tenant.id` | string | The tenant ID of the Active Directory tenant that this event is tied to. | `607964b6-41a5-4e24-a5db-db7aab3b9b34` | `Conditionally Required`: if the event is tied to an Active Directory tenant. | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
 <!-- end of manually added table -->
 
-See [Azure Resource Log definition](/model/azure/azure-logs.yaml) for the details.
+See [Azure Resource Log definition](/model/azure/logs.yaml) for the details.
 
 [DocumentStatus]: https://opentelemetry.io/docs/specs/otel/document-status
diff --git a/...precated/android-registry-deprecated.yaml → ...rioid/deprecated/registry-deprecated.yaml b/...precated/android-registry-deprecated.yaml → ...rioid/deprecated/registry-deprecated.yaml
diff --git a/model/andrioid/android-registry.yaml → model/andrioid/registry.yaml b/model/andrioid/android-registry.yaml → model/andrioid/registry.yaml
diff --git a/model/andrioid/android-resources.yaml → model/andrioid/resources.yaml b/model/andrioid/android-resources.yaml → model/andrioid/resources.yaml
diff --git a/model/artifact/artifact-registry.yaml → model/artifact/registry.yaml b/model/artifact/artifact-registry.yaml → model/artifact/registry.yaml
diff --git a/model/aspnetcore/aspnetcore-metrics.yaml → model/aspnetcore/metrics.yaml b/model/aspnetcore/aspnetcore-metrics.yaml → model/aspnetcore/metrics.yaml
diff --git a/model/aspnetcore/aspnetcore-registry.yaml → model/aspnetcore/registry.yaml b/model/aspnetcore/aspnetcore-registry.yaml → model/aspnetcore/registry.yaml
diff --git a/model/aws/aws-ecs-resources.yaml → model/aws/ecs-resources.yaml b/model/aws/aws-ecs-resources.yaml → model/aws/ecs-resources.yaml
diff --git a/model/aws/aws-eks-resources.yaml → model/aws/eks-resources.yaml b/model/aws/aws-eks-resources.yaml → model/aws/eks-resources.yaml
diff --git a/model/aws/aws-lambda-spans.yaml → model/aws/lambda-spans.yaml b/model/aws/aws-lambda-spans.yaml → model/aws/lambda-spans.yaml
diff --git a/model/aws/aws-logs-resources.yaml → model/aws/logs-resources.yaml b/model/aws/aws-logs-resources.yaml → model/aws/logs-resources.yaml
diff --git a/model/aws/aws-registry.yaml → model/aws/registry.yaml b/model/aws/aws-registry.yaml → model/aws/registry.yaml
diff --git a/model/aws/aws-sdk-spans.yml → model/aws/sdk-spans.yml b/model/aws/aws-sdk-spans.yml → model/aws/sdk-spans.yml
diff --git a/model/azure/azure-logs.yaml → model/azure/logs.yaml b/model/azure/azure-logs.yaml → model/azure/logs.yaml
diff --git a/model/azure/azure-registry.yaml → model/azure/registry.yaml b/model/azure/azure-registry.yaml → model/azure/registry.yaml
diff --git a/model/browser/browser-registry.yaml → model/browser/registry.yaml b/model/browser/browser-registry.yaml → model/browser/registry.yaml
diff --git a/model/browser/browser-resources.yaml → model/browser/resources.yaml b/model/browser/browser-resources.yaml → model/browser/resources.yaml
diff --git a/model/cicd/cicd-registry.yaml → model/cicd/registry.yaml b/model/cicd/cicd-registry.yaml → model/cicd/registry.yaml
diff --git a/model/client/client-common.yaml → model/client/common.yaml b/model/client/client-common.yaml → model/client/common.yaml
diff --git a/model/client/client-registry.yaml → model/client/registry.yaml b/model/client/client-registry.yaml → model/client/registry.yaml
diff --git a/model/cloud/cloud-registry.yaml → model/cloud/registry.yaml b/model/cloud/cloud-registry.yaml → model/cloud/registry.yaml
diff --git a/model/cloud/cloud-resources.yaml → model/cloud/resources.yaml b/model/cloud/cloud-resources.yaml → model/cloud/resources.yaml
diff --git a/model/cloudevents/cloudevents-registry.yaml → model/cloudevents/registry.yaml b/model/cloudevents/cloudevents-registry.yaml → model/cloudevents/registry.yaml
diff --git a/model/cloudevents/cloudevents-spans.yaml → model/cloudevents/spans.yaml b/model/cloudevents/cloudevents-spans.yaml → model/cloudevents/spans.yaml
diff --git a/model/code/code-common.yaml → model/code/common.yaml b/model/code/code-common.yaml → model/code/common.yaml
diff --git a/model/code/code-registry.yaml → model/code/registry.yaml b/model/code/code-registry.yaml → model/code/registry.yaml
diff --git a/...ecated/container-registry-deprecated.yaml → ...ainer/deprecated/registry-deprecated.yaml b/...ecated/container-registry-deprecated.yaml → ...ainer/deprecated/registry-deprecated.yaml
diff --git a/model/container/container-metrics.yaml → model/container/metrics.yaml b/model/container/container-metrics.yaml → model/container/metrics.yaml
diff --git a/model/container/container-registry.yaml → model/container/registry.yaml b/model/container/container-registry.yaml → model/container/registry.yaml
diff --git a/model/container/container-resources.yaml → model/container/resources.yaml b/model/container/container-resources.yaml → model/container/resources.yaml
diff --git a/model/cpu/cpu-registry.yaml → model/cpu/registry.yaml b/model/cpu/cpu-registry.yaml → model/cpu/registry.yaml
diff --git a/model/database/database-common.yaml → model/database/common.yaml b/model/database/database-common.yaml → model/database/common.yaml
diff --git a/...precated/database-metrics-deprecated.yaml → ...tabase/deprecated/metrics-deprecated.yaml b/...precated/database-metrics-deprecated.yaml → ...tabase/deprecated/metrics-deprecated.yaml
diff --git a/...recated/database-registry-deprecated.yaml → ...abase/deprecated/registry-deprecated.yaml b/...recated/database-registry-deprecated.yaml → ...abase/deprecated/registry-deprecated.yaml
diff --git a/model/database/database-metrics.yaml → model/database/metrics.yaml b/model/database/database-metrics.yaml → model/database/metrics.yaml
diff --git a/model/database/database-registry.yaml → model/database/registry.yaml b/model/database/database-registry.yaml → model/database/registry.yaml
diff --git a/model/database/database-spans.yaml → model/database/spans.yaml b/model/database/database-spans.yaml → model/database/spans.yaml
diff --git a/...cated/deployment-registry-deprecated.yaml → ...yment/deprecated/registry-deprecated.yaml b/...cated/deployment-registry-deprecated.yaml → ...yment/deprecated/registry-deprecated.yaml
diff --git a/model/deployment/deployment-registry.yaml → model/deployment/registry.yaml b/model/deployment/deployment-registry.yaml → model/deployment/registry.yaml
diff --git a/model/deployment/deployment-resources.yaml → model/deployment/resources.yaml b/model/deployment/deployment-resources.yaml → model/deployment/resources.yaml
diff --git a/model/destination/destination-common.yaml → model/destination/common.yaml b/model/destination/destination-common.yaml → model/destination/common.yaml
diff --git a/model/destination/destination-registry.yaml → model/destination/registry.yaml b/model/destination/destination-registry.yaml → model/destination/registry.yaml
diff --git a/model/device/device-events.yaml → model/device/events.yaml b/model/device/device-events.yaml → model/device/events.yaml
diff --git a/model/device/device-registry.yaml → model/device/registry.yaml b/model/device/device-registry.yaml → model/device/registry.yaml
diff --git a/model/device/device-resources.yaml → model/device/resources.yaml b/model/device/device-resources.yaml → model/device/resources.yaml
diff --git a/model/disk/disk-registry.yaml → model/disk/registry.yaml b/model/disk/disk-registry.yaml → model/disk/registry.yaml
diff --git a/model/dns/dns-metrics.yaml → model/dns/metrics.yaml b/model/dns/dns-metrics.yaml → model/dns/metrics.yaml
diff --git a/model/dns/dns-registry.yaml → model/dns/registry.yaml b/model/dns/dns-registry.yaml → model/dns/registry.yaml
diff --git a/model/dotnet/dotnet-registry.yaml → model/dotnet/registry.yaml b/model/dotnet/dotnet-registry.yaml → model/dotnet/registry.yaml
diff --git a/model/dotnet/dotnet-runtime-metrics.yaml → model/dotnet/runtime-metrics.yaml b/model/dotnet/dotnet-runtime-metrics.yaml → model/dotnet/runtime-metrics.yaml
diff --git a/model/enduser/deprecated/enduser-common.yaml → model/enduser/deprecated/common.yaml b/model/enduser/deprecated/enduser-common.yaml → model/enduser/deprecated/common.yaml
diff --git a/...precated/enduser-registry-deprecated.yaml → ...duser/deprecated/registry-deprecated.yaml b/...precated/enduser-registry-deprecated.yaml → ...duser/deprecated/registry-deprecated.yaml
diff --git a/model/error/error-registry.yaml → model/error/registry.yaml b/model/error/error-registry.yaml → model/error/registry.yaml
diff --git a/model/event/event-common.yaml → model/event/common.yaml b/model/event/event-common.yaml → model/event/common.yaml
diff --git a/model/event/event-registry.yaml → model/event/registry.yaml b/model/event/event-registry.yaml → model/event/registry.yaml
diff --git a/model/exceptions/exception-events.yaml → model/exceptions/events.yaml b/model/exceptions/exception-events.yaml → model/exceptions/events.yaml
diff --git a/model/exceptions/exception-logs.yaml → model/exceptions/logs.yaml b/model/exceptions/exception-logs.yaml → model/exceptions/logs.yaml
diff --git a/model/exceptions/exception-registry.yaml → model/exceptions/registry.yaml b/model/exceptions/exception-registry.yaml → model/exceptions/registry.yaml
diff --git a/model/faas/faas-common.yaml → model/faas/common.yaml b/model/faas/faas-common.yaml → model/faas/common.yaml
diff --git a/model/faas/faas-metrics.yaml → model/faas/metrics.yaml b/model/faas/faas-metrics.yaml → model/faas/metrics.yaml
diff --git a/model/faas/faas-registry.yaml → model/faas/registry.yaml b/model/faas/faas-registry.yaml → model/faas/registry.yaml
diff --git a/model/faas/faas-resources.yaml → model/faas/resources.yaml b/model/faas/faas-resources.yaml → model/faas/resources.yaml
diff --git a/model/faas/faas-spans.yaml → model/faas/spans.yaml b/model/faas/faas-spans.yaml → model/faas/spans.yaml
diff --git a/model/feature-flag/feature-flag-events.yaml → model/feature-flag/events.yaml b/model/feature-flag/feature-flag-events.yaml → model/feature-flag/events.yaml
diff --git a/model/feature-flag/feature-flag-logs.yaml → model/feature-flag/logs.yaml b/model/feature-flag/feature-flag-logs.yaml → model/feature-flag/logs.yaml
diff --git a/...l/feature-flag/feature-flag-registry.yaml → model/feature-flag/registry.yaml b/...l/feature-flag/feature-flag-registry.yaml → model/feature-flag/registry.yaml
diff --git a/model/file/file-registry.yaml → model/file/registry.yaml b/model/file/file-registry.yaml → model/file/registry.yaml
diff --git a/model/gcp/gcp-cloud-run-resources.yaml → model/gcp/cloud-run-resources.yaml b/model/gcp/gcp-cloud-run-resources.yaml → model/gcp/cloud-run-resources.yaml
diff --git a/model/gcp/gcp-client-common.yml → model/gcp/common.yml b/model/gcp/gcp-client-common.yml → model/gcp/common.yml
diff --git a/model/gcp/gcp-gce-resources.yaml → model/gcp/gce-resources.yaml b/model/gcp/gcp-gce-resources.yaml → model/gcp/gce-resources.yaml
diff --git a/model/gcp/gcp-registry.yaml → model/gcp/registry.yaml b/model/gcp/gcp-registry.yaml → model/gcp/registry.yaml
diff --git a/...eprecated/gen-ai-registry-deprecated.yaml → ...en-ai/deprecated/registry-deprecated.yaml b/...eprecated/gen-ai-registry-deprecated.yaml → ...en-ai/deprecated/registry-deprecated.yaml
diff --git a/model/gen-ai/gen-ai-metrics.yaml → model/gen-ai/metrics.yaml b/model/gen-ai/gen-ai-metrics.yaml → model/gen-ai/metrics.yaml
diff --git a/model/gen-ai/gen-ai-registry.yaml → model/gen-ai/registry.yaml b/model/gen-ai/gen-ai-registry.yaml → model/gen-ai/registry.yaml
diff --git a/model/gen-ai/gen-ai-spans.yaml → model/gen-ai/spans.yaml b/model/gen-ai/gen-ai-spans.yaml → model/gen-ai/spans.yaml
diff --git a/model/go/go-metrics.yaml → model/go/metrics.yaml b/model/go/go-metrics.yaml → model/go/metrics.yaml
diff --git a/model/go/go-registry.yaml → model/go/registry.yaml b/model/go/go-registry.yaml → model/go/registry.yaml
diff --git a/model/graphgl/graphql-registry.yaml → model/graphgl/registry.yaml b/model/graphgl/graphql-registry.yaml → model/graphgl/registry.yaml
diff --git a/model/graphgl/graphql-spans.yml → model/graphgl/spans.yml b/model/graphgl/graphql-spans.yml → model/graphgl/spans.yml
diff --git a/model/hardware/hardware-common-metrics.yaml → model/hardware/common-metrics.yaml b/model/hardware/hardware-common-metrics.yaml → model/hardware/common-metrics.yaml
diff --git a/model/hardware/hardware-common.yaml → model/hardware/common.yaml b/model/hardware/hardware-common.yaml → model/hardware/common.yaml
diff --git a/model/hardware/hardware-registry.yaml → model/hardware/registry.yaml b/model/hardware/hardware-registry.yaml → model/hardware/registry.yaml
diff --git a/model/heroku/heroku-registry.yaml → model/heroku/registry.yaml b/model/heroku/heroku-registry.yaml → model/heroku/registry.yaml
diff --git a/model/heroku/heroku-resources.yaml → model/heroku/resources.yaml b/model/heroku/heroku-resources.yaml → model/heroku/resources.yaml
diff --git a/model/host/host-registry.yaml → model/host/registry.yaml b/model/host/host-registry.yaml → model/host/registry.yaml
diff --git a/model/host/host-resources.yaml → model/host/resources.yaml b/model/host/host-resources.yaml → model/host/resources.yaml
diff --git a/model/http/http-common.yaml → model/http/common.yaml b/model/http/http-common.yaml → model/http/common.yaml
diff --git a/.../deprecated/http-registry-deprecated.yaml → .../http/deprecated/registry-deprecated.yaml b/.../deprecated/http-registry-deprecated.yaml → .../http/deprecated/registry-deprecated.yaml
diff --git a/model/http/http-metrics.yaml → model/http/metrics.yaml b/model/http/http-metrics.yaml → model/http/metrics.yaml
diff --git a/model/http/http-registry.yaml → model/http/registry.yaml b/model/http/http-registry.yaml → model/http/registry.yaml
diff --git a/model/http/http-spans.yaml → model/http/spans.yaml b/model/http/http-spans.yaml → model/http/spans.yaml
diff --git a/...s/deprecated/ios-registry-deprecated.yaml → ...l/ios/deprecated/registry-deprecated.yaml b/...s/deprecated/ios-registry-deprecated.yaml → ...l/ios/deprecated/registry-deprecated.yaml
diff --git a/...vm/deprecated/jvm-metrics-deprecated.yaml → model/jvm/deprecated/metrics-deprecated.yaml b/...vm/deprecated/jvm-metrics-deprecated.yaml → model/jvm/deprecated/metrics-deprecated.yaml
diff --git a/model/jvm/jvm-metrics-experimental.yaml → model/jvm/metrics-experimental.yaml b/model/jvm/jvm-metrics-experimental.yaml → model/jvm/metrics-experimental.yaml
diff --git a/model/jvm/jvm-metrics.yaml → model/jvm/metrics.yaml b/model/jvm/jvm-metrics.yaml → model/jvm/metrics.yaml
diff --git a/model/jvm/jvm-registry.yaml → model/jvm/registry.yaml b/model/jvm/jvm-registry.yaml → model/jvm/registry.yaml
diff --git a/...s/deprecated/k8s-registry-deprecated.yaml → ...l/k8s/deprecated/registry-deprecated.yaml b/...s/deprecated/k8s-registry-deprecated.yaml → ...l/k8s/deprecated/registry-deprecated.yaml
diff --git a/model/k8s/k8s-metrics.yaml → model/k8s/metrics.yaml b/model/k8s/k8s-metrics.yaml → model/k8s/metrics.yaml
diff --git a/model/k8s/k8s-registry.yaml → model/k8s/registry.yaml b/model/k8s/k8s-registry.yaml → model/k8s/registry.yaml
diff --git a/model/k8s/k8s-resources.yaml → model/k8s/resources.yaml b/model/k8s/k8s-resources.yaml → model/k8s/resources.yaml
diff --git a/model/kestrel/kestrel-metrics.yaml → model/kestrel/metrics.yaml b/model/kestrel/kestrel-metrics.yaml → model/kestrel/metrics.yaml
diff --git a/model/linux/linux-registry.yaml → model/linux/registry.yaml b/model/linux/linux-registry.yaml → model/linux/registry.yaml
diff --git a/model/log/log-common.yaml → model/log/common.yaml b/model/log/log-common.yaml → model/log/common.yaml
diff --git a/model/log/log-registry.yaml → model/log/registry.yaml b/model/log/log-registry.yaml → model/log/registry.yaml
diff --git a/model/messaging/messaging-common.yaml → model/messaging/common.yaml b/model/messaging/messaging-common.yaml → model/messaging/common.yaml
diff --git a/...recated/messaging-metrics-deprecated.yaml → ...saging/deprecated/metrics-deprecated.yaml b/...recated/messaging-metrics-deprecated.yaml → ...saging/deprecated/metrics-deprecated.yaml
diff --git a/...ecated/messaging-registry-deprecated.yaml → ...aging/deprecated/registry-deprecated.yaml b/...ecated/messaging-registry-deprecated.yaml → ...aging/deprecated/registry-deprecated.yaml
diff --git a/model/messaging/messaging-metrics.yaml → model/messaging/metrics.yaml b/model/messaging/messaging-metrics.yaml → model/messaging/metrics.yaml
diff --git a/model/messaging/messaging-registry.yaml → model/messaging/registry.yaml b/model/messaging/messaging-registry.yaml → model/messaging/registry.yaml
diff --git a/model/messaging/messaging-spans.yaml → model/messaging/spans.yaml b/model/messaging/messaging-spans.yaml → model/messaging/spans.yaml
diff --git a/model/network/network-common.yaml → model/network/common.yaml b/model/network/network-common.yaml → model/network/common.yaml
diff --git a/...precated/network-registry-deprecated.yaml → ...twork/deprecated/registry-deprecated.yaml b/...precated/network-registry-deprecated.yaml → ...twork/deprecated/registry-deprecated.yaml
diff --git a/model/network/network-registry.yaml → model/network/registry.yaml b/model/network/network-registry.yaml → model/network/registry.yaml
diff --git a/model/nodejs/nodejs-metrics.yaml → model/nodejs/metrics.yaml b/model/nodejs/nodejs-metrics.yaml → model/nodejs/metrics.yaml
diff --git a/model/nodejs/nodejs-registry.yaml → model/nodejs/registry.yaml b/model/nodejs/nodejs-registry.yaml → model/nodejs/registry.yaml
diff --git a/model/oci/oci-registry.yaml → model/oci/registry.yaml b/model/oci/oci-registry.yaml → model/oci/registry.yaml
diff --git a/model/opentracing/opentracing-common.yaml → model/opentracing/common.yaml b/model/opentracing/opentracing-common.yaml → model/opentracing/common.yaml
diff --git a/model/opentracing/opentracing-registry.yaml → model/opentracing/registry.yaml b/model/opentracing/opentracing-registry.yaml → model/opentracing/registry.yaml
diff --git a/model/os/os-registry.yaml → model/os/registry.yaml b/model/os/os-registry.yaml → model/os/registry.yaml
diff --git a/model/os/os-resources.yaml → model/os/resources.yaml b/model/os/os-resources.yaml → model/os/resources.yaml
diff --git a/model/otel/otel-status-common.yaml → model/otel/common.yaml b/model/otel/otel-status-common.yaml → model/otel/common.yaml
diff --git a/.../deprecated/otel-registry-deprecated.yaml → .../otel/deprecated/registry-deprecated.yaml b/.../deprecated/otel-registry-deprecated.yaml → .../otel/deprecated/registry-deprecated.yaml
diff --git a/model/otel/otel-registry.yaml → model/otel/registry.yaml b/model/otel/otel-registry.yaml → model/otel/registry.yaml
diff --git a/model/otel/otel-resources.yaml → model/otel/resources.yaml b/model/otel/otel-resources.yaml → model/otel/resources.yaml
diff --git a/model/peer/peer-common.yaml → model/peer/common.yaml b/model/peer/peer-common.yaml → model/peer/common.yaml
diff --git a/model/peer/peer-registry.yaml → model/peer/registry.yaml b/model/peer/peer-registry.yaml → model/peer/registry.yaml
diff --git a/...precated/process-registry-deprecated.yaml → ...ocess/deprecated/registry-deprecated.yaml b/...precated/process-registry-deprecated.yaml → ...ocess/deprecated/registry-deprecated.yaml
diff --git a/model/process/process-metrics.yaml → model/process/metrics.yaml b/model/process/process-metrics.yaml → model/process/metrics.yaml
diff --git a/model/process/process-registry.yaml → model/process/registry.yaml b/model/process/process-registry.yaml → model/process/registry.yaml
diff --git a/model/process/process-resources.yaml → model/process/resources.yaml b/model/process/process-resources.yaml → model/process/resources.yaml
diff --git a/model/profile/profile-common.yaml → model/profile/common.yaml b/model/profile/profile-common.yaml → model/profile/common.yaml
diff --git a/model/profile/profile-registry.yaml → model/profile/registry.yaml b/model/profile/profile-registry.yaml → model/profile/registry.yaml
diff --git a/...c/deprecated/rpc-registry-deprecated.yaml → ...l/rpc/deprecated/registry-deprecated.yaml b/...c/deprecated/rpc-registry-deprecated.yaml → ...l/rpc/deprecated/registry-deprecated.yaml
diff --git a/model/rpc/rpc-metrics.yaml → model/rpc/metrics.yaml b/model/rpc/rpc-metrics.yaml → model/rpc/metrics.yaml
diff --git a/model/rpc/rpc-registry.yaml → model/rpc/registry.yaml b/model/rpc/rpc-registry.yaml → model/rpc/registry.yaml
diff --git a/model/rpc/rpc-spans.yaml → model/rpc/spans.yaml b/model/rpc/rpc-spans.yaml → model/rpc/spans.yaml
diff --git a/model/server/server-common.yaml → model/server/common.yaml b/model/server/server-common.yaml → model/server/common.yaml
diff --git a/model/server/server-registry.yaml → model/server/registry.yaml b/model/server/server-registry.yaml → model/server/registry.yaml
diff --git a/model/service/service-registry.yaml → model/service/registry.yaml b/model/service/service-registry.yaml → model/service/registry.yaml
diff --git a/...rvice/service-resources-experimental.yaml → model/service/resources-experimental.yaml b/...rvice/service-resources-experimental.yaml → model/service/resources-experimental.yaml
diff --git a/model/service/service-resources.yaml → model/service/resources.yaml b/model/service/service-resources.yaml → model/service/resources.yaml
diff --git a/model/session/session-common.yaml → model/session/common.yaml b/model/session/session-common.yaml → model/session/common.yaml
diff --git a/model/session/session-registry.yaml → model/session/registry.yaml b/model/session/session-registry.yaml → model/session/registry.yaml
diff --git a/model/signalr/signalr-metrics.yaml → model/signalr/metrics.yaml b/model/signalr/signalr-metrics.yaml → model/signalr/metrics.yaml
diff --git a/model/signalr/signalr-registry.yaml → model/signalr/registry.yaml b/model/signalr/signalr-registry.yaml → model/signalr/registry.yaml
diff --git a/model/source/source-common.yaml → model/source/common.yaml b/model/source/source-common.yaml → model/source/common.yaml
diff --git a/model/source/source-registry.yaml → model/source/registry.yaml b/model/source/source-registry.yaml → model/source/registry.yaml
diff --git a/...eprecated/system-registry-deprecated.yaml → ...ystem/deprecated/registry-deprecated.yaml b/...eprecated/system-registry-deprecated.yaml → ...ystem/deprecated/registry-deprecated.yaml
diff --git a/model/system/system-metrics.yaml → model/system/metrics.yaml b/model/system/system-metrics.yaml → model/system/metrics.yaml
diff --git a/model/system/system-registry.yaml → model/system/registry.yaml b/model/system/system-registry.yaml → model/system/registry.yaml
diff --git a/model/telemetry/telemetry-registry.yaml → model/telemetry/registry.yaml b/model/telemetry/telemetry-registry.yaml → model/telemetry/registry.yaml
diff --git a/...try/telemetry-resources-experimental.yaml → model/telemetry/resources-experimental.yaml b/...try/telemetry-resources-experimental.yaml → model/telemetry/resources-experimental.yaml
diff --git a/model/telemetry/telemetry-resources.yaml → model/telemetry/resources.yaml b/model/telemetry/telemetry-resources.yaml → model/telemetry/resources.yaml
diff --git a/model/test/test-registry.yaml → model/test/registry.yaml b/model/test/test-registry.yaml → model/test/registry.yaml
diff --git a/model/thread/thread-common.yaml → model/thread/common.yaml b/model/thread/thread-common.yaml → model/thread/common.yaml
diff --git a/model/thread/thread-registry.yaml → model/thread/registry.yaml b/model/thread/thread-registry.yaml → model/thread/registry.yaml
diff --git a/...s/deprecated/tls-registry-deprecated.yaml → ...l/tls/deprecated/registry-deprecated.yaml b/...s/deprecated/tls-registry-deprecated.yaml → ...l/tls/deprecated/registry-deprecated.yaml
diff --git a/model/tls/tls-registry.yaml → model/tls/registry.yaml b/model/tls/tls-registry.yaml → model/tls/registry.yaml
diff --git a/model/url/url-common.yaml → model/url/common.yaml b/model/url/url-common.yaml → model/url/common.yaml
diff --git a/model/url/url-registry.yaml → model/url/registry.yaml b/model/url/url-registry.yaml → model/url/registry.yaml
diff --git a/model/user-agent/user-agent-registry.yaml → model/user-agent/registry.yaml b/model/user-agent/user-agent-registry.yaml → model/user-agent/registry.yaml
diff --git a/model/user/user-registry.yaml → model/user/registry.yaml b/model/user/user-registry.yaml → model/user/registry.yaml
diff --git a/model/v8js/v8js-metrics.yaml → model/v8js/metrics.yaml b/model/v8js/v8js-metrics.yaml → model/v8js/metrics.yaml
diff --git a/model/v8js/v8js-registry.yaml → model/v8js/registry.yaml b/model/v8js/v8js-registry.yaml → model/v8js/registry.yaml
diff --git a/model/vcs/vcs-registry.yaml → model/vcs/registry.yaml b/model/vcs/vcs-registry.yaml → model/vcs/registry.yaml
diff --git a/model/webengine/webengine-registry.yaml → model/webengine/registry.yaml b/model/webengine/webengine-registry.yaml → model/webengine/registry.yaml
diff --git a/model/webengine/webengine-resources.yaml → model/webengine/resources.yaml b/model/webengine/webengine-resources.yaml → model/webengine/resources.yaml