diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index b93c808dcd..140af28811 100644 --- 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 index cc984d2902..cbdf29dc75 100644 --- 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 index efea277ff3..b832dc4371 100644 --- 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) | -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/model/andrioid/deprecated/android-registry-deprecated.yaml b/model/andrioid/deprecated/registry-deprecated.yaml similarity index 100% rename from model/andrioid/deprecated/android-registry-deprecated.yaml rename to model/andrioid/deprecated/registry-deprecated.yaml diff --git a/model/andrioid/android-registry.yaml b/model/andrioid/registry.yaml similarity index 100% rename from model/andrioid/android-registry.yaml rename to model/andrioid/registry.yaml diff --git a/model/andrioid/android-resources.yaml b/model/andrioid/resources.yaml similarity index 100% rename from model/andrioid/android-resources.yaml rename to model/andrioid/resources.yaml diff --git a/model/artifact/artifact-registry.yaml b/model/artifact/registry.yaml similarity index 100% rename from model/artifact/artifact-registry.yaml rename to model/artifact/registry.yaml diff --git a/model/aspnetcore/aspnetcore-metrics.yaml b/model/aspnetcore/metrics.yaml similarity index 100% rename from model/aspnetcore/aspnetcore-metrics.yaml rename to model/aspnetcore/metrics.yaml diff --git a/model/aspnetcore/aspnetcore-registry.yaml b/model/aspnetcore/registry.yaml similarity index 100% rename from model/aspnetcore/aspnetcore-registry.yaml rename to model/aspnetcore/registry.yaml diff --git a/model/aws/aws-ecs-resources.yaml b/model/aws/ecs-resources.yaml similarity index 100% rename from model/aws/aws-ecs-resources.yaml rename to model/aws/ecs-resources.yaml diff --git a/model/aws/aws-eks-resources.yaml b/model/aws/eks-resources.yaml similarity index 100% rename from model/aws/aws-eks-resources.yaml rename to model/aws/eks-resources.yaml diff --git a/model/aws/aws-lambda-spans.yaml b/model/aws/lambda-spans.yaml similarity index 100% rename from model/aws/aws-lambda-spans.yaml rename to model/aws/lambda-spans.yaml diff --git a/model/aws/aws-logs-resources.yaml b/model/aws/logs-resources.yaml similarity index 100% rename from model/aws/aws-logs-resources.yaml rename to model/aws/logs-resources.yaml diff --git a/model/aws/aws-registry.yaml b/model/aws/registry.yaml similarity index 100% rename from model/aws/aws-registry.yaml rename to model/aws/registry.yaml diff --git a/model/aws/aws-sdk-spans.yml b/model/aws/sdk-spans.yml similarity index 100% rename from model/aws/aws-sdk-spans.yml rename to model/aws/sdk-spans.yml diff --git a/model/azure/azure-logs.yaml b/model/azure/logs.yaml similarity index 100% rename from model/azure/azure-logs.yaml rename to model/azure/logs.yaml diff --git a/model/azure/azure-registry.yaml b/model/azure/registry.yaml similarity index 100% rename from model/azure/azure-registry.yaml rename to model/azure/registry.yaml diff --git a/model/browser/browser-registry.yaml b/model/browser/registry.yaml similarity index 100% rename from model/browser/browser-registry.yaml rename to model/browser/registry.yaml diff --git a/model/browser/browser-resources.yaml b/model/browser/resources.yaml similarity index 100% rename from model/browser/browser-resources.yaml rename to model/browser/resources.yaml diff --git a/model/cicd/cicd-registry.yaml b/model/cicd/registry.yaml similarity index 100% rename from model/cicd/cicd-registry.yaml rename to model/cicd/registry.yaml diff --git a/model/client/client-common.yaml b/model/client/common.yaml similarity index 100% rename from model/client/client-common.yaml rename to model/client/common.yaml diff --git a/model/client/client-registry.yaml b/model/client/registry.yaml similarity index 100% rename from model/client/client-registry.yaml rename to model/client/registry.yaml diff --git a/model/cloud/cloud-registry.yaml b/model/cloud/registry.yaml similarity index 100% rename from model/cloud/cloud-registry.yaml rename to model/cloud/registry.yaml diff --git a/model/cloud/cloud-resources.yaml b/model/cloud/resources.yaml similarity index 100% rename from model/cloud/cloud-resources.yaml rename to model/cloud/resources.yaml diff --git a/model/cloudevents/cloudevents-registry.yaml b/model/cloudevents/registry.yaml similarity index 100% rename from model/cloudevents/cloudevents-registry.yaml rename to model/cloudevents/registry.yaml diff --git a/model/cloudevents/cloudevents-spans.yaml b/model/cloudevents/spans.yaml similarity index 100% rename from model/cloudevents/cloudevents-spans.yaml rename to model/cloudevents/spans.yaml diff --git a/model/code/code-common.yaml b/model/code/common.yaml similarity index 100% rename from model/code/code-common.yaml rename to model/code/common.yaml diff --git a/model/code/code-registry.yaml b/model/code/registry.yaml similarity index 100% rename from model/code/code-registry.yaml rename to model/code/registry.yaml diff --git a/model/container/deprecated/container-registry-deprecated.yaml b/model/container/deprecated/registry-deprecated.yaml similarity index 100% rename from model/container/deprecated/container-registry-deprecated.yaml rename to model/container/deprecated/registry-deprecated.yaml diff --git a/model/container/container-metrics.yaml b/model/container/metrics.yaml similarity index 100% rename from model/container/container-metrics.yaml rename to model/container/metrics.yaml diff --git a/model/container/container-registry.yaml b/model/container/registry.yaml similarity index 100% rename from model/container/container-registry.yaml rename to model/container/registry.yaml diff --git a/model/container/container-resources.yaml b/model/container/resources.yaml similarity index 100% rename from model/container/container-resources.yaml rename to model/container/resources.yaml diff --git a/model/cpu/cpu-registry.yaml b/model/cpu/registry.yaml similarity index 100% rename from model/cpu/cpu-registry.yaml rename to model/cpu/registry.yaml diff --git a/model/database/database-common.yaml b/model/database/common.yaml similarity index 100% rename from model/database/database-common.yaml rename to model/database/common.yaml diff --git a/model/database/deprecated/database-metrics-deprecated.yaml b/model/database/deprecated/metrics-deprecated.yaml similarity index 100% rename from model/database/deprecated/database-metrics-deprecated.yaml rename to model/database/deprecated/metrics-deprecated.yaml diff --git a/model/database/deprecated/database-registry-deprecated.yaml b/model/database/deprecated/registry-deprecated.yaml similarity index 100% rename from model/database/deprecated/database-registry-deprecated.yaml rename to model/database/deprecated/registry-deprecated.yaml diff --git a/model/database/database-metrics.yaml b/model/database/metrics.yaml similarity index 100% rename from model/database/database-metrics.yaml rename to model/database/metrics.yaml diff --git a/model/database/database-registry.yaml b/model/database/registry.yaml similarity index 100% rename from model/database/database-registry.yaml rename to model/database/registry.yaml diff --git a/model/database/database-spans.yaml b/model/database/spans.yaml similarity index 100% rename from model/database/database-spans.yaml rename to model/database/spans.yaml diff --git a/model/deployment/deprecated/deployment-registry-deprecated.yaml b/model/deployment/deprecated/registry-deprecated.yaml similarity index 100% rename from model/deployment/deprecated/deployment-registry-deprecated.yaml rename to model/deployment/deprecated/registry-deprecated.yaml diff --git a/model/deployment/deployment-registry.yaml b/model/deployment/registry.yaml similarity index 100% rename from model/deployment/deployment-registry.yaml rename to model/deployment/registry.yaml diff --git a/model/deployment/deployment-resources.yaml b/model/deployment/resources.yaml similarity index 100% rename from model/deployment/deployment-resources.yaml rename to model/deployment/resources.yaml diff --git a/model/destination/destination-common.yaml b/model/destination/common.yaml similarity index 100% rename from model/destination/destination-common.yaml rename to model/destination/common.yaml diff --git a/model/destination/destination-registry.yaml b/model/destination/registry.yaml similarity index 100% rename from model/destination/destination-registry.yaml rename to model/destination/registry.yaml diff --git a/model/device/device-events.yaml b/model/device/events.yaml similarity index 100% rename from model/device/device-events.yaml rename to model/device/events.yaml diff --git a/model/device/device-registry.yaml b/model/device/registry.yaml similarity index 100% rename from model/device/device-registry.yaml rename to model/device/registry.yaml diff --git a/model/device/device-resources.yaml b/model/device/resources.yaml similarity index 100% rename from model/device/device-resources.yaml rename to model/device/resources.yaml diff --git a/model/disk/disk-registry.yaml b/model/disk/registry.yaml similarity index 100% rename from model/disk/disk-registry.yaml rename to model/disk/registry.yaml diff --git a/model/dns/dns-metrics.yaml b/model/dns/metrics.yaml similarity index 100% rename from model/dns/dns-metrics.yaml rename to model/dns/metrics.yaml diff --git a/model/dns/dns-registry.yaml b/model/dns/registry.yaml similarity index 100% rename from model/dns/dns-registry.yaml rename to model/dns/registry.yaml diff --git a/model/dotnet/dotnet-registry.yaml b/model/dotnet/registry.yaml similarity index 100% rename from model/dotnet/dotnet-registry.yaml rename to model/dotnet/registry.yaml diff --git a/model/dotnet/dotnet-runtime-metrics.yaml b/model/dotnet/runtime-metrics.yaml similarity index 100% rename from model/dotnet/dotnet-runtime-metrics.yaml rename to model/dotnet/runtime-metrics.yaml diff --git a/model/enduser/deprecated/enduser-common.yaml b/model/enduser/deprecated/common.yaml similarity index 100% rename from model/enduser/deprecated/enduser-common.yaml rename to model/enduser/deprecated/common.yaml diff --git a/model/enduser/deprecated/enduser-registry-deprecated.yaml b/model/enduser/deprecated/registry-deprecated.yaml similarity index 100% rename from model/enduser/deprecated/enduser-registry-deprecated.yaml rename to model/enduser/deprecated/registry-deprecated.yaml diff --git a/model/error/error-registry.yaml b/model/error/registry.yaml similarity index 100% rename from model/error/error-registry.yaml rename to model/error/registry.yaml diff --git a/model/event/event-common.yaml b/model/event/common.yaml similarity index 100% rename from model/event/event-common.yaml rename to model/event/common.yaml diff --git a/model/event/event-registry.yaml b/model/event/registry.yaml similarity index 100% rename from model/event/event-registry.yaml rename to model/event/registry.yaml diff --git a/model/exceptions/exception-events.yaml b/model/exceptions/events.yaml similarity index 100% rename from model/exceptions/exception-events.yaml rename to model/exceptions/events.yaml diff --git a/model/exceptions/exception-logs.yaml b/model/exceptions/logs.yaml similarity index 100% rename from model/exceptions/exception-logs.yaml rename to model/exceptions/logs.yaml diff --git a/model/exceptions/exception-registry.yaml b/model/exceptions/registry.yaml similarity index 100% rename from model/exceptions/exception-registry.yaml rename to model/exceptions/registry.yaml diff --git a/model/faas/faas-common.yaml b/model/faas/common.yaml similarity index 100% rename from model/faas/faas-common.yaml rename to model/faas/common.yaml diff --git a/model/faas/faas-metrics.yaml b/model/faas/metrics.yaml similarity index 100% rename from model/faas/faas-metrics.yaml rename to model/faas/metrics.yaml diff --git a/model/faas/faas-registry.yaml b/model/faas/registry.yaml similarity index 100% rename from model/faas/faas-registry.yaml rename to model/faas/registry.yaml diff --git a/model/faas/faas-resources.yaml b/model/faas/resources.yaml similarity index 100% rename from model/faas/faas-resources.yaml rename to model/faas/resources.yaml diff --git a/model/faas/faas-spans.yaml b/model/faas/spans.yaml similarity index 100% rename from model/faas/faas-spans.yaml rename to model/faas/spans.yaml diff --git a/model/feature-flag/feature-flag-events.yaml b/model/feature-flag/events.yaml similarity index 100% rename from model/feature-flag/feature-flag-events.yaml rename to model/feature-flag/events.yaml diff --git a/model/feature-flag/feature-flag-logs.yaml b/model/feature-flag/logs.yaml similarity index 100% rename from model/feature-flag/feature-flag-logs.yaml rename to model/feature-flag/logs.yaml diff --git a/model/feature-flag/feature-flag-registry.yaml b/model/feature-flag/registry.yaml similarity index 100% rename from model/feature-flag/feature-flag-registry.yaml rename to model/feature-flag/registry.yaml diff --git a/model/file/file-registry.yaml b/model/file/registry.yaml similarity index 100% rename from model/file/file-registry.yaml rename to model/file/registry.yaml diff --git a/model/gcp/gcp-cloud-run-resources.yaml b/model/gcp/cloud-run-resources.yaml similarity index 100% rename from model/gcp/gcp-cloud-run-resources.yaml rename to model/gcp/cloud-run-resources.yaml diff --git a/model/gcp/gcp-client-common.yml b/model/gcp/common.yml similarity index 100% rename from model/gcp/gcp-client-common.yml rename to model/gcp/common.yml diff --git a/model/gcp/gcp-gce-resources.yaml b/model/gcp/gce-resources.yaml similarity index 100% rename from model/gcp/gcp-gce-resources.yaml rename to model/gcp/gce-resources.yaml diff --git a/model/gcp/gcp-registry.yaml b/model/gcp/registry.yaml similarity index 100% rename from model/gcp/gcp-registry.yaml rename to model/gcp/registry.yaml diff --git a/model/gen-ai/deprecated/gen-ai-registry-deprecated.yaml b/model/gen-ai/deprecated/registry-deprecated.yaml similarity index 100% rename from model/gen-ai/deprecated/gen-ai-registry-deprecated.yaml rename to model/gen-ai/deprecated/registry-deprecated.yaml diff --git a/model/gen-ai/gen-ai-metrics.yaml b/model/gen-ai/metrics.yaml similarity index 100% rename from model/gen-ai/gen-ai-metrics.yaml rename to model/gen-ai/metrics.yaml diff --git a/model/gen-ai/gen-ai-registry.yaml b/model/gen-ai/registry.yaml similarity index 100% rename from model/gen-ai/gen-ai-registry.yaml rename to model/gen-ai/registry.yaml diff --git a/model/gen-ai/gen-ai-spans.yaml b/model/gen-ai/spans.yaml similarity index 100% rename from model/gen-ai/gen-ai-spans.yaml rename to model/gen-ai/spans.yaml diff --git a/model/go/go-metrics.yaml b/model/go/metrics.yaml similarity index 100% rename from model/go/go-metrics.yaml rename to model/go/metrics.yaml diff --git a/model/go/go-registry.yaml b/model/go/registry.yaml similarity index 100% rename from model/go/go-registry.yaml rename to model/go/registry.yaml diff --git a/model/graphgl/graphql-registry.yaml b/model/graphgl/registry.yaml similarity index 100% rename from model/graphgl/graphql-registry.yaml rename to model/graphgl/registry.yaml diff --git a/model/graphgl/graphql-spans.yml b/model/graphgl/spans.yml similarity index 100% rename from model/graphgl/graphql-spans.yml rename to model/graphgl/spans.yml diff --git a/model/hardware/hardware-common-metrics.yaml b/model/hardware/common-metrics.yaml similarity index 100% rename from model/hardware/hardware-common-metrics.yaml rename to model/hardware/common-metrics.yaml diff --git a/model/hardware/hardware-common.yaml b/model/hardware/common.yaml similarity index 100% rename from model/hardware/hardware-common.yaml rename to model/hardware/common.yaml diff --git a/model/hardware/hardware-registry.yaml b/model/hardware/registry.yaml similarity index 100% rename from model/hardware/hardware-registry.yaml rename to model/hardware/registry.yaml diff --git a/model/heroku/heroku-registry.yaml b/model/heroku/registry.yaml similarity index 100% rename from model/heroku/heroku-registry.yaml rename to model/heroku/registry.yaml diff --git a/model/heroku/heroku-resources.yaml b/model/heroku/resources.yaml similarity index 100% rename from model/heroku/heroku-resources.yaml rename to model/heroku/resources.yaml diff --git a/model/host/host-registry.yaml b/model/host/registry.yaml similarity index 100% rename from model/host/host-registry.yaml rename to model/host/registry.yaml diff --git a/model/host/host-resources.yaml b/model/host/resources.yaml similarity index 100% rename from model/host/host-resources.yaml rename to model/host/resources.yaml diff --git a/model/http/http-common.yaml b/model/http/common.yaml similarity index 100% rename from model/http/http-common.yaml rename to model/http/common.yaml diff --git a/model/http/deprecated/http-registry-deprecated.yaml b/model/http/deprecated/registry-deprecated.yaml similarity index 100% rename from model/http/deprecated/http-registry-deprecated.yaml rename to model/http/deprecated/registry-deprecated.yaml diff --git a/model/http/http-metrics.yaml b/model/http/metrics.yaml similarity index 100% rename from model/http/http-metrics.yaml rename to model/http/metrics.yaml diff --git a/model/http/http-registry.yaml b/model/http/registry.yaml similarity index 100% rename from model/http/http-registry.yaml rename to model/http/registry.yaml diff --git a/model/http/http-spans.yaml b/model/http/spans.yaml similarity index 100% rename from model/http/http-spans.yaml rename to model/http/spans.yaml diff --git a/model/ios/deprecated/ios-registry-deprecated.yaml b/model/ios/deprecated/registry-deprecated.yaml similarity index 100% rename from model/ios/deprecated/ios-registry-deprecated.yaml rename to model/ios/deprecated/registry-deprecated.yaml diff --git a/model/jvm/deprecated/jvm-metrics-deprecated.yaml b/model/jvm/deprecated/metrics-deprecated.yaml similarity index 100% rename from model/jvm/deprecated/jvm-metrics-deprecated.yaml rename to model/jvm/deprecated/metrics-deprecated.yaml diff --git a/model/jvm/jvm-metrics-experimental.yaml b/model/jvm/metrics-experimental.yaml similarity index 100% rename from model/jvm/jvm-metrics-experimental.yaml rename to model/jvm/metrics-experimental.yaml diff --git a/model/jvm/jvm-metrics.yaml b/model/jvm/metrics.yaml similarity index 100% rename from model/jvm/jvm-metrics.yaml rename to model/jvm/metrics.yaml diff --git a/model/jvm/jvm-registry.yaml b/model/jvm/registry.yaml similarity index 100% rename from model/jvm/jvm-registry.yaml rename to model/jvm/registry.yaml diff --git a/model/k8s/deprecated/k8s-registry-deprecated.yaml b/model/k8s/deprecated/registry-deprecated.yaml similarity index 100% rename from model/k8s/deprecated/k8s-registry-deprecated.yaml rename to model/k8s/deprecated/registry-deprecated.yaml diff --git a/model/k8s/k8s-metrics.yaml b/model/k8s/metrics.yaml similarity index 100% rename from model/k8s/k8s-metrics.yaml rename to model/k8s/metrics.yaml diff --git a/model/k8s/k8s-registry.yaml b/model/k8s/registry.yaml similarity index 100% rename from model/k8s/k8s-registry.yaml rename to model/k8s/registry.yaml diff --git a/model/k8s/k8s-resources.yaml b/model/k8s/resources.yaml similarity index 100% rename from model/k8s/k8s-resources.yaml rename to model/k8s/resources.yaml diff --git a/model/kestrel/kestrel-metrics.yaml b/model/kestrel/metrics.yaml similarity index 100% rename from model/kestrel/kestrel-metrics.yaml rename to model/kestrel/metrics.yaml diff --git a/model/linux/linux-registry.yaml b/model/linux/registry.yaml similarity index 100% rename from model/linux/linux-registry.yaml rename to model/linux/registry.yaml diff --git a/model/log/log-common.yaml b/model/log/common.yaml similarity index 100% rename from model/log/log-common.yaml rename to model/log/common.yaml diff --git a/model/log/log-registry.yaml b/model/log/registry.yaml similarity index 100% rename from model/log/log-registry.yaml rename to model/log/registry.yaml diff --git a/model/messaging/messaging-common.yaml b/model/messaging/common.yaml similarity index 100% rename from model/messaging/messaging-common.yaml rename to model/messaging/common.yaml diff --git a/model/messaging/deprecated/messaging-metrics-deprecated.yaml b/model/messaging/deprecated/metrics-deprecated.yaml similarity index 100% rename from model/messaging/deprecated/messaging-metrics-deprecated.yaml rename to model/messaging/deprecated/metrics-deprecated.yaml diff --git a/model/messaging/deprecated/messaging-registry-deprecated.yaml b/model/messaging/deprecated/registry-deprecated.yaml similarity index 100% rename from model/messaging/deprecated/messaging-registry-deprecated.yaml rename to model/messaging/deprecated/registry-deprecated.yaml diff --git a/model/messaging/messaging-metrics.yaml b/model/messaging/metrics.yaml similarity index 100% rename from model/messaging/messaging-metrics.yaml rename to model/messaging/metrics.yaml diff --git a/model/messaging/messaging-registry.yaml b/model/messaging/registry.yaml similarity index 100% rename from model/messaging/messaging-registry.yaml rename to model/messaging/registry.yaml diff --git a/model/messaging/messaging-spans.yaml b/model/messaging/spans.yaml similarity index 100% rename from model/messaging/messaging-spans.yaml rename to model/messaging/spans.yaml diff --git a/model/network/network-common.yaml b/model/network/common.yaml similarity index 100% rename from model/network/network-common.yaml rename to model/network/common.yaml diff --git a/model/network/deprecated/network-registry-deprecated.yaml b/model/network/deprecated/registry-deprecated.yaml similarity index 100% rename from model/network/deprecated/network-registry-deprecated.yaml rename to model/network/deprecated/registry-deprecated.yaml diff --git a/model/network/network-registry.yaml b/model/network/registry.yaml similarity index 100% rename from model/network/network-registry.yaml rename to model/network/registry.yaml diff --git a/model/nodejs/nodejs-metrics.yaml b/model/nodejs/metrics.yaml similarity index 100% rename from model/nodejs/nodejs-metrics.yaml rename to model/nodejs/metrics.yaml diff --git a/model/nodejs/nodejs-registry.yaml b/model/nodejs/registry.yaml similarity index 100% rename from model/nodejs/nodejs-registry.yaml rename to model/nodejs/registry.yaml diff --git a/model/oci/oci-registry.yaml b/model/oci/registry.yaml similarity index 100% rename from model/oci/oci-registry.yaml rename to model/oci/registry.yaml diff --git a/model/opentracing/opentracing-common.yaml b/model/opentracing/common.yaml similarity index 100% rename from model/opentracing/opentracing-common.yaml rename to model/opentracing/common.yaml diff --git a/model/opentracing/opentracing-registry.yaml b/model/opentracing/registry.yaml similarity index 100% rename from model/opentracing/opentracing-registry.yaml rename to model/opentracing/registry.yaml diff --git a/model/os/os-registry.yaml b/model/os/registry.yaml similarity index 100% rename from model/os/os-registry.yaml rename to model/os/registry.yaml diff --git a/model/os/os-resources.yaml b/model/os/resources.yaml similarity index 100% rename from model/os/os-resources.yaml rename to model/os/resources.yaml diff --git a/model/otel/otel-status-common.yaml b/model/otel/common.yaml similarity index 100% rename from model/otel/otel-status-common.yaml rename to model/otel/common.yaml diff --git a/model/otel/deprecated/otel-registry-deprecated.yaml b/model/otel/deprecated/registry-deprecated.yaml similarity index 100% rename from model/otel/deprecated/otel-registry-deprecated.yaml rename to model/otel/deprecated/registry-deprecated.yaml diff --git a/model/otel/otel-registry.yaml b/model/otel/registry.yaml similarity index 100% rename from model/otel/otel-registry.yaml rename to model/otel/registry.yaml diff --git a/model/otel/otel-resources.yaml b/model/otel/resources.yaml similarity index 100% rename from model/otel/otel-resources.yaml rename to model/otel/resources.yaml diff --git a/model/peer/peer-common.yaml b/model/peer/common.yaml similarity index 100% rename from model/peer/peer-common.yaml rename to model/peer/common.yaml diff --git a/model/peer/peer-registry.yaml b/model/peer/registry.yaml similarity index 100% rename from model/peer/peer-registry.yaml rename to model/peer/registry.yaml diff --git a/model/process/deprecated/process-registry-deprecated.yaml b/model/process/deprecated/registry-deprecated.yaml similarity index 100% rename from model/process/deprecated/process-registry-deprecated.yaml rename to model/process/deprecated/registry-deprecated.yaml diff --git a/model/process/process-metrics.yaml b/model/process/metrics.yaml similarity index 100% rename from model/process/process-metrics.yaml rename to model/process/metrics.yaml diff --git a/model/process/process-registry.yaml b/model/process/registry.yaml similarity index 100% rename from model/process/process-registry.yaml rename to model/process/registry.yaml diff --git a/model/process/process-resources.yaml b/model/process/resources.yaml similarity index 100% rename from model/process/process-resources.yaml rename to model/process/resources.yaml diff --git a/model/profile/profile-common.yaml b/model/profile/common.yaml similarity index 100% rename from model/profile/profile-common.yaml rename to model/profile/common.yaml diff --git a/model/profile/profile-registry.yaml b/model/profile/registry.yaml similarity index 100% rename from model/profile/profile-registry.yaml rename to model/profile/registry.yaml diff --git a/model/rpc/deprecated/rpc-registry-deprecated.yaml b/model/rpc/deprecated/registry-deprecated.yaml similarity index 100% rename from model/rpc/deprecated/rpc-registry-deprecated.yaml rename to model/rpc/deprecated/registry-deprecated.yaml diff --git a/model/rpc/rpc-metrics.yaml b/model/rpc/metrics.yaml similarity index 100% rename from model/rpc/rpc-metrics.yaml rename to model/rpc/metrics.yaml diff --git a/model/rpc/rpc-registry.yaml b/model/rpc/registry.yaml similarity index 100% rename from model/rpc/rpc-registry.yaml rename to model/rpc/registry.yaml diff --git a/model/rpc/rpc-spans.yaml b/model/rpc/spans.yaml similarity index 100% rename from model/rpc/rpc-spans.yaml rename to model/rpc/spans.yaml diff --git a/model/server/server-common.yaml b/model/server/common.yaml similarity index 100% rename from model/server/server-common.yaml rename to model/server/common.yaml diff --git a/model/server/server-registry.yaml b/model/server/registry.yaml similarity index 100% rename from model/server/server-registry.yaml rename to model/server/registry.yaml diff --git a/model/service/service-registry.yaml b/model/service/registry.yaml similarity index 100% rename from model/service/service-registry.yaml rename to model/service/registry.yaml diff --git a/model/service/service-resources-experimental.yaml b/model/service/resources-experimental.yaml similarity index 100% rename from model/service/service-resources-experimental.yaml rename to model/service/resources-experimental.yaml diff --git a/model/service/service-resources.yaml b/model/service/resources.yaml similarity index 100% rename from model/service/service-resources.yaml rename to model/service/resources.yaml diff --git a/model/session/session-common.yaml b/model/session/common.yaml similarity index 100% rename from model/session/session-common.yaml rename to model/session/common.yaml diff --git a/model/session/session-registry.yaml b/model/session/registry.yaml similarity index 100% rename from model/session/session-registry.yaml rename to model/session/registry.yaml diff --git a/model/signalr/signalr-metrics.yaml b/model/signalr/metrics.yaml similarity index 100% rename from model/signalr/signalr-metrics.yaml rename to model/signalr/metrics.yaml diff --git a/model/signalr/signalr-registry.yaml b/model/signalr/registry.yaml similarity index 100% rename from model/signalr/signalr-registry.yaml rename to model/signalr/registry.yaml diff --git a/model/source/source-common.yaml b/model/source/common.yaml similarity index 100% rename from model/source/source-common.yaml rename to model/source/common.yaml diff --git a/model/source/source-registry.yaml b/model/source/registry.yaml similarity index 100% rename from model/source/source-registry.yaml rename to model/source/registry.yaml diff --git a/model/system/deprecated/system-registry-deprecated.yaml b/model/system/deprecated/registry-deprecated.yaml similarity index 100% rename from model/system/deprecated/system-registry-deprecated.yaml rename to model/system/deprecated/registry-deprecated.yaml diff --git a/model/system/system-metrics.yaml b/model/system/metrics.yaml similarity index 100% rename from model/system/system-metrics.yaml rename to model/system/metrics.yaml diff --git a/model/system/system-registry.yaml b/model/system/registry.yaml similarity index 100% rename from model/system/system-registry.yaml rename to model/system/registry.yaml diff --git a/model/telemetry/telemetry-registry.yaml b/model/telemetry/registry.yaml similarity index 100% rename from model/telemetry/telemetry-registry.yaml rename to model/telemetry/registry.yaml diff --git a/model/telemetry/telemetry-resources-experimental.yaml b/model/telemetry/resources-experimental.yaml similarity index 100% rename from model/telemetry/telemetry-resources-experimental.yaml rename to model/telemetry/resources-experimental.yaml diff --git a/model/telemetry/telemetry-resources.yaml b/model/telemetry/resources.yaml similarity index 100% rename from model/telemetry/telemetry-resources.yaml rename to model/telemetry/resources.yaml diff --git a/model/test/test-registry.yaml b/model/test/registry.yaml similarity index 100% rename from model/test/test-registry.yaml rename to model/test/registry.yaml diff --git a/model/thread/thread-common.yaml b/model/thread/common.yaml similarity index 100% rename from model/thread/thread-common.yaml rename to model/thread/common.yaml diff --git a/model/thread/thread-registry.yaml b/model/thread/registry.yaml similarity index 100% rename from model/thread/thread-registry.yaml rename to model/thread/registry.yaml diff --git a/model/tls/deprecated/tls-registry-deprecated.yaml b/model/tls/deprecated/registry-deprecated.yaml similarity index 100% rename from model/tls/deprecated/tls-registry-deprecated.yaml rename to model/tls/deprecated/registry-deprecated.yaml diff --git a/model/tls/tls-registry.yaml b/model/tls/registry.yaml similarity index 100% rename from model/tls/tls-registry.yaml rename to model/tls/registry.yaml diff --git a/model/url/url-common.yaml b/model/url/common.yaml similarity index 100% rename from model/url/url-common.yaml rename to model/url/common.yaml diff --git a/model/url/url-registry.yaml b/model/url/registry.yaml similarity index 100% rename from model/url/url-registry.yaml rename to model/url/registry.yaml diff --git a/model/user-agent/user-agent-registry.yaml b/model/user-agent/registry.yaml similarity index 100% rename from model/user-agent/user-agent-registry.yaml rename to model/user-agent/registry.yaml diff --git a/model/user/user-registry.yaml b/model/user/registry.yaml similarity index 100% rename from model/user/user-registry.yaml rename to model/user/registry.yaml diff --git a/model/v8js/v8js-metrics.yaml b/model/v8js/metrics.yaml similarity index 100% rename from model/v8js/v8js-metrics.yaml rename to model/v8js/metrics.yaml diff --git a/model/v8js/v8js-registry.yaml b/model/v8js/registry.yaml similarity index 100% rename from model/v8js/v8js-registry.yaml rename to model/v8js/registry.yaml diff --git a/model/vcs/vcs-registry.yaml b/model/vcs/registry.yaml similarity index 100% rename from model/vcs/vcs-registry.yaml rename to model/vcs/registry.yaml diff --git a/model/webengine/webengine-registry.yaml b/model/webengine/registry.yaml similarity index 100% rename from model/webengine/webengine-registry.yaml rename to model/webengine/registry.yaml diff --git a/model/webengine/webengine-resources.yaml b/model/webengine/resources.yaml similarity index 100% rename from model/webengine/webengine-resources.yaml rename to model/webengine/resources.yaml