From 39759fd4dc261cd055aaa4a08e59679e1a491365 Mon Sep 17 00:00:00 2001 From: Liudmila Molkova Date: Sun, 18 Aug 2024 13:01:12 -0700 Subject: [PATCH 01/14] Group yaml files by domain instead of signal --- CONTRIBUTING.md | 34 +++++++++++++++++++ .../lambda.yaml => aws/aws-lambda-spans.yaml} | 0 .../aws-sdk.yml => aws/aws-sdk-spans.yml} | 0 .../azure.yaml => azure/azure-logs.yaml} | 0 .../cloudevents-spans.yaml} | 0 .../container-metrics.yaml} | 0 .../database-common.yaml} | 0 .../database-metrics-deprecated.yaml} | 0 .../database-metrics.yaml | 0 .../database-spans.yaml} | 0 .../dns.yaml => dns/dns-metrics.yaml} | 0 .../dotnet-aspnetcore-metrics.yaml} | 0 .../dotnet-kestrel-metrics.yaml} | 0 .../dotnet-runtime-metrics.yaml} | 0 .../dotnet-signalr-metrics.yaml} | 0 .../exception-events.yaml} | 0 .../exception-logs.yaml} | 0 model/{ => faas}/faas-common.yaml | 0 model/{metrics => faas}/faas-metrics.yaml | 0 .../{trace/faas.yaml => faas/faas-spans.yaml} | 0 .../feature-flag-events.yaml} | 0 .../feature-flag-logs.yaml} | 0 .../gcp-client-common.yml} | 0 .../gen-ai-metrics.yaml} | 0 .../gen-ai.yaml => gen-ai/gen-ai-spans.yaml} | 0 model/{metrics => go}/go-metrics.yaml | 0 .../graphql.yml => graphgq/graphql-spans.yml} | 0 .../hardware-common-metrics.yaml} | 0 model/{ => hardware}/hardware-common.yaml | 0 model/{ => http}/http-common.yaml | 0 .../http.yaml => http/http-metrics.yaml} | 0 .../{trace/http.yaml => http/http-spans.yaml} | 0 model/{metrics => js}/nodejs-metrics.yaml | 0 model/{metrics => js}/v8js-metrics.yaml | 0 .../jvm-metrics-deprecated.yaml} | 0 .../jvm-metrics-experimental.yaml | 0 model/{metrics => jvm}/jvm-metrics.yaml | 0 .../k8s.yaml => k8s/k8s-metrics.yaml} | 0 model/logs/general.yaml | 10 ------ model/logs/{media.yaml => logs.yaml} | 10 ++++++ model/{ => messaging}/messaging-common.yaml | 0 .../messaging-metrics-deprecated.yaml} | 0 .../messaging-metrics.yaml | 0 .../messaging-spans.yaml} | 0 model/{logs => mobile}/mobile-events.yaml | 0 .../opentracing-common.yaml} | 2 +- .../otel-exporter-common.yaml} | 2 +- .../{metrics => process}/process-metrics.yaml | 0 model/{metrics => rpc}/rpc-metrics.yaml | 0 model/{trace/rpc.yaml => rpc/rpc-spans.yaml} | 0 model/{metrics => system}/system-metrics.yaml | 0 51 files changed, 46 insertions(+), 12 deletions(-) rename model/{trace/aws/lambda.yaml => aws/aws-lambda-spans.yaml} (100%) rename model/{trace/instrumentation/aws-sdk.yml => aws/aws-sdk-spans.yml} (100%) rename model/{logs/azure.yaml => azure/azure-logs.yaml} (100%) rename model/{trace/cloudevents.yaml => cloudevents/cloudevents-spans.yaml} (100%) rename model/{metrics/container.yaml => container/container-metrics.yaml} (100%) rename model/{db-common.yaml => database/database-common.yaml} (100%) rename model/{metrics/deprecated/database.yaml => database/database-metrics-deprecated.yaml} (100%) rename model/{metrics => database}/database-metrics.yaml (100%) rename model/{trace/database.yaml => database/database-spans.yaml} (100%) rename model/{metrics/dns.yaml => dns/dns-metrics.yaml} (100%) rename model/{metrics/dotnet/dotnet-aspnetcore.yaml => dotnet/dotnet-aspnetcore-metrics.yaml} (100%) rename model/{metrics/dotnet/dotnet-kestrel.yaml => dotnet/dotnet-kestrel-metrics.yaml} (100%) rename model/{metrics/dotnet-metrics.yaml => dotnet/dotnet-runtime-metrics.yaml} (100%) rename model/{metrics/dotnet/dotnet-signalr.yaml => dotnet/dotnet-signalr-metrics.yaml} (100%) rename model/{trace/trace-exception.yaml => exceptions/exception-events.yaml} (100%) rename model/{logs/log-exception.yaml => exceptions/exception-logs.yaml} (100%) rename model/{ => faas}/faas-common.yaml (100%) rename model/{metrics => faas}/faas-metrics.yaml (100%) rename model/{trace/faas.yaml => faas/faas-spans.yaml} (100%) rename model/{trace/feature-flag.yaml => feature-flag/feature-flag-events.yaml} (100%) rename model/{logs/log-feature_flag.yaml => feature-flag/feature-flag-logs.yaml} (100%) rename model/{trace/instrumentation/gcp-client.yml => gcp/gcp-client-common.yml} (100%) rename model/{metrics/gen-ai.yaml => gen-ai/gen-ai-metrics.yaml} (100%) rename model/{trace/gen-ai.yaml => gen-ai/gen-ai-spans.yaml} (100%) rename model/{metrics => go}/go-metrics.yaml (100%) rename model/{trace/instrumentation/graphql.yml => graphgq/graphql-spans.yml} (100%) rename model/{metrics/hardware/common.yaml => hardware/hardware-common-metrics.yaml} (100%) rename model/{ => hardware}/hardware-common.yaml (100%) rename model/{ => http}/http-common.yaml (100%) rename model/{metrics/http.yaml => http/http-metrics.yaml} (100%) rename model/{trace/http.yaml => http/http-spans.yaml} (100%) rename model/{metrics => js}/nodejs-metrics.yaml (100%) rename model/{metrics => js}/v8js-metrics.yaml (100%) rename model/{metrics/deprecated/jvm-metrics.yaml => jvm/jvm-metrics-deprecated.yaml} (100%) rename model/{metrics => jvm}/jvm-metrics-experimental.yaml (100%) rename model/{metrics => jvm}/jvm-metrics.yaml (100%) rename model/{metrics/k8s.yaml => k8s/k8s-metrics.yaml} (100%) delete mode 100644 model/logs/general.yaml rename model/logs/{media.yaml => logs.yaml} (63%) rename model/{ => messaging}/messaging-common.yaml (100%) rename model/{metrics/deprecated/messaging-metrics.yaml => messaging/messaging-metrics-deprecated.yaml} (100%) rename model/{metrics => messaging}/messaging-metrics.yaml (100%) rename model/{trace/messaging.yaml => messaging/messaging-spans.yaml} (100%) rename model/{logs => mobile}/mobile-events.yaml (100%) rename model/{trace/compatibility.yaml => opentracing/opentracing-common.yaml} (91%) rename model/{trace/exporter/exporter.yaml => otel/otel-exporter-common.yaml} (91%) rename model/{metrics => process}/process-metrics.yaml (100%) rename model/{metrics => rpc}/rpc-metrics.yaml (100%) rename model/{trace/rpc.yaml => rpc/rpc-spans.yaml} (100%) rename model/{metrics => system}/system-metrics.yaml (100%) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7a3637ee9a..2cc55a5399 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -93,6 +93,40 @@ Refer to the [Semantic Convention YAML Language](https://github.com/open-telemetry/build-tools/blob/v0.25.0/semantic-conventions/syntax.md) to learn how to make changes to the YAML files. +#### Code structure + +The YAML (model definition) and Markdown (documentation) files are organized in the following way: + +``` +├── docs +│ ├── attribute_registry +│ ├── {domain} +│ │ ├── README.md +│ │ ├── ....md +├── model +│ ├── {domain} +│ │ ├── {domain}-events.yaml +│ │ ├── {domain}-metrics.yaml +│ │ ├── {domain}-resources.yaml +│ │ ├── {domain}-spans.yaml +│ ├── registry +│ │ ├── {domain}.yaml +``` + +All attributes must be defined in the domain-specific file under `/model/registry`. +Corresponding markdown files are auto-generated (see [Update the markdown files](#2-update-the-markdown-files)) +in `/docs/attribute_registry` folder. + +Semantic conventions definitions for domain-specific signals should be placed under +`/model/{domain}` and should follow `{domain}-{signal}.yaml` pattern. For example, +HTTP spans are defined in `model/http/http-spans.yaml`. + +Domain-specific 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. + + + #### Schema files When making changes to existing semantic conventions (attributes, metrics, etc) diff --git a/model/trace/aws/lambda.yaml b/model/aws/aws-lambda-spans.yaml similarity index 100% rename from model/trace/aws/lambda.yaml rename to model/aws/aws-lambda-spans.yaml diff --git a/model/trace/instrumentation/aws-sdk.yml b/model/aws/aws-sdk-spans.yml similarity index 100% rename from model/trace/instrumentation/aws-sdk.yml rename to model/aws/aws-sdk-spans.yml diff --git a/model/logs/azure.yaml b/model/azure/azure-logs.yaml similarity index 100% rename from model/logs/azure.yaml rename to model/azure/azure-logs.yaml diff --git a/model/trace/cloudevents.yaml b/model/cloudevents/cloudevents-spans.yaml similarity index 100% rename from model/trace/cloudevents.yaml rename to model/cloudevents/cloudevents-spans.yaml diff --git a/model/metrics/container.yaml b/model/container/container-metrics.yaml similarity index 100% rename from model/metrics/container.yaml rename to model/container/container-metrics.yaml diff --git a/model/db-common.yaml b/model/database/database-common.yaml similarity index 100% rename from model/db-common.yaml rename to model/database/database-common.yaml diff --git a/model/metrics/deprecated/database.yaml b/model/database/database-metrics-deprecated.yaml similarity index 100% rename from model/metrics/deprecated/database.yaml rename to model/database/database-metrics-deprecated.yaml diff --git a/model/metrics/database-metrics.yaml b/model/database/database-metrics.yaml similarity index 100% rename from model/metrics/database-metrics.yaml rename to model/database/database-metrics.yaml diff --git a/model/trace/database.yaml b/model/database/database-spans.yaml similarity index 100% rename from model/trace/database.yaml rename to model/database/database-spans.yaml diff --git a/model/metrics/dns.yaml b/model/dns/dns-metrics.yaml similarity index 100% rename from model/metrics/dns.yaml rename to model/dns/dns-metrics.yaml diff --git a/model/metrics/dotnet/dotnet-aspnetcore.yaml b/model/dotnet/dotnet-aspnetcore-metrics.yaml similarity index 100% rename from model/metrics/dotnet/dotnet-aspnetcore.yaml rename to model/dotnet/dotnet-aspnetcore-metrics.yaml diff --git a/model/metrics/dotnet/dotnet-kestrel.yaml b/model/dotnet/dotnet-kestrel-metrics.yaml similarity index 100% rename from model/metrics/dotnet/dotnet-kestrel.yaml rename to model/dotnet/dotnet-kestrel-metrics.yaml diff --git a/model/metrics/dotnet-metrics.yaml b/model/dotnet/dotnet-runtime-metrics.yaml similarity index 100% rename from model/metrics/dotnet-metrics.yaml rename to model/dotnet/dotnet-runtime-metrics.yaml diff --git a/model/metrics/dotnet/dotnet-signalr.yaml b/model/dotnet/dotnet-signalr-metrics.yaml similarity index 100% rename from model/metrics/dotnet/dotnet-signalr.yaml rename to model/dotnet/dotnet-signalr-metrics.yaml diff --git a/model/trace/trace-exception.yaml b/model/exceptions/exception-events.yaml similarity index 100% rename from model/trace/trace-exception.yaml rename to model/exceptions/exception-events.yaml diff --git a/model/logs/log-exception.yaml b/model/exceptions/exception-logs.yaml similarity index 100% rename from model/logs/log-exception.yaml rename to model/exceptions/exception-logs.yaml diff --git a/model/faas-common.yaml b/model/faas/faas-common.yaml similarity index 100% rename from model/faas-common.yaml rename to model/faas/faas-common.yaml diff --git a/model/metrics/faas-metrics.yaml b/model/faas/faas-metrics.yaml similarity index 100% rename from model/metrics/faas-metrics.yaml rename to model/faas/faas-metrics.yaml diff --git a/model/trace/faas.yaml b/model/faas/faas-spans.yaml similarity index 100% rename from model/trace/faas.yaml rename to model/faas/faas-spans.yaml diff --git a/model/trace/feature-flag.yaml b/model/feature-flag/feature-flag-events.yaml similarity index 100% rename from model/trace/feature-flag.yaml rename to model/feature-flag/feature-flag-events.yaml diff --git a/model/logs/log-feature_flag.yaml b/model/feature-flag/feature-flag-logs.yaml similarity index 100% rename from model/logs/log-feature_flag.yaml rename to model/feature-flag/feature-flag-logs.yaml diff --git a/model/trace/instrumentation/gcp-client.yml b/model/gcp/gcp-client-common.yml similarity index 100% rename from model/trace/instrumentation/gcp-client.yml rename to model/gcp/gcp-client-common.yml diff --git a/model/metrics/gen-ai.yaml b/model/gen-ai/gen-ai-metrics.yaml similarity index 100% rename from model/metrics/gen-ai.yaml rename to model/gen-ai/gen-ai-metrics.yaml diff --git a/model/trace/gen-ai.yaml b/model/gen-ai/gen-ai-spans.yaml similarity index 100% rename from model/trace/gen-ai.yaml rename to model/gen-ai/gen-ai-spans.yaml diff --git a/model/metrics/go-metrics.yaml b/model/go/go-metrics.yaml similarity index 100% rename from model/metrics/go-metrics.yaml rename to model/go/go-metrics.yaml diff --git a/model/trace/instrumentation/graphql.yml b/model/graphgq/graphql-spans.yml similarity index 100% rename from model/trace/instrumentation/graphql.yml rename to model/graphgq/graphql-spans.yml diff --git a/model/metrics/hardware/common.yaml b/model/hardware/hardware-common-metrics.yaml similarity index 100% rename from model/metrics/hardware/common.yaml rename to model/hardware/hardware-common-metrics.yaml diff --git a/model/hardware-common.yaml b/model/hardware/hardware-common.yaml similarity index 100% rename from model/hardware-common.yaml rename to model/hardware/hardware-common.yaml diff --git a/model/http-common.yaml b/model/http/http-common.yaml similarity index 100% rename from model/http-common.yaml rename to model/http/http-common.yaml diff --git a/model/metrics/http.yaml b/model/http/http-metrics.yaml similarity index 100% rename from model/metrics/http.yaml rename to model/http/http-metrics.yaml diff --git a/model/trace/http.yaml b/model/http/http-spans.yaml similarity index 100% rename from model/trace/http.yaml rename to model/http/http-spans.yaml diff --git a/model/metrics/nodejs-metrics.yaml b/model/js/nodejs-metrics.yaml similarity index 100% rename from model/metrics/nodejs-metrics.yaml rename to model/js/nodejs-metrics.yaml diff --git a/model/metrics/v8js-metrics.yaml b/model/js/v8js-metrics.yaml similarity index 100% rename from model/metrics/v8js-metrics.yaml rename to model/js/v8js-metrics.yaml diff --git a/model/metrics/deprecated/jvm-metrics.yaml b/model/jvm/jvm-metrics-deprecated.yaml similarity index 100% rename from model/metrics/deprecated/jvm-metrics.yaml rename to model/jvm/jvm-metrics-deprecated.yaml diff --git a/model/metrics/jvm-metrics-experimental.yaml b/model/jvm/jvm-metrics-experimental.yaml similarity index 100% rename from model/metrics/jvm-metrics-experimental.yaml rename to model/jvm/jvm-metrics-experimental.yaml diff --git a/model/metrics/jvm-metrics.yaml b/model/jvm/jvm-metrics.yaml similarity index 100% rename from model/metrics/jvm-metrics.yaml rename to model/jvm/jvm-metrics.yaml diff --git a/model/metrics/k8s.yaml b/model/k8s/k8s-metrics.yaml similarity index 100% rename from model/metrics/k8s.yaml rename to model/k8s/k8s-metrics.yaml diff --git a/model/logs/general.yaml b/model/logs/general.yaml deleted file mode 100644 index d4835d6982..0000000000 --- a/model/logs/general.yaml +++ /dev/null @@ -1,10 +0,0 @@ -groups: - - id: log.record - type: attribute_group - brief: > - The attributes described in this section are rather generic. They may be used in any Log Record they apply to. - attributes: - - ref: log.record.uid - requirement_level: opt_in - - ref: log.record.original - requirement_level: opt_in diff --git a/model/logs/media.yaml b/model/logs/logs.yaml similarity index 63% rename from model/logs/media.yaml rename to model/logs/logs.yaml index 34c7631d5c..47b7af71f5 100644 --- a/model/logs/media.yaml +++ b/model/logs/logs.yaml @@ -1,4 +1,14 @@ groups: + - id: log.record + type: attribute_group + brief: > + The attributes described in this section are rather generic. They may be used in any Log Record they apply to. + attributes: + - ref: log.record.uid + requirement_level: opt_in + - ref: log.record.original + requirement_level: opt_in + - id: attributes.log type: attribute_group brief: "Describes Log attributes" diff --git a/model/messaging-common.yaml b/model/messaging/messaging-common.yaml similarity index 100% rename from model/messaging-common.yaml rename to model/messaging/messaging-common.yaml diff --git a/model/metrics/deprecated/messaging-metrics.yaml b/model/messaging/messaging-metrics-deprecated.yaml similarity index 100% rename from model/metrics/deprecated/messaging-metrics.yaml rename to model/messaging/messaging-metrics-deprecated.yaml diff --git a/model/metrics/messaging-metrics.yaml b/model/messaging/messaging-metrics.yaml similarity index 100% rename from model/metrics/messaging-metrics.yaml rename to model/messaging/messaging-metrics.yaml diff --git a/model/trace/messaging.yaml b/model/messaging/messaging-spans.yaml similarity index 100% rename from model/trace/messaging.yaml rename to model/messaging/messaging-spans.yaml diff --git a/model/logs/mobile-events.yaml b/model/mobile/mobile-events.yaml similarity index 100% rename from model/logs/mobile-events.yaml rename to model/mobile/mobile-events.yaml diff --git a/model/trace/compatibility.yaml b/model/opentracing/opentracing-common.yaml similarity index 91% rename from model/trace/compatibility.yaml rename to model/opentracing/opentracing-common.yaml index 3f906d18cf..001ba4042e 100644 --- a/model/trace/compatibility.yaml +++ b/model/opentracing/opentracing-common.yaml @@ -1,6 +1,6 @@ groups: - id: opentracing - type: span + type: attribute_group brief: 'This document defines semantic conventions for the OpenTracing Shim' note: > These conventions are used by the OpenTracing Shim layer. diff --git a/model/trace/exporter/exporter.yaml b/model/otel/otel-exporter-common.yaml similarity index 91% rename from model/trace/exporter/exporter.yaml rename to model/otel/otel-exporter-common.yaml index 0c4e8c6a8f..ddb8dd1e22 100644 --- a/model/trace/exporter/exporter.yaml +++ b/model/otel/otel-exporter-common.yaml @@ -1,6 +1,6 @@ groups: - id: otel_span - type: span + type: attribute_group brief: Span attributes used by non-OTLP exporters to represent OpenTelemetry Span's concepts. attributes: - ref: otel.status_code diff --git a/model/metrics/process-metrics.yaml b/model/process/process-metrics.yaml similarity index 100% rename from model/metrics/process-metrics.yaml rename to model/process/process-metrics.yaml diff --git a/model/metrics/rpc-metrics.yaml b/model/rpc/rpc-metrics.yaml similarity index 100% rename from model/metrics/rpc-metrics.yaml rename to model/rpc/rpc-metrics.yaml diff --git a/model/trace/rpc.yaml b/model/rpc/rpc-spans.yaml similarity index 100% rename from model/trace/rpc.yaml rename to model/rpc/rpc-spans.yaml diff --git a/model/metrics/system-metrics.yaml b/model/system/system-metrics.yaml similarity index 100% rename from model/metrics/system-metrics.yaml rename to model/system/system-metrics.yaml From c8c06fb931ed2dc79c360e16b7f2582ffbcababf Mon Sep 17 00:00:00 2001 From: Liudmila Molkova Date: Wed, 28 Aug 2024 17:07:27 -0700 Subject: [PATCH 02/14] try registry inside domain --- .../android-registry.yaml} | 0 .../android-registry-deprecated.yaml} | 0 .../artifact-registry.yaml} | 0 .../aws.yaml => aws/aws-registry.yaml} | 0 .../azure.yaml => azure/azure-registry.yaml} | 0 .../cicd.yaml => cicd/cicd-registry.yaml} | 0 .../cloudevents-registry.yaml} | 0 .../container-registry.yaml} | 0 .../container-registry-deprecated.yaml} | 0 .../database-registry.yaml} | 0 .../database-metrics-deprecated.yaml | 0 .../database-registry-deprecated.yaml} | 0 .../dns.yaml => dns/dns-registry.yaml} | 0 .../dotnet-aspnetcore-registry.yaml} | 0 .../dotnet-registry.yaml} | 0 .../dotnet-signalr-registry.yaml} | 0 .../exception-registry.yaml} | 0 .../faas.yaml => faas/faas-registry.yaml} | 0 .../feature-flag-registry.yaml} | 0 .../gcp.yaml => gcp/gcp-registry.yaml} | 0 .../gen-ai-registry-deprecated.yaml} | 0 .../gen-ai-registry.yaml} | 0 model/general.yaml | 65 ---------- .../client-registry.yaml} | 0 .../code.yaml => general/code-registry.yaml} | 0 .../cpu.yaml => general/cpu-registry.yaml} | 0 .../deployment-registry-deprecated.yaml} | 0 .../enduser-registry-deprecated.yaml} | 0 .../deprecated/ios-registry-deprecated.yaml} | 0 .../network-registry-deprecated.yaml} | 0 .../deprecated/tls-registry-deprecated.yaml} | 0 .../destination-registry.yaml} | 0 .../disk.yaml => general/disk-registry.yaml} | 0 .../error-registry.yaml} | 0 .../file.yaml => general/file-registry.yaml} | 0 model/general/general.yaml | 119 ++++++++++++++++++ .../linux-registry.yaml} | 0 .../network-registry.yaml} | 0 .../oci.yaml => general/oci-registry.yaml} | 0 .../peer.yaml => general/peer-registry.yaml} | 0 .../server-registry.yaml} | 0 .../session-registry.yaml} | 0 .../source-registry.yaml} | 0 .../test.yaml => general/test-registry.yaml} | 0 .../thread-registry.yaml} | 0 .../tls.yaml => general/tls-registry.yaml} | 0 .../url.yaml => general/url-registry.yaml} | 0 .../user-agent-registry.yaml} | 0 .../user.yaml => general/user-registry.yaml} | 0 .../vcs.yaml => general/vcs-registry.yaml} | 0 .../{registry/go.yaml => go/go-registry.yaml} | 0 .../graphql-registry.yaml} | 0 .../hardware-registry.yaml} | 0 .../deprecated/http-registry-deprecated.yaml} | 0 .../http.yaml => http/http-registry.yaml} | 0 .../nodejs.yaml => js/nodejs-registry.yaml} | 0 .../v8js.yaml => js/v8js-registry.yaml} | 0 .../jvm-metrics-deprecated.yaml | 0 .../jvm.yaml => jvm/jvm-registry.yaml} | 0 .../deprecated/k8s-registry-deprecated.yaml} | 0 .../k8s.yaml => k8s/k8s-registry.yaml} | 0 .../event.yaml => logs/event-registry.yaml} | 0 .../log.yaml => logs/log-registry.yaml} | 0 .../messaging-metrics-deprecated.yaml | 0 .../messaging-registry-deprecated.yaml} | 0 .../messaging-registry.yaml} | 0 model/network.yaml | 26 ---- .../opentracing-registry.yaml} | 0 .../deprecated/otel-registry-deprecated.yaml} | 0 .../otel.yaml => otel/otel-registry.yaml} | 0 .../process-registry-deprecated.yaml} | 0 .../process-registry.yaml} | 0 model/profiles/frame.yaml | 8 -- model/registry/profile.yaml | 63 ---------- .../{android.yaml => android-resources.yaml} | 0 .../browser-registry.yaml} | 0 .../{browser.yaml => browser-resources.yaml} | 0 .../cloud-registry.yaml} | 0 .../{cloud.yaml => cloud-resources.yaml} | 0 .../cloud_provider/heroku-registry.yaml} | 0 .../{heroku.yaml => heroku-resources.yaml} | 0 ...ontainer.yaml => container-resources.yaml} | 0 .../deployment-registry.yaml} | 0 ...ronment.yaml => deployment-resources.yaml} | 0 .../device-registry.yaml} | 0 .../{device.yaml => device-resources.yaml} | 0 .../{faas.yaml => faas-resources.yaml} | 0 .../host.yaml => resource/host-registry.yaml} | 0 .../{host.yaml => host-resources.yaml} | 0 .../resource/{k8s.yaml => k8s-resources.yaml} | 0 .../os.yaml => resource/os-registry.yaml} | 0 model/resource/{os.yaml => os-resources.yaml} | 0 .../otel-resources.yaml} | 0 .../{process.yaml => process-resources.yaml} | 0 .../service-registry.yaml} | 0 ...ml => service-resources-experimental.yaml} | 0 .../{service.yaml => service-resources.yaml} | 0 .../telemetry-registry.yaml} | 0 ... => telemetry-resources-experimental.yaml} | 0 ...elemetry.yaml => telemetry-resources.yaml} | 0 .../webengine-registry.yaml} | 0 ...ebengine.yaml => webengine-resources.yaml} | 0 .../deprecated/rpc-registry-deprecated.yaml} | 0 .../rpc.yaml => rpc/rpc-registry.yaml} | 0 model/session.yaml | 19 --- .../system-registry-deprecated.yaml} | 0 .../system-registry.yaml} | 0 model/url.yaml | 12 -- 108 files changed, 119 insertions(+), 193 deletions(-) rename model/{registry/android.yaml => andrioid/android-registry.yaml} (100%) rename model/{registry/deprecated/android.yaml => andrioid/deprecated/android-registry-deprecated.yaml} (100%) rename model/{registry/artifact.yaml => artifact/artifact-registry.yaml} (100%) rename model/{registry/aws.yaml => aws/aws-registry.yaml} (100%) rename model/{registry/azure.yaml => azure/azure-registry.yaml} (100%) rename model/{registry/cicd.yaml => cicd/cicd-registry.yaml} (100%) rename model/{registry/cloudevents.yaml => cloudevents/cloudevents-registry.yaml} (100%) rename model/{registry/container.yaml => container/container-registry.yaml} (100%) rename model/{registry/deprecated/container.yaml => container/deprecated/container-registry-deprecated.yaml} (100%) rename model/{registry/db.yaml => database/database-registry.yaml} (100%) rename model/database/{ => deprecated}/database-metrics-deprecated.yaml (100%) rename model/{registry/deprecated/db.yaml => database/deprecated/database-registry-deprecated.yaml} (100%) rename model/{registry/dns.yaml => dns/dns-registry.yaml} (100%) rename model/{registry/aspnetcore.yaml => dotnet/dotnet-aspnetcore-registry.yaml} (100%) rename model/{registry/dotnet.yaml => dotnet/dotnet-registry.yaml} (100%) rename model/{registry/signalr.yaml => dotnet/dotnet-signalr-registry.yaml} (100%) rename model/{registry/exception.yaml => exceptions/exception-registry.yaml} (100%) rename model/{registry/faas.yaml => faas/faas-registry.yaml} (100%) rename model/{registry/feature-flag.yaml => feature-flag/feature-flag-registry.yaml} (100%) rename model/{registry/gcp.yaml => gcp/gcp-registry.yaml} (100%) rename model/{registry/deprecated/gen-ai.yaml => gen-ai/deprecated/gen-ai-registry-deprecated.yaml} (100%) rename model/{registry/gen-ai.yaml => gen-ai/gen-ai-registry.yaml} (100%) delete mode 100644 model/general.yaml rename model/{registry/client.yaml => general/client-registry.yaml} (100%) rename model/{registry/code.yaml => general/code-registry.yaml} (100%) rename model/{registry/cpu.yaml => general/cpu-registry.yaml} (100%) rename model/{registry/deprecated/deployment.yaml => general/deprecated/deployment-registry-deprecated.yaml} (100%) rename model/{registry/deprecated/enduser.yaml => general/deprecated/enduser-registry-deprecated.yaml} (100%) rename model/{registry/deprecated/ios.yaml => general/deprecated/ios-registry-deprecated.yaml} (100%) rename model/{registry/deprecated/network.yaml => general/deprecated/network-registry-deprecated.yaml} (100%) rename model/{registry/deprecated/tls.yaml => general/deprecated/tls-registry-deprecated.yaml} (100%) rename model/{registry/destination.yaml => general/destination-registry.yaml} (100%) rename model/{registry/disk.yaml => general/disk-registry.yaml} (100%) rename model/{registry/error.yaml => general/error-registry.yaml} (100%) rename model/{registry/file.yaml => general/file-registry.yaml} (100%) create mode 100644 model/general/general.yaml rename model/{registry/linux.yaml => general/linux-registry.yaml} (100%) rename model/{registry/network.yaml => general/network-registry.yaml} (100%) rename model/{registry/oci.yaml => general/oci-registry.yaml} (100%) rename model/{registry/peer.yaml => general/peer-registry.yaml} (100%) rename model/{registry/server.yaml => general/server-registry.yaml} (100%) rename model/{registry/session.yaml => general/session-registry.yaml} (100%) rename model/{registry/source.yaml => general/source-registry.yaml} (100%) rename model/{registry/test.yaml => general/test-registry.yaml} (100%) rename model/{registry/thread.yaml => general/thread-registry.yaml} (100%) rename model/{registry/tls.yaml => general/tls-registry.yaml} (100%) rename model/{registry/url.yaml => general/url-registry.yaml} (100%) rename model/{registry/user-agent.yaml => general/user-agent-registry.yaml} (100%) rename model/{registry/user.yaml => general/user-registry.yaml} (100%) rename model/{registry/vcs.yaml => general/vcs-registry.yaml} (100%) rename model/{registry/go.yaml => go/go-registry.yaml} (100%) rename model/{registry/graphql.yaml => graphgq/graphql-registry.yaml} (100%) rename model/{registry/hardware.yaml => hardware/hardware-registry.yaml} (100%) rename model/{registry/deprecated/http.yaml => http/deprecated/http-registry-deprecated.yaml} (100%) rename model/{registry/http.yaml => http/http-registry.yaml} (100%) rename model/{registry/nodejs.yaml => js/nodejs-registry.yaml} (100%) rename model/{registry/v8js.yaml => js/v8js-registry.yaml} (100%) rename model/jvm/{ => deprecated}/jvm-metrics-deprecated.yaml (100%) rename model/{registry/jvm.yaml => jvm/jvm-registry.yaml} (100%) rename model/{registry/deprecated/k8s.yaml => k8s/deprecated/k8s-registry-deprecated.yaml} (100%) rename model/{registry/k8s.yaml => k8s/k8s-registry.yaml} (100%) rename model/{registry/event.yaml => logs/event-registry.yaml} (100%) rename model/{registry/log.yaml => logs/log-registry.yaml} (100%) rename model/messaging/{ => deprecated}/messaging-metrics-deprecated.yaml (100%) rename model/{registry/deprecated/messaging.yaml => messaging/deprecated/messaging-registry-deprecated.yaml} (100%) rename model/{registry/messaging.yaml => messaging/messaging-registry.yaml} (100%) delete mode 100644 model/network.yaml rename model/{registry/opentracing.yaml => opentracing/opentracing-registry.yaml} (100%) rename model/{registry/deprecated/otel.yaml => otel/deprecated/otel-registry-deprecated.yaml} (100%) rename model/{registry/otel.yaml => otel/otel-registry.yaml} (100%) rename model/{registry/deprecated/process.yaml => process/deprecated/process-registry-deprecated.yaml} (100%) rename model/{registry/process.yaml => process/process-registry.yaml} (100%) delete mode 100644 model/profiles/frame.yaml delete mode 100644 model/registry/profile.yaml rename model/resource/{android.yaml => android-resources.yaml} (100%) rename model/{registry/browser.yaml => resource/browser-registry.yaml} (100%) rename model/resource/{browser.yaml => browser-resources.yaml} (100%) rename model/{registry/cloud.yaml => resource/cloud-registry.yaml} (100%) rename model/resource/{cloud.yaml => cloud-resources.yaml} (100%) rename model/{registry/heroku.yaml => resource/cloud_provider/heroku-registry.yaml} (100%) rename model/resource/cloud_provider/{heroku.yaml => heroku-resources.yaml} (100%) rename model/resource/{container.yaml => container-resources.yaml} (100%) rename model/{registry/deployment.yaml => resource/deployment-registry.yaml} (100%) rename model/resource/{deployment_environment.yaml => deployment-resources.yaml} (100%) rename model/{registry/device.yaml => resource/device-registry.yaml} (100%) rename model/resource/{device.yaml => device-resources.yaml} (100%) rename model/resource/{faas.yaml => faas-resources.yaml} (100%) rename model/{registry/host.yaml => resource/host-registry.yaml} (100%) rename model/resource/{host.yaml => host-resources.yaml} (100%) rename model/resource/{k8s.yaml => k8s-resources.yaml} (100%) rename model/{registry/os.yaml => resource/os-registry.yaml} (100%) rename model/resource/{os.yaml => os-resources.yaml} (100%) rename model/{scope/exporter/exporter.yaml => resource/otel-resources.yaml} (100%) rename model/resource/{process.yaml => process-resources.yaml} (100%) rename model/{registry/service.yaml => resource/service-registry.yaml} (100%) rename model/resource/{service_experimental.yaml => service-resources-experimental.yaml} (100%) rename model/resource/{service.yaml => service-resources.yaml} (100%) rename model/{registry/telemetry.yaml => resource/telemetry-registry.yaml} (100%) rename model/resource/{telemetry_experimental.yaml => telemetry-resources-experimental.yaml} (100%) rename model/resource/{telemetry.yaml => telemetry-resources.yaml} (100%) rename model/{registry/webengine.yaml => resource/webengine-registry.yaml} (100%) rename model/resource/{webengine.yaml => webengine-resources.yaml} (100%) rename model/{registry/deprecated/rpc.yaml => rpc/deprecated/rpc-registry-deprecated.yaml} (100%) rename model/{registry/rpc.yaml => rpc/rpc-registry.yaml} (100%) delete mode 100644 model/session.yaml rename model/{registry/deprecated/system.yaml => system/deprecated/system-registry-deprecated.yaml} (100%) rename model/{registry/system.yaml => system/system-registry.yaml} (100%) delete mode 100644 model/url.yaml diff --git a/model/registry/android.yaml b/model/andrioid/android-registry.yaml similarity index 100% rename from model/registry/android.yaml rename to model/andrioid/android-registry.yaml diff --git a/model/registry/deprecated/android.yaml b/model/andrioid/deprecated/android-registry-deprecated.yaml similarity index 100% rename from model/registry/deprecated/android.yaml rename to model/andrioid/deprecated/android-registry-deprecated.yaml diff --git a/model/registry/artifact.yaml b/model/artifact/artifact-registry.yaml similarity index 100% rename from model/registry/artifact.yaml rename to model/artifact/artifact-registry.yaml diff --git a/model/registry/aws.yaml b/model/aws/aws-registry.yaml similarity index 100% rename from model/registry/aws.yaml rename to model/aws/aws-registry.yaml diff --git a/model/registry/azure.yaml b/model/azure/azure-registry.yaml similarity index 100% rename from model/registry/azure.yaml rename to model/azure/azure-registry.yaml diff --git a/model/registry/cicd.yaml b/model/cicd/cicd-registry.yaml similarity index 100% rename from model/registry/cicd.yaml rename to model/cicd/cicd-registry.yaml diff --git a/model/registry/cloudevents.yaml b/model/cloudevents/cloudevents-registry.yaml similarity index 100% rename from model/registry/cloudevents.yaml rename to model/cloudevents/cloudevents-registry.yaml diff --git a/model/registry/container.yaml b/model/container/container-registry.yaml similarity index 100% rename from model/registry/container.yaml rename to model/container/container-registry.yaml diff --git a/model/registry/deprecated/container.yaml b/model/container/deprecated/container-registry-deprecated.yaml similarity index 100% rename from model/registry/deprecated/container.yaml rename to model/container/deprecated/container-registry-deprecated.yaml diff --git a/model/registry/db.yaml b/model/database/database-registry.yaml similarity index 100% rename from model/registry/db.yaml rename to model/database/database-registry.yaml diff --git a/model/database/database-metrics-deprecated.yaml b/model/database/deprecated/database-metrics-deprecated.yaml similarity index 100% rename from model/database/database-metrics-deprecated.yaml rename to model/database/deprecated/database-metrics-deprecated.yaml diff --git a/model/registry/deprecated/db.yaml b/model/database/deprecated/database-registry-deprecated.yaml similarity index 100% rename from model/registry/deprecated/db.yaml rename to model/database/deprecated/database-registry-deprecated.yaml diff --git a/model/registry/dns.yaml b/model/dns/dns-registry.yaml similarity index 100% rename from model/registry/dns.yaml rename to model/dns/dns-registry.yaml diff --git a/model/registry/aspnetcore.yaml b/model/dotnet/dotnet-aspnetcore-registry.yaml similarity index 100% rename from model/registry/aspnetcore.yaml rename to model/dotnet/dotnet-aspnetcore-registry.yaml diff --git a/model/registry/dotnet.yaml b/model/dotnet/dotnet-registry.yaml similarity index 100% rename from model/registry/dotnet.yaml rename to model/dotnet/dotnet-registry.yaml diff --git a/model/registry/signalr.yaml b/model/dotnet/dotnet-signalr-registry.yaml similarity index 100% rename from model/registry/signalr.yaml rename to model/dotnet/dotnet-signalr-registry.yaml diff --git a/model/registry/exception.yaml b/model/exceptions/exception-registry.yaml similarity index 100% rename from model/registry/exception.yaml rename to model/exceptions/exception-registry.yaml diff --git a/model/registry/faas.yaml b/model/faas/faas-registry.yaml similarity index 100% rename from model/registry/faas.yaml rename to model/faas/faas-registry.yaml diff --git a/model/registry/feature-flag.yaml b/model/feature-flag/feature-flag-registry.yaml similarity index 100% rename from model/registry/feature-flag.yaml rename to model/feature-flag/feature-flag-registry.yaml diff --git a/model/registry/gcp.yaml b/model/gcp/gcp-registry.yaml similarity index 100% rename from model/registry/gcp.yaml rename to model/gcp/gcp-registry.yaml diff --git a/model/registry/deprecated/gen-ai.yaml b/model/gen-ai/deprecated/gen-ai-registry-deprecated.yaml similarity index 100% rename from model/registry/deprecated/gen-ai.yaml rename to model/gen-ai/deprecated/gen-ai-registry-deprecated.yaml diff --git a/model/registry/gen-ai.yaml b/model/gen-ai/gen-ai-registry.yaml similarity index 100% rename from model/registry/gen-ai.yaml rename to model/gen-ai/gen-ai-registry.yaml diff --git a/model/general.yaml b/model/general.yaml deleted file mode 100644 index 85377316e1..0000000000 --- a/model/general.yaml +++ /dev/null @@ -1,65 +0,0 @@ -groups: - - id: client - type: attribute_group - brief: > - General client attributes. - attributes: - - ref: client.address - - ref: client.port - - id: server - type: attribute_group - brief: > - General server attributes. - attributes: - - ref: server.address - - ref: server.port - - id: source - type: attribute_group - brief: > - General source attributes. - attributes: - - ref: source.address - - ref: source.port - - id: destination - type: attribute_group - brief: > - General destination attributes. - attributes: - - ref: destination.address - - ref: destination.port - - id: peer - type: span - brief: "Operations that access some remote service." - attributes: - - ref: peer.service - requirement_level: recommended - - id: identity - type: span - brief: > - These attributes may be used for any operation with an authenticated and/or authorized enduser. - attributes: - - ref: enduser.id - requirement_level: recommended - - ref: enduser.role - requirement_level: recommended - - ref: enduser.scope - requirement_level: recommended - - id: thread - type: span - brief: > - These attributes may be used for any operation to store information about a thread that started a span. - attributes: - - ref: thread.id - - ref: thread.name - - id: code - type: span - brief: > - These attributes allow to report this unit of code and therefore to provide more context about the span. - attributes: - - ref: code.function - - ref: code.namespace - - ref: code.filepath - - ref: code.lineno - - ref: code.column - - ref: code.stacktrace - requirement_level: opt_in diff --git a/model/registry/client.yaml b/model/general/client-registry.yaml similarity index 100% rename from model/registry/client.yaml rename to model/general/client-registry.yaml diff --git a/model/registry/code.yaml b/model/general/code-registry.yaml similarity index 100% rename from model/registry/code.yaml rename to model/general/code-registry.yaml diff --git a/model/registry/cpu.yaml b/model/general/cpu-registry.yaml similarity index 100% rename from model/registry/cpu.yaml rename to model/general/cpu-registry.yaml diff --git a/model/registry/deprecated/deployment.yaml b/model/general/deprecated/deployment-registry-deprecated.yaml similarity index 100% rename from model/registry/deprecated/deployment.yaml rename to model/general/deprecated/deployment-registry-deprecated.yaml diff --git a/model/registry/deprecated/enduser.yaml b/model/general/deprecated/enduser-registry-deprecated.yaml similarity index 100% rename from model/registry/deprecated/enduser.yaml rename to model/general/deprecated/enduser-registry-deprecated.yaml diff --git a/model/registry/deprecated/ios.yaml b/model/general/deprecated/ios-registry-deprecated.yaml similarity index 100% rename from model/registry/deprecated/ios.yaml rename to model/general/deprecated/ios-registry-deprecated.yaml diff --git a/model/registry/deprecated/network.yaml b/model/general/deprecated/network-registry-deprecated.yaml similarity index 100% rename from model/registry/deprecated/network.yaml rename to model/general/deprecated/network-registry-deprecated.yaml diff --git a/model/registry/deprecated/tls.yaml b/model/general/deprecated/tls-registry-deprecated.yaml similarity index 100% rename from model/registry/deprecated/tls.yaml rename to model/general/deprecated/tls-registry-deprecated.yaml diff --git a/model/registry/destination.yaml b/model/general/destination-registry.yaml similarity index 100% rename from model/registry/destination.yaml rename to model/general/destination-registry.yaml diff --git a/model/registry/disk.yaml b/model/general/disk-registry.yaml similarity index 100% rename from model/registry/disk.yaml rename to model/general/disk-registry.yaml diff --git a/model/registry/error.yaml b/model/general/error-registry.yaml similarity index 100% rename from model/registry/error.yaml rename to model/general/error-registry.yaml diff --git a/model/registry/file.yaml b/model/general/file-registry.yaml similarity index 100% rename from model/registry/file.yaml rename to model/general/file-registry.yaml diff --git a/model/general/general.yaml b/model/general/general.yaml new file mode 100644 index 0000000000..9a77fc02a3 --- /dev/null +++ b/model/general/general.yaml @@ -0,0 +1,119 @@ +groups: + - id: client + type: attribute_group + brief: > + General client attributes. + attributes: + - ref: client.address + - ref: client.port + - id: server + type: attribute_group + brief: > + General server attributes. + attributes: + - ref: server.address + - ref: server.port + - id: source + type: attribute_group + brief: > + General source attributes. + attributes: + - ref: source.address + - ref: source.port + - id: destination + type: attribute_group + brief: > + General destination attributes. + attributes: + - ref: destination.address + - ref: destination.port + - id: peer + type: attribute_group + brief: "Operations that access some remote service." + attributes: + - ref: peer.service + requirement_level: recommended + - id: identity + type: attribute_group + brief: > + These attributes may be used for any operation with an authenticated and/or authorized enduser. + attributes: + - ref: enduser.id + requirement_level: recommended + - ref: enduser.role + requirement_level: recommended + - ref: enduser.scope + requirement_level: recommended + - id: thread + type: attribute_group + brief: > + These attributes may be used for any operation to store information about a thread that started a span. + attributes: + - ref: thread.id + - ref: thread.name + - id: code + type: attribute_group + brief: > + These attributes allow to report this unit of code and therefore to provide more context about the span. + attributes: + - ref: code.function + - ref: code.namespace + - ref: code.filepath + - ref: code.lineno + - ref: code.column + - ref: code.stacktrace + requirement_level: opt_in + - id: url + brief: Attributes describing URL. + type: attribute_group + attributes: + - ref: url.scheme + - ref: url.full + tag: sensitive-information + - ref: url.path + - ref: url.query + tag: sensitive-information + - ref: url.fragment + - id: session-id + type: attribute_group + brief: > + Session is defined as the period of time encompassing all activities performed by the application and the actions + executed by the end user. + + Consequently, a Session is represented as a collection of Logs, Events, and Spans emitted by the Client Application + throughout the Session's duration. Each Session is assigned a unique identifier, which is included as an attribute in + the Logs, Events, and Spans generated during the Session's lifecycle. + + When a session reaches end of life, typically due to user inactivity or session timeout, a new session identifier + will be assigned. The previous session identifier may be provided by the instrumentation so that telemetry + backends can link the two sessions. + attributes: + - ref: session.id + requirement_level: opt_in + - ref: session.previous_id + requirement_level: opt_in + - id: network-core + type: attribute_group + brief: > + These attributes may be used for any network related operation. + attributes: + - ref: network.transport + - ref: network.type + - ref: network.protocol.name + - ref: network.protocol.version + - ref: network.peer.address + - ref: network.peer.port + - ref: network.local.address + - ref: network.local.port + + - id: network-connection-and-carrier + type: attribute_group + brief: > + These attributes may be used for any network related operation. + attributes: + - ref: network.connection.type + - ref: network.connection.subtype + - ref: network.carrier.name + - ref: network.carrier.mcc + - ref: network.carrier.mnc + - ref: network.carrier.icc diff --git a/model/registry/linux.yaml b/model/general/linux-registry.yaml similarity index 100% rename from model/registry/linux.yaml rename to model/general/linux-registry.yaml diff --git a/model/registry/network.yaml b/model/general/network-registry.yaml similarity index 100% rename from model/registry/network.yaml rename to model/general/network-registry.yaml diff --git a/model/registry/oci.yaml b/model/general/oci-registry.yaml similarity index 100% rename from model/registry/oci.yaml rename to model/general/oci-registry.yaml diff --git a/model/registry/peer.yaml b/model/general/peer-registry.yaml similarity index 100% rename from model/registry/peer.yaml rename to model/general/peer-registry.yaml diff --git a/model/registry/server.yaml b/model/general/server-registry.yaml similarity index 100% rename from model/registry/server.yaml rename to model/general/server-registry.yaml diff --git a/model/registry/session.yaml b/model/general/session-registry.yaml similarity index 100% rename from model/registry/session.yaml rename to model/general/session-registry.yaml diff --git a/model/registry/source.yaml b/model/general/source-registry.yaml similarity index 100% rename from model/registry/source.yaml rename to model/general/source-registry.yaml diff --git a/model/registry/test.yaml b/model/general/test-registry.yaml similarity index 100% rename from model/registry/test.yaml rename to model/general/test-registry.yaml diff --git a/model/registry/thread.yaml b/model/general/thread-registry.yaml similarity index 100% rename from model/registry/thread.yaml rename to model/general/thread-registry.yaml diff --git a/model/registry/tls.yaml b/model/general/tls-registry.yaml similarity index 100% rename from model/registry/tls.yaml rename to model/general/tls-registry.yaml diff --git a/model/registry/url.yaml b/model/general/url-registry.yaml similarity index 100% rename from model/registry/url.yaml rename to model/general/url-registry.yaml diff --git a/model/registry/user-agent.yaml b/model/general/user-agent-registry.yaml similarity index 100% rename from model/registry/user-agent.yaml rename to model/general/user-agent-registry.yaml diff --git a/model/registry/user.yaml b/model/general/user-registry.yaml similarity index 100% rename from model/registry/user.yaml rename to model/general/user-registry.yaml diff --git a/model/registry/vcs.yaml b/model/general/vcs-registry.yaml similarity index 100% rename from model/registry/vcs.yaml rename to model/general/vcs-registry.yaml diff --git a/model/registry/go.yaml b/model/go/go-registry.yaml similarity index 100% rename from model/registry/go.yaml rename to model/go/go-registry.yaml diff --git a/model/registry/graphql.yaml b/model/graphgq/graphql-registry.yaml similarity index 100% rename from model/registry/graphql.yaml rename to model/graphgq/graphql-registry.yaml diff --git a/model/registry/hardware.yaml b/model/hardware/hardware-registry.yaml similarity index 100% rename from model/registry/hardware.yaml rename to model/hardware/hardware-registry.yaml diff --git a/model/registry/deprecated/http.yaml b/model/http/deprecated/http-registry-deprecated.yaml similarity index 100% rename from model/registry/deprecated/http.yaml rename to model/http/deprecated/http-registry-deprecated.yaml diff --git a/model/registry/http.yaml b/model/http/http-registry.yaml similarity index 100% rename from model/registry/http.yaml rename to model/http/http-registry.yaml diff --git a/model/registry/nodejs.yaml b/model/js/nodejs-registry.yaml similarity index 100% rename from model/registry/nodejs.yaml rename to model/js/nodejs-registry.yaml diff --git a/model/registry/v8js.yaml b/model/js/v8js-registry.yaml similarity index 100% rename from model/registry/v8js.yaml rename to model/js/v8js-registry.yaml diff --git a/model/jvm/jvm-metrics-deprecated.yaml b/model/jvm/deprecated/jvm-metrics-deprecated.yaml similarity index 100% rename from model/jvm/jvm-metrics-deprecated.yaml rename to model/jvm/deprecated/jvm-metrics-deprecated.yaml diff --git a/model/registry/jvm.yaml b/model/jvm/jvm-registry.yaml similarity index 100% rename from model/registry/jvm.yaml rename to model/jvm/jvm-registry.yaml diff --git a/model/registry/deprecated/k8s.yaml b/model/k8s/deprecated/k8s-registry-deprecated.yaml similarity index 100% rename from model/registry/deprecated/k8s.yaml rename to model/k8s/deprecated/k8s-registry-deprecated.yaml diff --git a/model/registry/k8s.yaml b/model/k8s/k8s-registry.yaml similarity index 100% rename from model/registry/k8s.yaml rename to model/k8s/k8s-registry.yaml diff --git a/model/registry/event.yaml b/model/logs/event-registry.yaml similarity index 100% rename from model/registry/event.yaml rename to model/logs/event-registry.yaml diff --git a/model/registry/log.yaml b/model/logs/log-registry.yaml similarity index 100% rename from model/registry/log.yaml rename to model/logs/log-registry.yaml diff --git a/model/messaging/messaging-metrics-deprecated.yaml b/model/messaging/deprecated/messaging-metrics-deprecated.yaml similarity index 100% rename from model/messaging/messaging-metrics-deprecated.yaml rename to model/messaging/deprecated/messaging-metrics-deprecated.yaml diff --git a/model/registry/deprecated/messaging.yaml b/model/messaging/deprecated/messaging-registry-deprecated.yaml similarity index 100% rename from model/registry/deprecated/messaging.yaml rename to model/messaging/deprecated/messaging-registry-deprecated.yaml diff --git a/model/registry/messaging.yaml b/model/messaging/messaging-registry.yaml similarity index 100% rename from model/registry/messaging.yaml rename to model/messaging/messaging-registry.yaml diff --git a/model/network.yaml b/model/network.yaml deleted file mode 100644 index d346131cf3..0000000000 --- a/model/network.yaml +++ /dev/null @@ -1,26 +0,0 @@ -groups: - - id: network-core - type: attribute_group - brief: > - These attributes may be used for any network related operation. - attributes: - - ref: network.transport - - ref: network.type - - ref: network.protocol.name - - ref: network.protocol.version - - ref: network.peer.address - - ref: network.peer.port - - ref: network.local.address - - ref: network.local.port - - - id: network-connection-and-carrier - type: attribute_group - brief: > - These attributes may be used for any network related operation. - attributes: - - ref: network.connection.type - - ref: network.connection.subtype - - ref: network.carrier.name - - ref: network.carrier.mcc - - ref: network.carrier.mnc - - ref: network.carrier.icc diff --git a/model/registry/opentracing.yaml b/model/opentracing/opentracing-registry.yaml similarity index 100% rename from model/registry/opentracing.yaml rename to model/opentracing/opentracing-registry.yaml diff --git a/model/registry/deprecated/otel.yaml b/model/otel/deprecated/otel-registry-deprecated.yaml similarity index 100% rename from model/registry/deprecated/otel.yaml rename to model/otel/deprecated/otel-registry-deprecated.yaml diff --git a/model/registry/otel.yaml b/model/otel/otel-registry.yaml similarity index 100% rename from model/registry/otel.yaml rename to model/otel/otel-registry.yaml diff --git a/model/registry/deprecated/process.yaml b/model/process/deprecated/process-registry-deprecated.yaml similarity index 100% rename from model/registry/deprecated/process.yaml rename to model/process/deprecated/process-registry-deprecated.yaml diff --git a/model/registry/process.yaml b/model/process/process-registry.yaml similarity index 100% rename from model/registry/process.yaml rename to model/process/process-registry.yaml diff --git a/model/profiles/frame.yaml b/model/profiles/frame.yaml deleted file mode 100644 index 2c7994adfc..0000000000 --- a/model/profiles/frame.yaml +++ /dev/null @@ -1,8 +0,0 @@ -groups: - - id: profile.frame - type: attribute_group - brief: > - Describes the origin of a single frame in a Profile. - attributes: - - ref: profile.frame.type - requirement_level: recommended diff --git a/model/registry/profile.yaml b/model/registry/profile.yaml deleted file mode 100644 index 8bbac2ef51..0000000000 --- a/model/registry/profile.yaml +++ /dev/null @@ -1,63 +0,0 @@ -groups: - - - id: registry.profile.frame - type: attribute_group - brief: > - Describes the origin of a single frame in a Profile. - attributes: - - id: profile.frame.type - stability: experimental - brief: > - Describes the interpreter or compiler of a single frame. - examples: ['cpython'] - type: - allow_custom_values: true - members: - - id: dotnet - brief: > - [.NET](https://wikipedia.org/wiki/.NET) - value: "dotnet" - stability: experimental - - id: jvm - brief: > - [JVM](https://wikipedia.org/wiki/Java_virtual_machine) - value: "jvm" - stability: experimental - - id: kernel - brief: > - [Kernel](https://wikipedia.org/wiki/Kernel_(operating_system)) - value: "kernel" - stability: experimental - - id: native - brief: > - [C](https://wikipedia.org/wiki/C_(programming_language)), - [C++](https://wikipedia.org/wiki/C%2B%2B), - [Go](https://wikipedia.org/wiki/Go_(programming_language)), - [Rust](https://wikipedia.org/wiki/Rust_(programming_language)) - value: "native" - stability: experimental - - id: perl - brief: > - [Perl](https://wikipedia.org/wiki/Perl) - value: "perl" - stability: experimental - - id: php - brief: > - [PHP](https://wikipedia.org/wiki/PHP) - value: "php" - stability: experimental - - id: cpython - brief: > - [Python](https://wikipedia.org/wiki/Python_(programming_language)) - value: "cpython" - stability: experimental - - id: ruby - brief: > - [Ruby](https://wikipedia.org/wiki/Ruby_(programming_language)) - value: "ruby" - stability: experimental - - id: v8js - brief: > - [V8JS](https://wikipedia.org/wiki/V8_(JavaScript_engine)) - value: "v8js" - stability: experimental diff --git a/model/resource/android.yaml b/model/resource/android-resources.yaml similarity index 100% rename from model/resource/android.yaml rename to model/resource/android-resources.yaml diff --git a/model/registry/browser.yaml b/model/resource/browser-registry.yaml similarity index 100% rename from model/registry/browser.yaml rename to model/resource/browser-registry.yaml diff --git a/model/resource/browser.yaml b/model/resource/browser-resources.yaml similarity index 100% rename from model/resource/browser.yaml rename to model/resource/browser-resources.yaml diff --git a/model/registry/cloud.yaml b/model/resource/cloud-registry.yaml similarity index 100% rename from model/registry/cloud.yaml rename to model/resource/cloud-registry.yaml diff --git a/model/resource/cloud.yaml b/model/resource/cloud-resources.yaml similarity index 100% rename from model/resource/cloud.yaml rename to model/resource/cloud-resources.yaml diff --git a/model/registry/heroku.yaml b/model/resource/cloud_provider/heroku-registry.yaml similarity index 100% rename from model/registry/heroku.yaml rename to model/resource/cloud_provider/heroku-registry.yaml diff --git a/model/resource/cloud_provider/heroku.yaml b/model/resource/cloud_provider/heroku-resources.yaml similarity index 100% rename from model/resource/cloud_provider/heroku.yaml rename to model/resource/cloud_provider/heroku-resources.yaml diff --git a/model/resource/container.yaml b/model/resource/container-resources.yaml similarity index 100% rename from model/resource/container.yaml rename to model/resource/container-resources.yaml diff --git a/model/registry/deployment.yaml b/model/resource/deployment-registry.yaml similarity index 100% rename from model/registry/deployment.yaml rename to model/resource/deployment-registry.yaml diff --git a/model/resource/deployment_environment.yaml b/model/resource/deployment-resources.yaml similarity index 100% rename from model/resource/deployment_environment.yaml rename to model/resource/deployment-resources.yaml diff --git a/model/registry/device.yaml b/model/resource/device-registry.yaml similarity index 100% rename from model/registry/device.yaml rename to model/resource/device-registry.yaml diff --git a/model/resource/device.yaml b/model/resource/device-resources.yaml similarity index 100% rename from model/resource/device.yaml rename to model/resource/device-resources.yaml diff --git a/model/resource/faas.yaml b/model/resource/faas-resources.yaml similarity index 100% rename from model/resource/faas.yaml rename to model/resource/faas-resources.yaml diff --git a/model/registry/host.yaml b/model/resource/host-registry.yaml similarity index 100% rename from model/registry/host.yaml rename to model/resource/host-registry.yaml diff --git a/model/resource/host.yaml b/model/resource/host-resources.yaml similarity index 100% rename from model/resource/host.yaml rename to model/resource/host-resources.yaml diff --git a/model/resource/k8s.yaml b/model/resource/k8s-resources.yaml similarity index 100% rename from model/resource/k8s.yaml rename to model/resource/k8s-resources.yaml diff --git a/model/registry/os.yaml b/model/resource/os-registry.yaml similarity index 100% rename from model/registry/os.yaml rename to model/resource/os-registry.yaml diff --git a/model/resource/os.yaml b/model/resource/os-resources.yaml similarity index 100% rename from model/resource/os.yaml rename to model/resource/os-resources.yaml diff --git a/model/scope/exporter/exporter.yaml b/model/resource/otel-resources.yaml similarity index 100% rename from model/scope/exporter/exporter.yaml rename to model/resource/otel-resources.yaml diff --git a/model/resource/process.yaml b/model/resource/process-resources.yaml similarity index 100% rename from model/resource/process.yaml rename to model/resource/process-resources.yaml diff --git a/model/registry/service.yaml b/model/resource/service-registry.yaml similarity index 100% rename from model/registry/service.yaml rename to model/resource/service-registry.yaml diff --git a/model/resource/service_experimental.yaml b/model/resource/service-resources-experimental.yaml similarity index 100% rename from model/resource/service_experimental.yaml rename to model/resource/service-resources-experimental.yaml diff --git a/model/resource/service.yaml b/model/resource/service-resources.yaml similarity index 100% rename from model/resource/service.yaml rename to model/resource/service-resources.yaml diff --git a/model/registry/telemetry.yaml b/model/resource/telemetry-registry.yaml similarity index 100% rename from model/registry/telemetry.yaml rename to model/resource/telemetry-registry.yaml diff --git a/model/resource/telemetry_experimental.yaml b/model/resource/telemetry-resources-experimental.yaml similarity index 100% rename from model/resource/telemetry_experimental.yaml rename to model/resource/telemetry-resources-experimental.yaml diff --git a/model/resource/telemetry.yaml b/model/resource/telemetry-resources.yaml similarity index 100% rename from model/resource/telemetry.yaml rename to model/resource/telemetry-resources.yaml diff --git a/model/registry/webengine.yaml b/model/resource/webengine-registry.yaml similarity index 100% rename from model/registry/webengine.yaml rename to model/resource/webengine-registry.yaml diff --git a/model/resource/webengine.yaml b/model/resource/webengine-resources.yaml similarity index 100% rename from model/resource/webengine.yaml rename to model/resource/webengine-resources.yaml diff --git a/model/registry/deprecated/rpc.yaml b/model/rpc/deprecated/rpc-registry-deprecated.yaml similarity index 100% rename from model/registry/deprecated/rpc.yaml rename to model/rpc/deprecated/rpc-registry-deprecated.yaml diff --git a/model/registry/rpc.yaml b/model/rpc/rpc-registry.yaml similarity index 100% rename from model/registry/rpc.yaml rename to model/rpc/rpc-registry.yaml diff --git a/model/session.yaml b/model/session.yaml deleted file mode 100644 index e01af0acef..0000000000 --- a/model/session.yaml +++ /dev/null @@ -1,19 +0,0 @@ -groups: - - id: session-id - type: attribute_group - brief: > - Session is defined as the period of time encompassing all activities performed by the application and the actions - executed by the end user. - - Consequently, a Session is represented as a collection of Logs, Events, and Spans emitted by the Client Application - throughout the Session's duration. Each Session is assigned a unique identifier, which is included as an attribute in - the Logs, Events, and Spans generated during the Session's lifecycle. - - When a session reaches end of life, typically due to user inactivity or session timeout, a new session identifier - will be assigned. The previous session identifier may be provided by the instrumentation so that telemetry - backends can link the two sessions. - attributes: - - ref: session.id - requirement_level: opt_in - - ref: session.previous_id - requirement_level: opt_in diff --git a/model/registry/deprecated/system.yaml b/model/system/deprecated/system-registry-deprecated.yaml similarity index 100% rename from model/registry/deprecated/system.yaml rename to model/system/deprecated/system-registry-deprecated.yaml diff --git a/model/registry/system.yaml b/model/system/system-registry.yaml similarity index 100% rename from model/registry/system.yaml rename to model/system/system-registry.yaml diff --git a/model/url.yaml b/model/url.yaml deleted file mode 100644 index 73fb91e274..0000000000 --- a/model/url.yaml +++ /dev/null @@ -1,12 +0,0 @@ -groups: - - id: url - brief: Attributes describing URL. - type: attribute_group - attributes: - - ref: url.scheme - - ref: url.full - tag: sensitive-information - - ref: url.path - - ref: url.query - tag: sensitive-information - - ref: url.fragment From 8e754bd69c375f4c2fe92a8e6702df8be35dcbaa Mon Sep 17 00:00:00 2001 From: Liudmila Molkova Date: Fri, 30 Aug 2024 16:06:00 -0700 Subject: [PATCH 03/14] clean up --- CONTRIBUTING.md | 18 ++++--- ...e-metrics.yaml => aspnetcore-metrics.yaml} | 0 ...registry.yaml => aspnetcore-registry.yaml} | 0 ...trel-metrics.yaml => kestrel-metrics.yaml} | 0 ...nalr-metrics.yaml => signalr-metrics.yaml} | 0 ...lr-registry.yaml => signalr-registry.yaml} | 0 model/general/general.yaml | 54 ------------------- model/general/network-common.yaml | 26 +++++++++ model/general/url-common.yaml | 12 +++++ .../graphql-registry.yaml | 0 model/{graphgq => graphgl}/graphql-spans.yml | 0 ...er-common.yaml => otel-status-common.yaml} | 0 .../andrioid/android-registry.yaml | 0 .../{ => andrioid}/android-resources.yaml | 0 .../android-registry-deprecated.yaml | 0 .../ecs.yaml => aws/aws-ecs-resources.yaml} | 0 .../eks.yaml => aws/aws-eks-resources.yaml} | 0 .../logs.yaml => aws/aws-logs-resources.yaml} | 0 .../{ => resource}/gcp/gcp-client-common.yml | 0 .../gcp-cloud-run-resources.yaml} | 0 .../gce.yaml => gcp/gcp-gce-resources.yaml} | 0 .../heroku-registry.yaml | 0 .../heroku-resources.yaml | 0 .../{ => telemetry}/telemetry-registry.yaml | 0 .../telemetry-resources-experimental.yaml | 0 .../{ => telemetry}/telemetry-resources.yaml | 0 model/session/session-common.yaml | 19 +++++++ .../session-registry.yaml | 0 model/{general => system}/linux-registry.yaml | 0 model/{resource => system}/os-registry.yaml | 0 30 files changed, 68 insertions(+), 61 deletions(-) rename model/dotnet/{dotnet-aspnetcore-metrics.yaml => aspnetcore-metrics.yaml} (100%) rename model/dotnet/{dotnet-aspnetcore-registry.yaml => aspnetcore-registry.yaml} (100%) rename model/dotnet/{dotnet-kestrel-metrics.yaml => kestrel-metrics.yaml} (100%) rename model/dotnet/{dotnet-signalr-metrics.yaml => signalr-metrics.yaml} (100%) rename model/dotnet/{dotnet-signalr-registry.yaml => signalr-registry.yaml} (100%) create mode 100644 model/general/network-common.yaml create mode 100644 model/general/url-common.yaml rename model/{graphgq => graphgl}/graphql-registry.yaml (100%) rename model/{graphgq => graphgl}/graphql-spans.yml (100%) rename model/otel/{otel-exporter-common.yaml => otel-status-common.yaml} (100%) rename model/{ => resource}/andrioid/android-registry.yaml (100%) rename model/resource/{ => andrioid}/android-resources.yaml (100%) rename model/{ => resource}/andrioid/deprecated/android-registry-deprecated.yaml (100%) rename model/resource/{cloud_provider/aws/ecs.yaml => aws/aws-ecs-resources.yaml} (100%) rename model/resource/{cloud_provider/aws/eks.yaml => aws/aws-eks-resources.yaml} (100%) rename model/resource/{cloud_provider/aws/logs.yaml => aws/aws-logs-resources.yaml} (100%) rename model/{ => resource}/gcp/gcp-client-common.yml (100%) rename model/resource/{cloud_provider/gcp/cloud_run.yaml => gcp/gcp-cloud-run-resources.yaml} (100%) rename model/resource/{cloud_provider/gcp/gce.yaml => gcp/gcp-gce-resources.yaml} (100%) rename model/resource/{cloud_provider => heroku}/heroku-registry.yaml (100%) rename model/resource/{cloud_provider => heroku}/heroku-resources.yaml (100%) rename model/resource/{ => telemetry}/telemetry-registry.yaml (100%) rename model/resource/{ => telemetry}/telemetry-resources-experimental.yaml (100%) rename model/resource/{ => telemetry}/telemetry-resources.yaml (100%) create mode 100644 model/session/session-common.yaml rename model/{general => session}/session-registry.yaml (100%) rename model/{general => system}/linux-registry.yaml (100%) rename model/{resource => system}/os-registry.yaml (100%) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2cc55a5399..99b6ab68c1 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -107,26 +107,30 @@ The YAML (model definition) and Markdown (documentation) files are organized in │ ├── {domain} │ │ ├── {domain}-events.yaml │ │ ├── {domain}-metrics.yaml -│ │ ├── {domain}-resources.yaml +│ │ ├── {domain}-registry.yaml │ │ ├── {domain}-spans.yaml -│ ├── registry -│ │ ├── {domain}.yaml +| ├── resources +│ │ ├── {domain}-resources.yaml +│ │ ├── {domain}-registry.yaml ``` -All attributes must be defined in the domain-specific file under `/model/registry`. +All attributes must be defined in the domain-specific folder under +`/{domain}/{domain}-registry` or `/resource/{domain}-registry.yaml`. + Corresponding markdown files are auto-generated (see [Update the markdown files](#2-update-the-markdown-files)) in `/docs/attribute_registry` folder. -Semantic conventions definitions for domain-specific signals should be placed under +All semantic conventions definitions for domain-specific signals should be placed under `/model/{domain}` and should follow `{domain}-{signal}.yaml` pattern. For example, HTTP spans are defined in `model/http/http-spans.yaml`. +Resources are considered to be their own domain and are defined in the `model/resources` +folder. + Domain-specific 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. - - #### Schema files When making changes to existing semantic conventions (attributes, metrics, etc) diff --git a/model/dotnet/dotnet-aspnetcore-metrics.yaml b/model/dotnet/aspnetcore-metrics.yaml similarity index 100% rename from model/dotnet/dotnet-aspnetcore-metrics.yaml rename to model/dotnet/aspnetcore-metrics.yaml diff --git a/model/dotnet/dotnet-aspnetcore-registry.yaml b/model/dotnet/aspnetcore-registry.yaml similarity index 100% rename from model/dotnet/dotnet-aspnetcore-registry.yaml rename to model/dotnet/aspnetcore-registry.yaml diff --git a/model/dotnet/dotnet-kestrel-metrics.yaml b/model/dotnet/kestrel-metrics.yaml similarity index 100% rename from model/dotnet/dotnet-kestrel-metrics.yaml rename to model/dotnet/kestrel-metrics.yaml diff --git a/model/dotnet/dotnet-signalr-metrics.yaml b/model/dotnet/signalr-metrics.yaml similarity index 100% rename from model/dotnet/dotnet-signalr-metrics.yaml rename to model/dotnet/signalr-metrics.yaml diff --git a/model/dotnet/dotnet-signalr-registry.yaml b/model/dotnet/signalr-registry.yaml similarity index 100% rename from model/dotnet/dotnet-signalr-registry.yaml rename to model/dotnet/signalr-registry.yaml diff --git a/model/general/general.yaml b/model/general/general.yaml index 9a77fc02a3..9e46073c7e 100644 --- a/model/general/general.yaml +++ b/model/general/general.yaml @@ -63,57 +63,3 @@ groups: - ref: code.column - ref: code.stacktrace requirement_level: opt_in - - id: url - brief: Attributes describing URL. - type: attribute_group - attributes: - - ref: url.scheme - - ref: url.full - tag: sensitive-information - - ref: url.path - - ref: url.query - tag: sensitive-information - - ref: url.fragment - - id: session-id - type: attribute_group - brief: > - Session is defined as the period of time encompassing all activities performed by the application and the actions - executed by the end user. - - Consequently, a Session is represented as a collection of Logs, Events, and Spans emitted by the Client Application - throughout the Session's duration. Each Session is assigned a unique identifier, which is included as an attribute in - the Logs, Events, and Spans generated during the Session's lifecycle. - - When a session reaches end of life, typically due to user inactivity or session timeout, a new session identifier - will be assigned. The previous session identifier may be provided by the instrumentation so that telemetry - backends can link the two sessions. - attributes: - - ref: session.id - requirement_level: opt_in - - ref: session.previous_id - requirement_level: opt_in - - id: network-core - type: attribute_group - brief: > - These attributes may be used for any network related operation. - attributes: - - ref: network.transport - - ref: network.type - - ref: network.protocol.name - - ref: network.protocol.version - - ref: network.peer.address - - ref: network.peer.port - - ref: network.local.address - - ref: network.local.port - - - id: network-connection-and-carrier - type: attribute_group - brief: > - These attributes may be used for any network related operation. - attributes: - - ref: network.connection.type - - ref: network.connection.subtype - - ref: network.carrier.name - - ref: network.carrier.mcc - - ref: network.carrier.mnc - - ref: network.carrier.icc diff --git a/model/general/network-common.yaml b/model/general/network-common.yaml new file mode 100644 index 0000000000..d346131cf3 --- /dev/null +++ b/model/general/network-common.yaml @@ -0,0 +1,26 @@ +groups: + - id: network-core + type: attribute_group + brief: > + These attributes may be used for any network related operation. + attributes: + - ref: network.transport + - ref: network.type + - ref: network.protocol.name + - ref: network.protocol.version + - ref: network.peer.address + - ref: network.peer.port + - ref: network.local.address + - ref: network.local.port + + - id: network-connection-and-carrier + type: attribute_group + brief: > + These attributes may be used for any network related operation. + attributes: + - ref: network.connection.type + - ref: network.connection.subtype + - ref: network.carrier.name + - ref: network.carrier.mcc + - ref: network.carrier.mnc + - ref: network.carrier.icc diff --git a/model/general/url-common.yaml b/model/general/url-common.yaml new file mode 100644 index 0000000000..73fb91e274 --- /dev/null +++ b/model/general/url-common.yaml @@ -0,0 +1,12 @@ +groups: + - id: url + brief: Attributes describing URL. + type: attribute_group + attributes: + - ref: url.scheme + - ref: url.full + tag: sensitive-information + - ref: url.path + - ref: url.query + tag: sensitive-information + - ref: url.fragment diff --git a/model/graphgq/graphql-registry.yaml b/model/graphgl/graphql-registry.yaml similarity index 100% rename from model/graphgq/graphql-registry.yaml rename to model/graphgl/graphql-registry.yaml diff --git a/model/graphgq/graphql-spans.yml b/model/graphgl/graphql-spans.yml similarity index 100% rename from model/graphgq/graphql-spans.yml rename to model/graphgl/graphql-spans.yml diff --git a/model/otel/otel-exporter-common.yaml b/model/otel/otel-status-common.yaml similarity index 100% rename from model/otel/otel-exporter-common.yaml rename to model/otel/otel-status-common.yaml diff --git a/model/andrioid/android-registry.yaml b/model/resource/andrioid/android-registry.yaml similarity index 100% rename from model/andrioid/android-registry.yaml rename to model/resource/andrioid/android-registry.yaml diff --git a/model/resource/android-resources.yaml b/model/resource/andrioid/android-resources.yaml similarity index 100% rename from model/resource/android-resources.yaml rename to model/resource/andrioid/android-resources.yaml diff --git a/model/andrioid/deprecated/android-registry-deprecated.yaml b/model/resource/andrioid/deprecated/android-registry-deprecated.yaml similarity index 100% rename from model/andrioid/deprecated/android-registry-deprecated.yaml rename to model/resource/andrioid/deprecated/android-registry-deprecated.yaml diff --git a/model/resource/cloud_provider/aws/ecs.yaml b/model/resource/aws/aws-ecs-resources.yaml similarity index 100% rename from model/resource/cloud_provider/aws/ecs.yaml rename to model/resource/aws/aws-ecs-resources.yaml diff --git a/model/resource/cloud_provider/aws/eks.yaml b/model/resource/aws/aws-eks-resources.yaml similarity index 100% rename from model/resource/cloud_provider/aws/eks.yaml rename to model/resource/aws/aws-eks-resources.yaml diff --git a/model/resource/cloud_provider/aws/logs.yaml b/model/resource/aws/aws-logs-resources.yaml similarity index 100% rename from model/resource/cloud_provider/aws/logs.yaml rename to model/resource/aws/aws-logs-resources.yaml diff --git a/model/gcp/gcp-client-common.yml b/model/resource/gcp/gcp-client-common.yml similarity index 100% rename from model/gcp/gcp-client-common.yml rename to model/resource/gcp/gcp-client-common.yml diff --git a/model/resource/cloud_provider/gcp/cloud_run.yaml b/model/resource/gcp/gcp-cloud-run-resources.yaml similarity index 100% rename from model/resource/cloud_provider/gcp/cloud_run.yaml rename to model/resource/gcp/gcp-cloud-run-resources.yaml diff --git a/model/resource/cloud_provider/gcp/gce.yaml b/model/resource/gcp/gcp-gce-resources.yaml similarity index 100% rename from model/resource/cloud_provider/gcp/gce.yaml rename to model/resource/gcp/gcp-gce-resources.yaml diff --git a/model/resource/cloud_provider/heroku-registry.yaml b/model/resource/heroku/heroku-registry.yaml similarity index 100% rename from model/resource/cloud_provider/heroku-registry.yaml rename to model/resource/heroku/heroku-registry.yaml diff --git a/model/resource/cloud_provider/heroku-resources.yaml b/model/resource/heroku/heroku-resources.yaml similarity index 100% rename from model/resource/cloud_provider/heroku-resources.yaml rename to model/resource/heroku/heroku-resources.yaml diff --git a/model/resource/telemetry-registry.yaml b/model/resource/telemetry/telemetry-registry.yaml similarity index 100% rename from model/resource/telemetry-registry.yaml rename to model/resource/telemetry/telemetry-registry.yaml diff --git a/model/resource/telemetry-resources-experimental.yaml b/model/resource/telemetry/telemetry-resources-experimental.yaml similarity index 100% rename from model/resource/telemetry-resources-experimental.yaml rename to model/resource/telemetry/telemetry-resources-experimental.yaml diff --git a/model/resource/telemetry-resources.yaml b/model/resource/telemetry/telemetry-resources.yaml similarity index 100% rename from model/resource/telemetry-resources.yaml rename to model/resource/telemetry/telemetry-resources.yaml diff --git a/model/session/session-common.yaml b/model/session/session-common.yaml new file mode 100644 index 0000000000..e01af0acef --- /dev/null +++ b/model/session/session-common.yaml @@ -0,0 +1,19 @@ +groups: + - id: session-id + type: attribute_group + brief: > + Session is defined as the period of time encompassing all activities performed by the application and the actions + executed by the end user. + + Consequently, a Session is represented as a collection of Logs, Events, and Spans emitted by the Client Application + throughout the Session's duration. Each Session is assigned a unique identifier, which is included as an attribute in + the Logs, Events, and Spans generated during the Session's lifecycle. + + When a session reaches end of life, typically due to user inactivity or session timeout, a new session identifier + will be assigned. The previous session identifier may be provided by the instrumentation so that telemetry + backends can link the two sessions. + attributes: + - ref: session.id + requirement_level: opt_in + - ref: session.previous_id + requirement_level: opt_in diff --git a/model/general/session-registry.yaml b/model/session/session-registry.yaml similarity index 100% rename from model/general/session-registry.yaml rename to model/session/session-registry.yaml diff --git a/model/general/linux-registry.yaml b/model/system/linux-registry.yaml similarity index 100% rename from model/general/linux-registry.yaml rename to model/system/linux-registry.yaml diff --git a/model/resource/os-registry.yaml b/model/system/os-registry.yaml similarity index 100% rename from model/resource/os-registry.yaml rename to model/system/os-registry.yaml From 026094539f3d0919ca71b9ad31c5abb8dd682a06 Mon Sep 17 00:00:00 2001 From: Liudmila Molkova Date: Fri, 30 Aug 2024 16:38:18 -0700 Subject: [PATCH 04/14] udpate areas generation --- .github/ISSUE_TEMPLATE/bug_report.yaml | 2 +- .github/ISSUE_TEMPLATE/change_proposal.yaml | 2 +- .github/ISSUE_TEMPLATE/new-conventions.yaml | 2 +- .github/workflows/scripts/get-registry-areas.sh | 16 ---------------- CONTRIBUTING.md | 1 + Makefile | 13 ++++++++++++- docs/azure/events.md | 2 +- .../tools/scripts/update-issue-template-areas.sh | 8 ++++++-- 8 files changed, 23 insertions(+), 23 deletions(-) delete mode 100755 .github/workflows/scripts/get-registry-areas.sh diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml index 4fb558fba2..3727362773 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -80,8 +80,8 @@ body: - area:thread - area:tls - area:url - - area:user-agent - area:user + - area:user-agent - area:v8js - area:vcs - area:webengine diff --git a/.github/ISSUE_TEMPLATE/change_proposal.yaml b/.github/ISSUE_TEMPLATE/change_proposal.yaml index 9c7d3646ed..66ca32a455 100644 --- a/.github/ISSUE_TEMPLATE/change_proposal.yaml +++ b/.github/ISSUE_TEMPLATE/change_proposal.yaml @@ -72,8 +72,8 @@ body: - area:thread - area:tls - area:url - - area:user-agent - area:user + - area:user-agent - area:v8js - area:vcs - area:webengine diff --git a/.github/ISSUE_TEMPLATE/new-conventions.yaml b/.github/ISSUE_TEMPLATE/new-conventions.yaml index f0d28f0055..815d472020 100644 --- a/.github/ISSUE_TEMPLATE/new-conventions.yaml +++ b/.github/ISSUE_TEMPLATE/new-conventions.yaml @@ -81,8 +81,8 @@ body: - area:thread - area:tls - area:url - - area:user-agent - area:user + - area:user-agent - area:v8js - area:vcs - area:webengine diff --git a/.github/workflows/scripts/get-registry-areas.sh b/.github/workflows/scripts/get-registry-areas.sh deleted file mode 100755 index b33c9b3c60..0000000000 --- a/.github/workflows/scripts/get-registry-areas.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env bash -# -# Copyright The OpenTelemetry Authors -# SPDX-License-Identifier: Apache-2.0 -# -# Get a list of the semantic conventions areas from the registry. - -CUR_DIRECTORY=$(dirname "$0") -REPO_DIR="$( cd "$CUR_DIRECTORY/../../../" && pwd )" -REGISTRY_DIR="$( cd "$REPO_DIR/model/registry" && pwd )" - -# Explicitly sort with `-d` (dictionary) so BSD and GNU work alike. -for entry in $(ls $REGISTRY_DIR | egrep '\.yaml$' | sort -d) -do - echo "$entry" -done diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 99b6ab68c1..48e025a90b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -15,6 +15,7 @@ requirements and recommendations. - [How to Contribute](#how-to-contribute) - [Prerequisites](#prerequisites) - [1. Modify the YAML model](#1-modify-the-yaml-model) + - [Code structure](#code-structure) - [Schema files](#schema-files) - [2. Update the markdown files](#2-update-the-markdown-files) - [Hugo frontmatter](#hugo-frontmatter) diff --git a/Makefile b/Makefile index 603c9b43ae..48ed678baa 100644 --- a/Makefile +++ b/Makefile @@ -210,7 +210,18 @@ chlog-update: $(CHLOGGEN) # files that have the "area" dropdown field .PHONY: generate-gh-issue-templates generate-gh-issue-templates: - $(TOOLS_DIR)/scripts/update-issue-template-areas.sh + docker run --rm \ + -u $(id -u ${USER}):$(id -g ${USER}) \ + --mount 'type=bind,source=$(PWD)/internal/tools/scripts,target=/home/weaver/templates,readonly' \ + --mount 'type=bind,source=$(PWD)/model,target=/home/weaver/source,readonly' \ + --mount 'type=bind,source=$(PWD)/internal/tools/bin,target=/home/weaver/target' \ + $(WEAVER_CONTAINER) registry generate \ + --registry=/home/weaver/source \ + --templates=/home/weaver/templates \ + --config=/home/weaver/templates/registry/areas-weaver.yaml \ + . \ + /home/weaver/target/ + $(TOOLS_DIR)/scripts/update-issue-template-areas.sh $(PWD)/internal/tools/bin/areas.txt # A previous iteration of calculating "LATEST_RELEASED_SEMCONV_VERSION" # relied on "git describe". However, that approach does not work with diff --git a/docs/azure/events.md b/docs/azure/events.md index dd3a6cd53c..efea277ff3 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/logs/azure.yaml) for the details. +See [Azure Resource Log definition](/model/azure/azure-logs.yaml) for the details. [DocumentStatus]: https://opentelemetry.io/docs/specs/otel/document-status diff --git a/internal/tools/scripts/update-issue-template-areas.sh b/internal/tools/scripts/update-issue-template-areas.sh index e905808a18..80ce20aa3c 100755 --- a/internal/tools/scripts/update-issue-template-areas.sh +++ b/internal/tools/scripts/update-issue-template-areas.sh @@ -24,16 +24,20 @@ REPO_DIR="$( cd "$CUR_DIRECTORY/../../../" && pwd )" GITHUB_DIR="$( cd "$REPO_DIR/.github/" && pwd )" TEMPLATES_DIR="$( cd "$GITHUB_DIR/ISSUE_TEMPLATE" && pwd )" -AREAS=$(sh "${GITHUB_DIR}/workflows/scripts/get-registry-areas.sh") +AREAS=$1 START_AREA_LIST="# Start semconv area list" END_AREA_LIST="# End semconv area list" replacement=" ${START_AREA_LIST}" +while IFS= read -r line; do + replacement="${replacement}\n$line" +done < ${AREAS} + for AREA in ${AREAS}; do LABEL_NAME=$(basename "${AREA}" .yaml) - replacement="${replacement}\n - area:${LABEL_NAME}" + done echo -e "\nStarting to replace areas in ISSUE_TEMPLATES:" From 55ab3007ca5f31f65bd13300116f76d84984b33e Mon Sep 17 00:00:00 2001 From: Liudmila Molkova Date: Fri, 30 Aug 2024 20:38:20 -0700 Subject: [PATCH 05/14] update issue template and label generation to resolve registry --- .../workflows/generate-registry-area-labels.yml | 14 +++++--------- Makefile | 16 ++++++++++++++++ .../scripts/generate-registry-area-labels.sh | 16 +++++++--------- .../tools/scripts/registry/areas-weaver.yaml | 13 +++++++++++++ internal/tools/scripts/registry/areas.md.j2 | 5 +++++ .../tools/scripts/update-issue-template-areas.sh | 7 +------ 6 files changed, 47 insertions(+), 24 deletions(-) rename {.github/workflows => internal/tools}/scripts/generate-registry-area-labels.sh (64%) mode change 100755 => 100644 create mode 100644 internal/tools/scripts/registry/areas-weaver.yaml create mode 100644 internal/tools/scripts/registry/areas.md.j2 diff --git a/.github/workflows/generate-registry-area-labels.yml b/.github/workflows/generate-registry-area-labels.yml index 58f3b62b3a..a3b9f9ce6b 100644 --- a/.github/workflows/generate-registry-area-labels.yml +++ b/.github/workflows/generate-registry-area-labels.yml @@ -3,9 +3,9 @@ on: push: branches: [main] paths: - - model/registry/** + - model/** - ./.github/workflows/generate-registry-area-labels.yml - - ./.github/workflows/scripts/generate-registry-area-labels.sh + - ./internal/tools/scripts/generate-registry-area-labels.sh workflow_dispatch: jobs: @@ -14,11 +14,7 @@ jobs: if: ${{ github.repository_owner == 'open-telemetry' }} steps: - uses: actions/checkout@v4 - - - name: Run update permissions - run: chmod +x ./.github/workflows/scripts/generate-registry-area-labels.sh - - name: Generate registry area labels - run: ./.github/workflows/scripts/generate-registry-area-labels.sh - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + make generate-registry-area-labels + diff --git a/Makefile b/Makefile index 48ed678baa..94f3b84cbb 100644 --- a/Makefile +++ b/Makefile @@ -223,6 +223,22 @@ generate-gh-issue-templates: /home/weaver/target/ $(TOOLS_DIR)/scripts/update-issue-template-areas.sh $(PWD)/internal/tools/bin/areas.txt +# Updates github labels for areas based on the root namespaces in the resolved registry +.PHONY: generate-registry-area-labels +update-registry-area-labels: + docker run --rm \ + -u $(id -u ${USER}):$(id -g ${USER}) \ + --mount 'type=bind,source=$(PWD)/internal/tools/scripts,target=/home/weaver/templates,readonly' \ + --mount 'type=bind,source=$(PWD)/model,target=/home/weaver/source,readonly' \ + --mount 'type=bind,source=$(PWD)/internal/tools/bin,target=/home/weaver/target' \ + $(WEAVER_CONTAINER) registry generate \ + --registry=/home/weaver/source \ + --templates=/home/weaver/templates \ + --config=/home/weaver/templates/registry/areas-weaver.yaml \ + . \ + /home/weaver/target/ + $(TOOLS_DIR)/scripts/generate-registry-area-labels.sh $(PWD)/internal/tools/bin/areas.txt + # A previous iteration of calculating "LATEST_RELEASED_SEMCONV_VERSION" # relied on "git describe". However, that approach does not work with # light-weight developer forks/branches that haven't synced tags. Hence the diff --git a/.github/workflows/scripts/generate-registry-area-labels.sh b/internal/tools/scripts/generate-registry-area-labels.sh old mode 100755 new mode 100644 similarity index 64% rename from .github/workflows/scripts/generate-registry-area-labels.sh rename to internal/tools/scripts/generate-registry-area-labels.sh index 3a2af777e6..63621a04dd --- a/.github/workflows/scripts/generate-registry-area-labels.sh +++ b/internal/tools/scripts/generate-registry-area-labels.sh @@ -12,21 +12,19 @@ set -euo pipefail CUR_DIRECTORY=$(dirname "$0") -AREAS=$(sh "${CUR_DIRECTORY}/get-registry-areas.sh") +AREAS=$1 echo -e "\nStarting to create area labels" echo -e "--------------------------------\n" -for AREA in ${AREAS}; do - LABEL_NAME=$(basename "${AREA}" .yaml) - - if (( "${#LABEL_NAME}" > 50 )); then - echo "'${LABEL_NAME}' exceeds GitHubs 50-character limit on labels, skipping" +while IFS= read -r label; do + if (( "${#label}" > 50 )); then + echo -e "Label $label exceeds GitHubs 50-character limit on labels, skipping" continue fi - echo "area:${LABEL_NAME}" - gh label create "area:${LABEL_NAME}" -c "#425cc7" --force -done + echo "$label" + gh label create "$label" -c "#425cc7" --force +done < ${AREAS} echo -e "\nLabels created successfully" echo -e "--------------------------------\n" diff --git a/internal/tools/scripts/registry/areas-weaver.yaml b/internal/tools/scripts/registry/areas-weaver.yaml new file mode 100644 index 0000000000..074629a1cf --- /dev/null +++ b/internal/tools/scripts/registry/areas-weaver.yaml @@ -0,0 +1,13 @@ +templates: + - pattern: areas.md.j2 + filter: > + semconv_grouped_attributes({"exclude_deprecated": true}) | .[].root_namespace + application_mode: single +whitespace_control: + trim_blocks: true + lstrip_blocks: true + keep_trailing_newline: true +text_maps: + areas: + az: azure + hw: hardware diff --git a/internal/tools/scripts/registry/areas.md.j2 b/internal/tools/scripts/registry/areas.md.j2 new file mode 100644 index 0000000000..f10bdea506 --- /dev/null +++ b/internal/tools/scripts/registry/areas.md.j2 @@ -0,0 +1,5 @@ +{{- template.set_file_name("areas.txt") -}} + +{% for item in ctx | map('map_text', 'areas') | sort %} +area:{{ item | kebab_case }} +{% endfor %} \ No newline at end of file diff --git a/internal/tools/scripts/update-issue-template-areas.sh b/internal/tools/scripts/update-issue-template-areas.sh index 80ce20aa3c..3b906dfc55 100755 --- a/internal/tools/scripts/update-issue-template-areas.sh +++ b/internal/tools/scripts/update-issue-template-areas.sh @@ -32,14 +32,9 @@ END_AREA_LIST="# End semconv area list" replacement=" ${START_AREA_LIST}" while IFS= read -r line; do - replacement="${replacement}\n$line" + replacement="${replacement}\n - $line" done < ${AREAS} -for AREA in ${AREAS}; do - LABEL_NAME=$(basename "${AREA}" .yaml) - -done - echo -e "\nStarting to replace areas in ISSUE_TEMPLATES:" echo -e "---------------------------------------------\n" From 452256796a4dbc04ce8dc3eacd4ee604a8f497e7 Mon Sep 17 00:00:00 2001 From: Liudmila Molkova Date: Fri, 30 Aug 2024 20:48:15 -0700 Subject: [PATCH 06/14] up --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 94f3b84cbb..51d1d6443f 100644 --- a/Makefile +++ b/Makefile @@ -210,17 +210,18 @@ chlog-update: $(CHLOGGEN) # files that have the "area" dropdown field .PHONY: generate-gh-issue-templates generate-gh-issue-templates: + mkdir -p $(TOOLS_DIR)/bin docker run --rm \ -u $(id -u ${USER}):$(id -g ${USER}) \ --mount 'type=bind,source=$(PWD)/internal/tools/scripts,target=/home/weaver/templates,readonly' \ --mount 'type=bind,source=$(PWD)/model,target=/home/weaver/source,readonly' \ - --mount 'type=bind,source=$(PWD)/internal/tools/bin,target=/home/weaver/target' \ + --mount 'type=bind,source=$(TOOLS_DIR)/bin,target=/home/weaver/target' \ $(WEAVER_CONTAINER) registry generate \ --registry=/home/weaver/source \ --templates=/home/weaver/templates \ --config=/home/weaver/templates/registry/areas-weaver.yaml \ . \ - /home/weaver/target/ + /home/weaver/target $(TOOLS_DIR)/scripts/update-issue-template-areas.sh $(PWD)/internal/tools/bin/areas.txt # Updates github labels for areas based on the root namespaces in the resolved registry From ca27e55f7f6b43fd0538fff988318839fef68fa1 Mon Sep 17 00:00:00 2001 From: Liudmila Molkova Date: Fri, 30 Aug 2024 20:52:03 -0700 Subject: [PATCH 07/14] up --- .github/workflows/generate-registry-area-labels.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/generate-registry-area-labels.yml b/.github/workflows/generate-registry-area-labels.yml index a3b9f9ce6b..cd1b089519 100644 --- a/.github/workflows/generate-registry-area-labels.yml +++ b/.github/workflows/generate-registry-area-labels.yml @@ -17,4 +17,3 @@ jobs: - name: Generate registry area labels run: | make generate-registry-area-labels - From d9d56c89cafa5101acb00911fd9116ae305dfb2f Mon Sep 17 00:00:00 2001 From: Liudmila Molkova Date: Sun, 15 Sep 2024 12:24:33 -0700 Subject: [PATCH 08/14] move to root namespace --- .../andrioid/android-registry.yaml | 0 .../andrioid/android-resources.yaml | 0 .../android-registry-deprecated.yaml | 0 .../aspnetcore-metrics.yaml | 0 .../aspnetcore-registry.yaml | 0 .../{resource => }/aws/aws-ecs-resources.yaml | 0 .../{resource => }/aws/aws-eks-resources.yaml | 0 .../aws/aws-logs-resources.yaml | 0 .../browser-registry.yaml | 0 .../browser-resources.yaml | 0 model/client/client-common.yaml | 8 +++ .../{general => client}/client-registry.yaml | 0 model/{resource => cloud}/cloud-registry.yaml | 0 .../{resource => cloud}/cloud-resources.yaml | 0 model/code/code-common.yaml | 13 ++++ model/{general => code}/code-registry.yaml | 0 .../container-resources.yaml | 0 model/{general => cpu}/cpu-registry.yaml | 0 .../deployment-registry.yaml | 0 .../deployment-resources.yaml | 0 .../deployment-registry-deprecated.yaml | 0 model/destination/destination-common.yaml | 8 +++ .../destination-registry.yaml | 0 .../device-events.yaml} | 0 .../{resource => device}/device-registry.yaml | 0 .../device-resources.yaml | 0 model/{general => disk}/disk-registry.yaml | 0 model/enduser/deprecated/enduser-common.yaml | 12 ++++ .../enduser-registry-deprecated.yaml | 0 model/{general => error}/error-registry.yaml | 0 .../events.yaml => event/event-common.yaml} | 0 model/{logs => event}/event-registry.yaml | 0 model/{resource => faas}/faas-resources.yaml | 0 model/{general => file}/file-registry.yaml | 0 .../{resource => }/gcp/gcp-client-common.yml | 0 .../gcp/gcp-cloud-run-resources.yaml | 0 .../{resource => }/gcp/gcp-gce-resources.yaml | 0 model/general/general.yaml | 65 ------------------- .../heroku/heroku-registry.yaml | 0 .../heroku/heroku-resources.yaml | 0 model/{resource => host}/host-registry.yaml | 0 model/{resource => host}/host-resources.yaml | 0 .../deprecated/ios-registry-deprecated.yaml | 0 model/{resource => k8s}/k8s-resources.yaml | 0 .../{dotnet => kestrel}/kestrel-metrics.yaml | 0 model/{system => linux}/linux-registry.yaml | 0 model/{logs/logs.yaml => log/log-common.yaml} | 0 model/{logs => log}/log-registry.yaml | 0 .../network-registry-deprecated.yaml | 0 .../{general => network}/network-common.yaml | 0 .../network-registry.yaml | 0 model/{js => nodejs}/nodejs-metrics.yaml | 0 model/{js => nodejs}/nodejs-registry.yaml | 0 model/{general => oci}/oci-registry.yaml | 0 model/{system => os}/os-registry.yaml | 0 model/{resource => os}/os-resources.yaml | 0 model/{resource => otel}/otel-resources.yaml | 0 model/peer/peer-common.yaml | 7 ++ model/{general => peer}/peer-registry.yaml | 0 .../process-resources.yaml | 0 model/profile/profile-common.yaml | 8 +++ model/profile/profile-registry.yaml | 63 ++++++++++++++++++ model/server/server-common.yaml | 8 +++ .../{general => server}/server-registry.yaml | 0 .../service-registry.yaml | 0 .../service-resources-experimental.yaml | 0 .../service-resources.yaml | 0 .../{dotnet => signalr}/signalr-metrics.yaml | 0 .../{dotnet => signalr}/signalr-registry.yaml | 0 model/source/source-common.yaml | 8 +++ .../{general => source}/source-registry.yaml | 0 .../telemetry/telemetry-registry.yaml | 0 .../telemetry-resources-experimental.yaml | 0 .../telemetry/telemetry-resources.yaml | 0 model/{general => test}/test-registry.yaml | 0 model/thread/thread-common.yaml | 8 +++ .../{general => thread}/thread-registry.yaml | 0 .../deprecated/tls-registry-deprecated.yaml | 0 model/{general => tls}/tls-registry.yaml | 0 model/{general => url}/url-common.yaml | 0 model/{general => url}/url-registry.yaml | 0 .../user-agent-registry.yaml | 0 model/{general => user}/user-registry.yaml | 0 model/{js => v8js}/v8js-metrics.yaml | 0 model/{js => v8js}/v8js-registry.yaml | 0 model/{general => vcs}/vcs-registry.yaml | 0 .../webengine-registry.yaml | 0 .../webengine-resources.yaml | 0 88 files changed, 143 insertions(+), 65 deletions(-) rename model/{resource => }/andrioid/android-registry.yaml (100%) rename model/{resource => }/andrioid/android-resources.yaml (100%) rename model/{resource => }/andrioid/deprecated/android-registry-deprecated.yaml (100%) rename model/{dotnet => aspnetcore}/aspnetcore-metrics.yaml (100%) rename model/{dotnet => aspnetcore}/aspnetcore-registry.yaml (100%) rename model/{resource => }/aws/aws-ecs-resources.yaml (100%) rename model/{resource => }/aws/aws-eks-resources.yaml (100%) rename model/{resource => }/aws/aws-logs-resources.yaml (100%) rename model/{resource => browser}/browser-registry.yaml (100%) rename model/{resource => browser}/browser-resources.yaml (100%) create mode 100644 model/client/client-common.yaml rename model/{general => client}/client-registry.yaml (100%) rename model/{resource => cloud}/cloud-registry.yaml (100%) rename model/{resource => cloud}/cloud-resources.yaml (100%) create mode 100644 model/code/code-common.yaml rename model/{general => code}/code-registry.yaml (100%) rename model/{resource => container}/container-resources.yaml (100%) rename model/{general => cpu}/cpu-registry.yaml (100%) rename model/{resource => deployment}/deployment-registry.yaml (100%) rename model/{resource => deployment}/deployment-resources.yaml (100%) rename model/{general => deployment}/deprecated/deployment-registry-deprecated.yaml (100%) create mode 100644 model/destination/destination-common.yaml rename model/{general => destination}/destination-registry.yaml (100%) rename model/{mobile/mobile-events.yaml => device/device-events.yaml} (100%) rename model/{resource => device}/device-registry.yaml (100%) rename model/{resource => device}/device-resources.yaml (100%) rename model/{general => disk}/disk-registry.yaml (100%) create mode 100644 model/enduser/deprecated/enduser-common.yaml rename model/{general => enduser}/deprecated/enduser-registry-deprecated.yaml (100%) rename model/{general => error}/error-registry.yaml (100%) rename model/{logs/events.yaml => event/event-common.yaml} (100%) rename model/{logs => event}/event-registry.yaml (100%) rename model/{resource => faas}/faas-resources.yaml (100%) rename model/{general => file}/file-registry.yaml (100%) rename model/{resource => }/gcp/gcp-client-common.yml (100%) rename model/{resource => }/gcp/gcp-cloud-run-resources.yaml (100%) rename model/{resource => }/gcp/gcp-gce-resources.yaml (100%) delete mode 100644 model/general/general.yaml rename model/{resource => }/heroku/heroku-registry.yaml (100%) rename model/{resource => }/heroku/heroku-resources.yaml (100%) rename model/{resource => host}/host-registry.yaml (100%) rename model/{resource => host}/host-resources.yaml (100%) rename model/{general => ios}/deprecated/ios-registry-deprecated.yaml (100%) rename model/{resource => k8s}/k8s-resources.yaml (100%) rename model/{dotnet => kestrel}/kestrel-metrics.yaml (100%) rename model/{system => linux}/linux-registry.yaml (100%) rename model/{logs/logs.yaml => log/log-common.yaml} (100%) rename model/{logs => log}/log-registry.yaml (100%) rename model/{general => network}/deprecated/network-registry-deprecated.yaml (100%) rename model/{general => network}/network-common.yaml (100%) rename model/{general => network}/network-registry.yaml (100%) rename model/{js => nodejs}/nodejs-metrics.yaml (100%) rename model/{js => nodejs}/nodejs-registry.yaml (100%) rename model/{general => oci}/oci-registry.yaml (100%) rename model/{system => os}/os-registry.yaml (100%) rename model/{resource => os}/os-resources.yaml (100%) rename model/{resource => otel}/otel-resources.yaml (100%) create mode 100644 model/peer/peer-common.yaml rename model/{general => peer}/peer-registry.yaml (100%) rename model/{resource => process}/process-resources.yaml (100%) create mode 100644 model/profile/profile-common.yaml create mode 100644 model/profile/profile-registry.yaml create mode 100644 model/server/server-common.yaml rename model/{general => server}/server-registry.yaml (100%) rename model/{resource => service}/service-registry.yaml (100%) rename model/{resource => service}/service-resources-experimental.yaml (100%) rename model/{resource => service}/service-resources.yaml (100%) rename model/{dotnet => signalr}/signalr-metrics.yaml (100%) rename model/{dotnet => signalr}/signalr-registry.yaml (100%) create mode 100644 model/source/source-common.yaml rename model/{general => source}/source-registry.yaml (100%) rename model/{resource => }/telemetry/telemetry-registry.yaml (100%) rename model/{resource => }/telemetry/telemetry-resources-experimental.yaml (100%) rename model/{resource => }/telemetry/telemetry-resources.yaml (100%) rename model/{general => test}/test-registry.yaml (100%) create mode 100644 model/thread/thread-common.yaml rename model/{general => thread}/thread-registry.yaml (100%) rename model/{general => tls}/deprecated/tls-registry-deprecated.yaml (100%) rename model/{general => tls}/tls-registry.yaml (100%) rename model/{general => url}/url-common.yaml (100%) rename model/{general => url}/url-registry.yaml (100%) rename model/{general => user-agent}/user-agent-registry.yaml (100%) rename model/{general => user}/user-registry.yaml (100%) rename model/{js => v8js}/v8js-metrics.yaml (100%) rename model/{js => v8js}/v8js-registry.yaml (100%) rename model/{general => vcs}/vcs-registry.yaml (100%) rename model/{resource => webengine}/webengine-registry.yaml (100%) rename model/{resource => webengine}/webengine-resources.yaml (100%) diff --git a/model/resource/andrioid/android-registry.yaml b/model/andrioid/android-registry.yaml similarity index 100% rename from model/resource/andrioid/android-registry.yaml rename to model/andrioid/android-registry.yaml diff --git a/model/resource/andrioid/android-resources.yaml b/model/andrioid/android-resources.yaml similarity index 100% rename from model/resource/andrioid/android-resources.yaml rename to model/andrioid/android-resources.yaml diff --git a/model/resource/andrioid/deprecated/android-registry-deprecated.yaml b/model/andrioid/deprecated/android-registry-deprecated.yaml similarity index 100% rename from model/resource/andrioid/deprecated/android-registry-deprecated.yaml rename to model/andrioid/deprecated/android-registry-deprecated.yaml diff --git a/model/dotnet/aspnetcore-metrics.yaml b/model/aspnetcore/aspnetcore-metrics.yaml similarity index 100% rename from model/dotnet/aspnetcore-metrics.yaml rename to model/aspnetcore/aspnetcore-metrics.yaml diff --git a/model/dotnet/aspnetcore-registry.yaml b/model/aspnetcore/aspnetcore-registry.yaml similarity index 100% rename from model/dotnet/aspnetcore-registry.yaml rename to model/aspnetcore/aspnetcore-registry.yaml diff --git a/model/resource/aws/aws-ecs-resources.yaml b/model/aws/aws-ecs-resources.yaml similarity index 100% rename from model/resource/aws/aws-ecs-resources.yaml rename to model/aws/aws-ecs-resources.yaml diff --git a/model/resource/aws/aws-eks-resources.yaml b/model/aws/aws-eks-resources.yaml similarity index 100% rename from model/resource/aws/aws-eks-resources.yaml rename to model/aws/aws-eks-resources.yaml diff --git a/model/resource/aws/aws-logs-resources.yaml b/model/aws/aws-logs-resources.yaml similarity index 100% rename from model/resource/aws/aws-logs-resources.yaml rename to model/aws/aws-logs-resources.yaml diff --git a/model/resource/browser-registry.yaml b/model/browser/browser-registry.yaml similarity index 100% rename from model/resource/browser-registry.yaml rename to model/browser/browser-registry.yaml diff --git a/model/resource/browser-resources.yaml b/model/browser/browser-resources.yaml similarity index 100% rename from model/resource/browser-resources.yaml rename to model/browser/browser-resources.yaml diff --git a/model/client/client-common.yaml b/model/client/client-common.yaml new file mode 100644 index 0000000000..02ef815ede --- /dev/null +++ b/model/client/client-common.yaml @@ -0,0 +1,8 @@ +groups: + - id: client + type: attribute_group + brief: > + General client attributes. + attributes: + - ref: client.address + - ref: client.port diff --git a/model/general/client-registry.yaml b/model/client/client-registry.yaml similarity index 100% rename from model/general/client-registry.yaml rename to model/client/client-registry.yaml diff --git a/model/resource/cloud-registry.yaml b/model/cloud/cloud-registry.yaml similarity index 100% rename from model/resource/cloud-registry.yaml rename to model/cloud/cloud-registry.yaml diff --git a/model/resource/cloud-resources.yaml b/model/cloud/cloud-resources.yaml similarity index 100% rename from model/resource/cloud-resources.yaml rename to model/cloud/cloud-resources.yaml diff --git a/model/code/code-common.yaml b/model/code/code-common.yaml new file mode 100644 index 0000000000..b90efeec96 --- /dev/null +++ b/model/code/code-common.yaml @@ -0,0 +1,13 @@ +groups: + - id: code + type: attribute_group + brief: > + These attributes allow to report this unit of code and therefore to provide more context about the span. + attributes: + - ref: code.function + - ref: code.namespace + - ref: code.filepath + - ref: code.lineno + - ref: code.column + - ref: code.stacktrace + requirement_level: opt_in diff --git a/model/general/code-registry.yaml b/model/code/code-registry.yaml similarity index 100% rename from model/general/code-registry.yaml rename to model/code/code-registry.yaml diff --git a/model/resource/container-resources.yaml b/model/container/container-resources.yaml similarity index 100% rename from model/resource/container-resources.yaml rename to model/container/container-resources.yaml diff --git a/model/general/cpu-registry.yaml b/model/cpu/cpu-registry.yaml similarity index 100% rename from model/general/cpu-registry.yaml rename to model/cpu/cpu-registry.yaml diff --git a/model/resource/deployment-registry.yaml b/model/deployment/deployment-registry.yaml similarity index 100% rename from model/resource/deployment-registry.yaml rename to model/deployment/deployment-registry.yaml diff --git a/model/resource/deployment-resources.yaml b/model/deployment/deployment-resources.yaml similarity index 100% rename from model/resource/deployment-resources.yaml rename to model/deployment/deployment-resources.yaml diff --git a/model/general/deprecated/deployment-registry-deprecated.yaml b/model/deployment/deprecated/deployment-registry-deprecated.yaml similarity index 100% rename from model/general/deprecated/deployment-registry-deprecated.yaml rename to model/deployment/deprecated/deployment-registry-deprecated.yaml diff --git a/model/destination/destination-common.yaml b/model/destination/destination-common.yaml new file mode 100644 index 0000000000..e45dd4e365 --- /dev/null +++ b/model/destination/destination-common.yaml @@ -0,0 +1,8 @@ +groups: + - id: destination + type: attribute_group + brief: > + General destination attributes. + attributes: + - ref: destination.address + - ref: destination.port diff --git a/model/general/destination-registry.yaml b/model/destination/destination-registry.yaml similarity index 100% rename from model/general/destination-registry.yaml rename to model/destination/destination-registry.yaml diff --git a/model/mobile/mobile-events.yaml b/model/device/device-events.yaml similarity index 100% rename from model/mobile/mobile-events.yaml rename to model/device/device-events.yaml diff --git a/model/resource/device-registry.yaml b/model/device/device-registry.yaml similarity index 100% rename from model/resource/device-registry.yaml rename to model/device/device-registry.yaml diff --git a/model/resource/device-resources.yaml b/model/device/device-resources.yaml similarity index 100% rename from model/resource/device-resources.yaml rename to model/device/device-resources.yaml diff --git a/model/general/disk-registry.yaml b/model/disk/disk-registry.yaml similarity index 100% rename from model/general/disk-registry.yaml rename to model/disk/disk-registry.yaml diff --git a/model/enduser/deprecated/enduser-common.yaml b/model/enduser/deprecated/enduser-common.yaml new file mode 100644 index 0000000000..e17dde1bec --- /dev/null +++ b/model/enduser/deprecated/enduser-common.yaml @@ -0,0 +1,12 @@ +groups: + - id: identity + type: attribute_group + brief: > + These attributes may be used for any operation with an authenticated and/or authorized enduser. + attributes: + - ref: enduser.id + requirement_level: recommended + - ref: enduser.role + requirement_level: recommended + - ref: enduser.scope + requirement_level: recommended diff --git a/model/general/deprecated/enduser-registry-deprecated.yaml b/model/enduser/deprecated/enduser-registry-deprecated.yaml similarity index 100% rename from model/general/deprecated/enduser-registry-deprecated.yaml rename to model/enduser/deprecated/enduser-registry-deprecated.yaml diff --git a/model/general/error-registry.yaml b/model/error/error-registry.yaml similarity index 100% rename from model/general/error-registry.yaml rename to model/error/error-registry.yaml diff --git a/model/logs/events.yaml b/model/event/event-common.yaml similarity index 100% rename from model/logs/events.yaml rename to model/event/event-common.yaml diff --git a/model/logs/event-registry.yaml b/model/event/event-registry.yaml similarity index 100% rename from model/logs/event-registry.yaml rename to model/event/event-registry.yaml diff --git a/model/resource/faas-resources.yaml b/model/faas/faas-resources.yaml similarity index 100% rename from model/resource/faas-resources.yaml rename to model/faas/faas-resources.yaml diff --git a/model/general/file-registry.yaml b/model/file/file-registry.yaml similarity index 100% rename from model/general/file-registry.yaml rename to model/file/file-registry.yaml diff --git a/model/resource/gcp/gcp-client-common.yml b/model/gcp/gcp-client-common.yml similarity index 100% rename from model/resource/gcp/gcp-client-common.yml rename to model/gcp/gcp-client-common.yml diff --git a/model/resource/gcp/gcp-cloud-run-resources.yaml b/model/gcp/gcp-cloud-run-resources.yaml similarity index 100% rename from model/resource/gcp/gcp-cloud-run-resources.yaml rename to model/gcp/gcp-cloud-run-resources.yaml diff --git a/model/resource/gcp/gcp-gce-resources.yaml b/model/gcp/gcp-gce-resources.yaml similarity index 100% rename from model/resource/gcp/gcp-gce-resources.yaml rename to model/gcp/gcp-gce-resources.yaml diff --git a/model/general/general.yaml b/model/general/general.yaml deleted file mode 100644 index 9e46073c7e..0000000000 --- a/model/general/general.yaml +++ /dev/null @@ -1,65 +0,0 @@ -groups: - - id: client - type: attribute_group - brief: > - General client attributes. - attributes: - - ref: client.address - - ref: client.port - - id: server - type: attribute_group - brief: > - General server attributes. - attributes: - - ref: server.address - - ref: server.port - - id: source - type: attribute_group - brief: > - General source attributes. - attributes: - - ref: source.address - - ref: source.port - - id: destination - type: attribute_group - brief: > - General destination attributes. - attributes: - - ref: destination.address - - ref: destination.port - - id: peer - type: attribute_group - brief: "Operations that access some remote service." - attributes: - - ref: peer.service - requirement_level: recommended - - id: identity - type: attribute_group - brief: > - These attributes may be used for any operation with an authenticated and/or authorized enduser. - attributes: - - ref: enduser.id - requirement_level: recommended - - ref: enduser.role - requirement_level: recommended - - ref: enduser.scope - requirement_level: recommended - - id: thread - type: attribute_group - brief: > - These attributes may be used for any operation to store information about a thread that started a span. - attributes: - - ref: thread.id - - ref: thread.name - - id: code - type: attribute_group - brief: > - These attributes allow to report this unit of code and therefore to provide more context about the span. - attributes: - - ref: code.function - - ref: code.namespace - - ref: code.filepath - - ref: code.lineno - - ref: code.column - - ref: code.stacktrace - requirement_level: opt_in diff --git a/model/resource/heroku/heroku-registry.yaml b/model/heroku/heroku-registry.yaml similarity index 100% rename from model/resource/heroku/heroku-registry.yaml rename to model/heroku/heroku-registry.yaml diff --git a/model/resource/heroku/heroku-resources.yaml b/model/heroku/heroku-resources.yaml similarity index 100% rename from model/resource/heroku/heroku-resources.yaml rename to model/heroku/heroku-resources.yaml diff --git a/model/resource/host-registry.yaml b/model/host/host-registry.yaml similarity index 100% rename from model/resource/host-registry.yaml rename to model/host/host-registry.yaml diff --git a/model/resource/host-resources.yaml b/model/host/host-resources.yaml similarity index 100% rename from model/resource/host-resources.yaml rename to model/host/host-resources.yaml diff --git a/model/general/deprecated/ios-registry-deprecated.yaml b/model/ios/deprecated/ios-registry-deprecated.yaml similarity index 100% rename from model/general/deprecated/ios-registry-deprecated.yaml rename to model/ios/deprecated/ios-registry-deprecated.yaml diff --git a/model/resource/k8s-resources.yaml b/model/k8s/k8s-resources.yaml similarity index 100% rename from model/resource/k8s-resources.yaml rename to model/k8s/k8s-resources.yaml diff --git a/model/dotnet/kestrel-metrics.yaml b/model/kestrel/kestrel-metrics.yaml similarity index 100% rename from model/dotnet/kestrel-metrics.yaml rename to model/kestrel/kestrel-metrics.yaml diff --git a/model/system/linux-registry.yaml b/model/linux/linux-registry.yaml similarity index 100% rename from model/system/linux-registry.yaml rename to model/linux/linux-registry.yaml diff --git a/model/logs/logs.yaml b/model/log/log-common.yaml similarity index 100% rename from model/logs/logs.yaml rename to model/log/log-common.yaml diff --git a/model/logs/log-registry.yaml b/model/log/log-registry.yaml similarity index 100% rename from model/logs/log-registry.yaml rename to model/log/log-registry.yaml diff --git a/model/general/deprecated/network-registry-deprecated.yaml b/model/network/deprecated/network-registry-deprecated.yaml similarity index 100% rename from model/general/deprecated/network-registry-deprecated.yaml rename to model/network/deprecated/network-registry-deprecated.yaml diff --git a/model/general/network-common.yaml b/model/network/network-common.yaml similarity index 100% rename from model/general/network-common.yaml rename to model/network/network-common.yaml diff --git a/model/general/network-registry.yaml b/model/network/network-registry.yaml similarity index 100% rename from model/general/network-registry.yaml rename to model/network/network-registry.yaml diff --git a/model/js/nodejs-metrics.yaml b/model/nodejs/nodejs-metrics.yaml similarity index 100% rename from model/js/nodejs-metrics.yaml rename to model/nodejs/nodejs-metrics.yaml diff --git a/model/js/nodejs-registry.yaml b/model/nodejs/nodejs-registry.yaml similarity index 100% rename from model/js/nodejs-registry.yaml rename to model/nodejs/nodejs-registry.yaml diff --git a/model/general/oci-registry.yaml b/model/oci/oci-registry.yaml similarity index 100% rename from model/general/oci-registry.yaml rename to model/oci/oci-registry.yaml diff --git a/model/system/os-registry.yaml b/model/os/os-registry.yaml similarity index 100% rename from model/system/os-registry.yaml rename to model/os/os-registry.yaml diff --git a/model/resource/os-resources.yaml b/model/os/os-resources.yaml similarity index 100% rename from model/resource/os-resources.yaml rename to model/os/os-resources.yaml diff --git a/model/resource/otel-resources.yaml b/model/otel/otel-resources.yaml similarity index 100% rename from model/resource/otel-resources.yaml rename to model/otel/otel-resources.yaml diff --git a/model/peer/peer-common.yaml b/model/peer/peer-common.yaml new file mode 100644 index 0000000000..53807af234 --- /dev/null +++ b/model/peer/peer-common.yaml @@ -0,0 +1,7 @@ +groups: + - id: peer + type: attribute_group + brief: "Operations that access some remote service." + attributes: + - ref: peer.service + requirement_level: recommended diff --git a/model/general/peer-registry.yaml b/model/peer/peer-registry.yaml similarity index 100% rename from model/general/peer-registry.yaml rename to model/peer/peer-registry.yaml diff --git a/model/resource/process-resources.yaml b/model/process/process-resources.yaml similarity index 100% rename from model/resource/process-resources.yaml rename to model/process/process-resources.yaml diff --git a/model/profile/profile-common.yaml b/model/profile/profile-common.yaml new file mode 100644 index 0000000000..2c7994adfc --- /dev/null +++ b/model/profile/profile-common.yaml @@ -0,0 +1,8 @@ +groups: + - id: profile.frame + type: attribute_group + brief: > + Describes the origin of a single frame in a Profile. + attributes: + - ref: profile.frame.type + requirement_level: recommended diff --git a/model/profile/profile-registry.yaml b/model/profile/profile-registry.yaml new file mode 100644 index 0000000000..8bbac2ef51 --- /dev/null +++ b/model/profile/profile-registry.yaml @@ -0,0 +1,63 @@ +groups: + + - id: registry.profile.frame + type: attribute_group + brief: > + Describes the origin of a single frame in a Profile. + attributes: + - id: profile.frame.type + stability: experimental + brief: > + Describes the interpreter or compiler of a single frame. + examples: ['cpython'] + type: + allow_custom_values: true + members: + - id: dotnet + brief: > + [.NET](https://wikipedia.org/wiki/.NET) + value: "dotnet" + stability: experimental + - id: jvm + brief: > + [JVM](https://wikipedia.org/wiki/Java_virtual_machine) + value: "jvm" + stability: experimental + - id: kernel + brief: > + [Kernel](https://wikipedia.org/wiki/Kernel_(operating_system)) + value: "kernel" + stability: experimental + - id: native + brief: > + [C](https://wikipedia.org/wiki/C_(programming_language)), + [C++](https://wikipedia.org/wiki/C%2B%2B), + [Go](https://wikipedia.org/wiki/Go_(programming_language)), + [Rust](https://wikipedia.org/wiki/Rust_(programming_language)) + value: "native" + stability: experimental + - id: perl + brief: > + [Perl](https://wikipedia.org/wiki/Perl) + value: "perl" + stability: experimental + - id: php + brief: > + [PHP](https://wikipedia.org/wiki/PHP) + value: "php" + stability: experimental + - id: cpython + brief: > + [Python](https://wikipedia.org/wiki/Python_(programming_language)) + value: "cpython" + stability: experimental + - id: ruby + brief: > + [Ruby](https://wikipedia.org/wiki/Ruby_(programming_language)) + value: "ruby" + stability: experimental + - id: v8js + brief: > + [V8JS](https://wikipedia.org/wiki/V8_(JavaScript_engine)) + value: "v8js" + stability: experimental diff --git a/model/server/server-common.yaml b/model/server/server-common.yaml new file mode 100644 index 0000000000..08806f02b3 --- /dev/null +++ b/model/server/server-common.yaml @@ -0,0 +1,8 @@ +groups: + - id: server + type: attribute_group + brief: > + General server attributes. + attributes: + - ref: server.address + - ref: server.port diff --git a/model/general/server-registry.yaml b/model/server/server-registry.yaml similarity index 100% rename from model/general/server-registry.yaml rename to model/server/server-registry.yaml diff --git a/model/resource/service-registry.yaml b/model/service/service-registry.yaml similarity index 100% rename from model/resource/service-registry.yaml rename to model/service/service-registry.yaml diff --git a/model/resource/service-resources-experimental.yaml b/model/service/service-resources-experimental.yaml similarity index 100% rename from model/resource/service-resources-experimental.yaml rename to model/service/service-resources-experimental.yaml diff --git a/model/resource/service-resources.yaml b/model/service/service-resources.yaml similarity index 100% rename from model/resource/service-resources.yaml rename to model/service/service-resources.yaml diff --git a/model/dotnet/signalr-metrics.yaml b/model/signalr/signalr-metrics.yaml similarity index 100% rename from model/dotnet/signalr-metrics.yaml rename to model/signalr/signalr-metrics.yaml diff --git a/model/dotnet/signalr-registry.yaml b/model/signalr/signalr-registry.yaml similarity index 100% rename from model/dotnet/signalr-registry.yaml rename to model/signalr/signalr-registry.yaml diff --git a/model/source/source-common.yaml b/model/source/source-common.yaml new file mode 100644 index 0000000000..5644041e24 --- /dev/null +++ b/model/source/source-common.yaml @@ -0,0 +1,8 @@ +groups: + - id: source + type: attribute_group + brief: > + General source attributes. + attributes: + - ref: source.address + - ref: source.port diff --git a/model/general/source-registry.yaml b/model/source/source-registry.yaml similarity index 100% rename from model/general/source-registry.yaml rename to model/source/source-registry.yaml diff --git a/model/resource/telemetry/telemetry-registry.yaml b/model/telemetry/telemetry-registry.yaml similarity index 100% rename from model/resource/telemetry/telemetry-registry.yaml rename to model/telemetry/telemetry-registry.yaml diff --git a/model/resource/telemetry/telemetry-resources-experimental.yaml b/model/telemetry/telemetry-resources-experimental.yaml similarity index 100% rename from model/resource/telemetry/telemetry-resources-experimental.yaml rename to model/telemetry/telemetry-resources-experimental.yaml diff --git a/model/resource/telemetry/telemetry-resources.yaml b/model/telemetry/telemetry-resources.yaml similarity index 100% rename from model/resource/telemetry/telemetry-resources.yaml rename to model/telemetry/telemetry-resources.yaml diff --git a/model/general/test-registry.yaml b/model/test/test-registry.yaml similarity index 100% rename from model/general/test-registry.yaml rename to model/test/test-registry.yaml diff --git a/model/thread/thread-common.yaml b/model/thread/thread-common.yaml new file mode 100644 index 0000000000..572fb26996 --- /dev/null +++ b/model/thread/thread-common.yaml @@ -0,0 +1,8 @@ +groups: + - id: thread + type: attribute_group + brief: > + These attributes may be used for any operation to store information about a thread that started a span. + attributes: + - ref: thread.id + - ref: thread.name diff --git a/model/general/thread-registry.yaml b/model/thread/thread-registry.yaml similarity index 100% rename from model/general/thread-registry.yaml rename to model/thread/thread-registry.yaml diff --git a/model/general/deprecated/tls-registry-deprecated.yaml b/model/tls/deprecated/tls-registry-deprecated.yaml similarity index 100% rename from model/general/deprecated/tls-registry-deprecated.yaml rename to model/tls/deprecated/tls-registry-deprecated.yaml diff --git a/model/general/tls-registry.yaml b/model/tls/tls-registry.yaml similarity index 100% rename from model/general/tls-registry.yaml rename to model/tls/tls-registry.yaml diff --git a/model/general/url-common.yaml b/model/url/url-common.yaml similarity index 100% rename from model/general/url-common.yaml rename to model/url/url-common.yaml diff --git a/model/general/url-registry.yaml b/model/url/url-registry.yaml similarity index 100% rename from model/general/url-registry.yaml rename to model/url/url-registry.yaml diff --git a/model/general/user-agent-registry.yaml b/model/user-agent/user-agent-registry.yaml similarity index 100% rename from model/general/user-agent-registry.yaml rename to model/user-agent/user-agent-registry.yaml diff --git a/model/general/user-registry.yaml b/model/user/user-registry.yaml similarity index 100% rename from model/general/user-registry.yaml rename to model/user/user-registry.yaml diff --git a/model/js/v8js-metrics.yaml b/model/v8js/v8js-metrics.yaml similarity index 100% rename from model/js/v8js-metrics.yaml rename to model/v8js/v8js-metrics.yaml diff --git a/model/js/v8js-registry.yaml b/model/v8js/v8js-registry.yaml similarity index 100% rename from model/js/v8js-registry.yaml rename to model/v8js/v8js-registry.yaml diff --git a/model/general/vcs-registry.yaml b/model/vcs/vcs-registry.yaml similarity index 100% rename from model/general/vcs-registry.yaml rename to model/vcs/vcs-registry.yaml diff --git a/model/resource/webengine-registry.yaml b/model/webengine/webengine-registry.yaml similarity index 100% rename from model/resource/webengine-registry.yaml rename to model/webengine/webengine-registry.yaml diff --git a/model/resource/webengine-resources.yaml b/model/webengine/webengine-resources.yaml similarity index 100% rename from model/resource/webengine-resources.yaml rename to model/webengine/webengine-resources.yaml From d90f760750d60c9f0a0862360dc7fcb8646767b3 Mon Sep 17 00:00:00 2001 From: Liudmila Molkova Date: Sun, 15 Sep 2024 12:29:38 -0700 Subject: [PATCH 09/14] update contributing.md --- CONTRIBUTING.md | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 48e025a90b..29e3345c48 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -101,36 +101,30 @@ The YAML (model definition) and Markdown (documentation) files are organized in ``` ├── docs │ ├── attribute_registry -│ ├── {domain} +│ ├── {root-namespace} │ │ ├── README.md │ │ ├── ....md ├── model -│ ├── {domain} -│ │ ├── {domain}-events.yaml -│ │ ├── {domain}-metrics.yaml -│ │ ├── {domain}-registry.yaml -│ │ ├── {domain}-spans.yaml -| ├── resources -│ │ ├── {domain}-resources.yaml -│ │ ├── {domain}-registry.yaml +│ ├── {root-namespace} +│ │ ├── {root-namespace}-events.yaml +│ │ ├── {root-namespace}-metrics.yaml +│ │ ├── {root-namespace}-spans.yaml +│ │ ├── {root-namespace}-registry.yaml +│ │ ├── {root-namespace}-resources.yaml ``` -All attributes must be defined in the domain-specific folder under -`/{domain}/{domain}-registry` or `/resource/{domain}-registry.yaml`. +All attributes must be defined in the folder matching its root namespace under +`/{root-namespace}/{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 domain-specific signals should be placed under -`/model/{domain}` and should follow `{domain}-{signal}.yaml` pattern. For example, +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`. -Resources are considered to be their own domain and are defined in the `model/resources` -folder. - -Domain-specific 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. +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. #### Schema files From 6150e50f75b89a74ae90afdd7765e4c2f7a15d65 Mon Sep 17 00:00:00 2001 From: Liudmila Molkova Date: Sun, 15 Sep 2024 12:47:18 -0700 Subject: [PATCH 10/14] fix makefile --- .github/ISSUE_TEMPLATE/bug_report.yaml | 2 +- .github/ISSUE_TEMPLATE/change_proposal.yaml | 2 +- .github/ISSUE_TEMPLATE/new-conventions.yaml | 2 +- .../workflows/generate-registry-area-labels.yml | 13 +++++++++++-- .../scripts/generate-registry-area-labels.sh | 0 Makefile | 16 ---------------- 6 files changed, 14 insertions(+), 21 deletions(-) rename {internal/tools => .github/workflows}/scripts/generate-registry-area-labels.sh (100%) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml index 3727362773..d0efd84320 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yaml +++ b/.github/ISSUE_TEMPLATE/bug_report.yaml @@ -28,8 +28,8 @@ body: - area:browser - area:cicd - area:client - - area:cloudevents - area:cloud + - area:cloudevents - area:code - area:container - area:cpu diff --git a/.github/ISSUE_TEMPLATE/change_proposal.yaml b/.github/ISSUE_TEMPLATE/change_proposal.yaml index 66ca32a455..206cc1c715 100644 --- a/.github/ISSUE_TEMPLATE/change_proposal.yaml +++ b/.github/ISSUE_TEMPLATE/change_proposal.yaml @@ -20,8 +20,8 @@ body: - area:browser - area:cicd - area:client - - area:cloudevents - area:cloud + - area:cloudevents - area:code - area:container - area:cpu diff --git a/.github/ISSUE_TEMPLATE/new-conventions.yaml b/.github/ISSUE_TEMPLATE/new-conventions.yaml index 815d472020..1c9cfe8ef9 100644 --- a/.github/ISSUE_TEMPLATE/new-conventions.yaml +++ b/.github/ISSUE_TEMPLATE/new-conventions.yaml @@ -29,8 +29,8 @@ body: - area:browser - area:cicd - area:client - - area:cloudevents - area:cloud + - area:cloudevents - area:code - area:container - area:cpu diff --git a/.github/workflows/generate-registry-area-labels.yml b/.github/workflows/generate-registry-area-labels.yml index cd1b089519..1b8ea3a59d 100644 --- a/.github/workflows/generate-registry-area-labels.yml +++ b/.github/workflows/generate-registry-area-labels.yml @@ -5,7 +5,8 @@ on: paths: - model/** - ./.github/workflows/generate-registry-area-labels.yml - - ./internal/tools/scripts/generate-registry-area-labels.sh + - ./.github/workflows/scripts/generate-registry-area-labels.sh + workflow_dispatch: jobs: @@ -16,4 +17,12 @@ jobs: - uses: actions/checkout@v4 - name: Generate registry area labels run: | - make generate-registry-area-labels + make generate-gh-issue-templates + + - name: Run update permissions + run: chmod +x ./.github/workflows/scripts/generate-registry-area-labels.sh + + - name: Generate registry area labels + run: ./.github/workflows/scripts/generate-registry-area-labels.sh + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/internal/tools/scripts/generate-registry-area-labels.sh b/.github/workflows/scripts/generate-registry-area-labels.sh similarity index 100% rename from internal/tools/scripts/generate-registry-area-labels.sh rename to .github/workflows/scripts/generate-registry-area-labels.sh diff --git a/Makefile b/Makefile index 51d1d6443f..3f9eba31c4 100644 --- a/Makefile +++ b/Makefile @@ -224,22 +224,6 @@ generate-gh-issue-templates: /home/weaver/target $(TOOLS_DIR)/scripts/update-issue-template-areas.sh $(PWD)/internal/tools/bin/areas.txt -# Updates github labels for areas based on the root namespaces in the resolved registry -.PHONY: generate-registry-area-labels -update-registry-area-labels: - docker run --rm \ - -u $(id -u ${USER}):$(id -g ${USER}) \ - --mount 'type=bind,source=$(PWD)/internal/tools/scripts,target=/home/weaver/templates,readonly' \ - --mount 'type=bind,source=$(PWD)/model,target=/home/weaver/source,readonly' \ - --mount 'type=bind,source=$(PWD)/internal/tools/bin,target=/home/weaver/target' \ - $(WEAVER_CONTAINER) registry generate \ - --registry=/home/weaver/source \ - --templates=/home/weaver/templates \ - --config=/home/weaver/templates/registry/areas-weaver.yaml \ - . \ - /home/weaver/target/ - $(TOOLS_DIR)/scripts/generate-registry-area-labels.sh $(PWD)/internal/tools/bin/areas.txt - # A previous iteration of calculating "LATEST_RELEASED_SEMCONV_VERSION" # relied on "git describe". However, that approach does not work with # light-weight developer forks/branches that haven't synced tags. Hence the From 43074ebc3fdb4eb9730fa132196109e9229f81df Mon Sep 17 00:00:00 2001 From: Liudmila Molkova Date: Sun, 15 Sep 2024 13:05:54 -0700 Subject: [PATCH 11/14] update codeowners --- .github/CODEOWNERS | 98 ++++++++++++++++++++-------------------------- 1 file changed, 43 insertions(+), 55 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 9be2aef1a2..8be4e75d02 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -16,85 +16,73 @@ * @open-telemetry/specs-semconv-maintainers @open-telemetry/specs-semconv-approvers # Schemas and schema file tooling -/schemas/ @open-telemetry/specs-semconv-approvers @tigrannajaryan -/internal/tools/schema_check.sh @open-telemetry/specs-semconv-approvers @tigrannajaryan +/schemas/ @open-telemetry/specs-semconv-approvers @tigrannajaryan +/internal/tools/schema_check.sh @open-telemetry/specs-semconv-approvers @tigrannajaryan # Logs semantic conventions -/model/logs/ @open-telemetry/specs-semconv-approvers @tigrannajaryan /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 # JVM semantic conventions approvers -/model/metrics/jvm-* @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-jvm-approvers -/docs/jvm/ @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-jvm-approvers +/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 -/model/metrics/http.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers -/model/trace/http.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers -/model/registry/http.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers -/model/registry/server.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers -/model/registry/client.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers -/model/registry/network.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers @open-telemetry/semconv-security-approvers -/model/registry/error.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers -/model/registry/url.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers -/model/registry/user-agent.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers -/docs/http/ @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers +/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/server-registry.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers +/model/client/client-registry.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers +/model/network/network-registry.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers @open-telemetry/semconv-security-approvers +/model/error/error-registry.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers +/model/url/url-registry.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers +/model/user-agent/user-agent-registry.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers # System semantic conventions approvers -/docs/system/ @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-system-approvers -/model/metrics/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/resource/host.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-system-approvers +/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/system/ @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-system-approvers +/model/host/host-registry.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-system-approvers # Mobile semantic conventions approvers -/docs/mobile/ @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-mobile-approvers -/model/logs/mobile* @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-mobile-approvers +/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 # K8s semantic conventions approvers -/docs/resource/k8s.md @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-k8s-approvers -/model/resource/k8s.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-k8s-approvers -/model/registry/k8s.yaml @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 # Container semantic conventions approvers -/docs/resource/container.md @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-container-approvers -/model/resource/container.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-container-approvers -/model/registry/container.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-container-approvers -/model/registry/oci.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-container-approvers +/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 -/model/metrics/dotnet/ @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-dotnet-approver @open-telemetry/semconv-http-approvers -/model/registry/aspnetcore.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-dotnet-approver @open-telemetry/semconv-http-approvers -/model/registry/signalr.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-dotnet-approver @open-telemetry/semconv-http-approvers -/docs/dotnet/ @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-dotnet-approver @open-telemetry/semconv-http-approvers -/model/metrics/dotnet-metrics.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-dotnet-approver -/model/registry/dotnet.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-dotnet-approver -/docs/runtime/dotnet-metrics.md @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-dotnet-approver +/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 -/model/registry/gen-ai.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-llm-approvers -/model/metrics/gen-ai.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-llm-approvers -/model/trace/gen-ai.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-llm-approvers -/docs/gen-ai/ @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-llm-approvers +/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 -/model/registry/file.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-security-approvers -/model/registry/dns.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-security-approvers -/model/registry/process.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-security-approvers -/model/registry/tls.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-security-approvers -/model/registry/user.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-security-approvers - -/model/metrics/dns.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-security-approvers -/model/metrics/process-metrics.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-security-approvers -/model/resource/process.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-security-approvers -/model/network.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-security-approvers +/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/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/user-registry.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-security-approvers # CICD semantic conventions approvers -/model/registry/artifact.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-cicd-approvers -/model/registry/cicd.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-cicd-approvers -/model/registry/code.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-cicd-approvers -/model/registry/deployment.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-cicd-approvers -/model/registry/test.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-cicd-approvers -/model/registry/vcs.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-cicd-approvers +/model/cicd/ @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/artifact-registry.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-cicd-approvers +/model/code/code-registry.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-cicd-approvers +/model/deployment/deployment-registry.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-cicd-approvers From b656d8d2414db224c4cfce5b6d1effa30fbdd0d8 Mon Sep 17 00:00:00 2001 From: Liudmila Molkova Date: Sun, 15 Sep 2024 13:17:21 -0700 Subject: [PATCH 12/14] update codeowners --- .github/CODEOWNERS | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 8be4e75d02..b93c808dcd 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -28,24 +28,24 @@ /model/log/ @open-telemetry/specs-semconv-approvers @tigrannajaryan # JVM semantic conventions approvers -/docs/jvm/ @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-jvm-approvers -/model/jvm/ @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-jvm-approvers +/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 -/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/server-registry.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers -/model/client/client-registry.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers -/model/network/network-registry.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers @open-telemetry/semconv-security-approvers -/model/error/error-registry.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers -/model/url/url-registry.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers -/model/user-agent/user-agent-registry.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-http-approvers +/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 # System semantic conventions approvers /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/system/ @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-system-approvers -/model/host/host-registry.yaml @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 /docs/mobile/ @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-mobile-approvers @@ -77,12 +77,12 @@ /model/network/ @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-security-approvers /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/user-registry.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-security-approvers +/model/user/*-registry.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-security-approvers # CICD semantic conventions approvers -/model/cicd/ @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/artifact-registry.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-cicd-approvers -/model/code/code-registry.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-cicd-approvers -/model/deployment/deployment-registry.yaml @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-cicd-approvers +/model/cicd/ @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 From a5dfa70ab86e1db64f624235c94d87d2749fa769 Mon Sep 17 00:00:00 2001 From: Liudmila Molkova Date: Sun, 15 Sep 2024 13:20:59 -0700 Subject: [PATCH 13/14] up --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 29e3345c48..cc984d2902 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -108,9 +108,9 @@ The YAML (model definition) and Markdown (documentation) files are organized in │ ├── {root-namespace} │ │ ├── {root-namespace}-events.yaml │ │ ├── {root-namespace}-metrics.yaml -│ │ ├── {root-namespace}-spans.yaml │ │ ├── {root-namespace}-registry.yaml │ │ ├── {root-namespace}-resources.yaml +│ │ ├── {root-namespace}-spans.yaml ``` All attributes must be defined in the folder matching its root namespace under From b8b178d020aceb804ea4c86d44852f412b42ba77 Mon Sep 17 00:00:00 2001 From: Liudmila Molkova Date: Mon, 16 Sep 2024 11:41:22 -0700 Subject: [PATCH 14/14] codeowners and remove folder name from path --- .github/CODEOWNERS | 49 ++++++++++--------- CONTRIBUTING.md | 20 ++++---- docs/azure/events.md | 2 +- ...precated.yaml => registry-deprecated.yaml} | 0 .../{android-registry.yaml => registry.yaml} | 0 ...{android-resources.yaml => resources.yaml} | 0 .../{artifact-registry.yaml => registry.yaml} | 0 .../{aspnetcore-metrics.yaml => metrics.yaml} | 0 ...aspnetcore-registry.yaml => registry.yaml} | 0 ...-ecs-resources.yaml => ecs-resources.yaml} | 0 ...-eks-resources.yaml => eks-resources.yaml} | 0 ...ws-lambda-spans.yaml => lambda-spans.yaml} | 0 ...ogs-resources.yaml => logs-resources.yaml} | 0 .../aws/{aws-registry.yaml => registry.yaml} | 0 .../aws/{aws-sdk-spans.yml => sdk-spans.yml} | 0 model/azure/{azure-logs.yaml => logs.yaml} | 0 .../{azure-registry.yaml => registry.yaml} | 0 .../{browser-registry.yaml => registry.yaml} | 0 ...{browser-resources.yaml => resources.yaml} | 0 .../{cicd-registry.yaml => registry.yaml} | 0 .../{client-common.yaml => common.yaml} | 0 .../{client-registry.yaml => registry.yaml} | 0 .../{cloud-registry.yaml => registry.yaml} | 0 .../{cloud-resources.yaml => resources.yaml} | 0 ...loudevents-registry.yaml => registry.yaml} | 0 .../{cloudevents-spans.yaml => spans.yaml} | 0 model/code/{code-common.yaml => common.yaml} | 0 .../{code-registry.yaml => registry.yaml} | 0 ...precated.yaml => registry-deprecated.yaml} | 0 .../{container-metrics.yaml => metrics.yaml} | 0 ...{container-registry.yaml => registry.yaml} | 0 ...ontainer-resources.yaml => resources.yaml} | 0 .../cpu/{cpu-registry.yaml => registry.yaml} | 0 .../{database-common.yaml => common.yaml} | 0 ...eprecated.yaml => metrics-deprecated.yaml} | 0 ...precated.yaml => registry-deprecated.yaml} | 0 .../{database-metrics.yaml => metrics.yaml} | 0 .../{database-registry.yaml => registry.yaml} | 0 .../{database-spans.yaml => spans.yaml} | 0 ...precated.yaml => registry-deprecated.yaml} | 0 ...deployment-registry.yaml => registry.yaml} | 0 ...ployment-resources.yaml => resources.yaml} | 0 .../{destination-common.yaml => common.yaml} | 0 ...estination-registry.yaml => registry.yaml} | 0 .../{device-events.yaml => events.yaml} | 0 .../{device-registry.yaml => registry.yaml} | 0 .../{device-resources.yaml => resources.yaml} | 0 .../{disk-registry.yaml => registry.yaml} | 0 model/dns/{dns-metrics.yaml => metrics.yaml} | 0 .../dns/{dns-registry.yaml => registry.yaml} | 0 .../{dotnet-registry.yaml => registry.yaml} | 0 ...time-metrics.yaml => runtime-metrics.yaml} | 0 .../{enduser-common.yaml => common.yaml} | 0 ...precated.yaml => registry-deprecated.yaml} | 0 .../{error-registry.yaml => registry.yaml} | 0 .../event/{event-common.yaml => common.yaml} | 0 .../{event-registry.yaml => registry.yaml} | 0 .../{exception-events.yaml => events.yaml} | 0 .../{exception-logs.yaml => logs.yaml} | 0 ...{exception-registry.yaml => registry.yaml} | 0 model/faas/{faas-common.yaml => common.yaml} | 0 .../faas/{faas-metrics.yaml => metrics.yaml} | 0 .../{faas-registry.yaml => registry.yaml} | 0 .../{faas-resources.yaml => resources.yaml} | 0 model/faas/{faas-spans.yaml => spans.yaml} | 0 .../{feature-flag-events.yaml => events.yaml} | 0 .../{feature-flag-logs.yaml => logs.yaml} | 0 ...ature-flag-registry.yaml => registry.yaml} | 0 .../{file-registry.yaml => registry.yaml} | 0 ...esources.yaml => cloud-run-resources.yaml} | 0 .../gcp/{gcp-client-common.yml => common.yml} | 0 ...-gce-resources.yaml => gce-resources.yaml} | 0 .../gcp/{gcp-registry.yaml => registry.yaml} | 0 ...precated.yaml => registry-deprecated.yaml} | 0 .../{gen-ai-metrics.yaml => metrics.yaml} | 0 .../{gen-ai-registry.yaml => registry.yaml} | 0 .../gen-ai/{gen-ai-spans.yaml => spans.yaml} | 0 model/go/{go-metrics.yaml => metrics.yaml} | 0 model/go/{go-registry.yaml => registry.yaml} | 0 .../{graphql-registry.yaml => registry.yaml} | 0 .../graphgl/{graphql-spans.yml => spans.yml} | 0 ...ommon-metrics.yaml => common-metrics.yaml} | 0 .../{hardware-common.yaml => common.yaml} | 0 .../{hardware-registry.yaml => registry.yaml} | 0 .../{heroku-registry.yaml => registry.yaml} | 0 .../{heroku-resources.yaml => resources.yaml} | 0 .../{host-registry.yaml => registry.yaml} | 0 .../{host-resources.yaml => resources.yaml} | 0 model/http/{http-common.yaml => common.yaml} | 0 ...precated.yaml => registry-deprecated.yaml} | 0 .../http/{http-metrics.yaml => metrics.yaml} | 0 .../{http-registry.yaml => registry.yaml} | 0 model/http/{http-spans.yaml => spans.yaml} | 0 ...precated.yaml => registry-deprecated.yaml} | 0 ...eprecated.yaml => metrics-deprecated.yaml} | 0 ...imental.yaml => metrics-experimental.yaml} | 0 model/jvm/{jvm-metrics.yaml => metrics.yaml} | 0 .../jvm/{jvm-registry.yaml => registry.yaml} | 0 ...precated.yaml => registry-deprecated.yaml} | 0 model/k8s/{k8s-metrics.yaml => metrics.yaml} | 0 .../k8s/{k8s-registry.yaml => registry.yaml} | 0 .../{k8s-resources.yaml => resources.yaml} | 0 .../{kestrel-metrics.yaml => metrics.yaml} | 0 .../{linux-registry.yaml => registry.yaml} | 0 model/log/{log-common.yaml => common.yaml} | 0 .../log/{log-registry.yaml => registry.yaml} | 0 .../{messaging-common.yaml => common.yaml} | 0 ...eprecated.yaml => metrics-deprecated.yaml} | 0 ...precated.yaml => registry-deprecated.yaml} | 0 .../{messaging-metrics.yaml => metrics.yaml} | 0 ...{messaging-registry.yaml => registry.yaml} | 0 .../{messaging-spans.yaml => spans.yaml} | 0 .../{network-common.yaml => common.yaml} | 0 ...precated.yaml => registry-deprecated.yaml} | 0 .../{network-registry.yaml => registry.yaml} | 0 .../{nodejs-metrics.yaml => metrics.yaml} | 0 .../{nodejs-registry.yaml => registry.yaml} | 0 .../oci/{oci-registry.yaml => registry.yaml} | 0 .../{opentracing-common.yaml => common.yaml} | 0 ...pentracing-registry.yaml => registry.yaml} | 0 model/os/{os-registry.yaml => registry.yaml} | 0 .../os/{os-resources.yaml => resources.yaml} | 0 .../{otel-status-common.yaml => common.yaml} | 0 ...precated.yaml => registry-deprecated.yaml} | 0 .../{otel-registry.yaml => registry.yaml} | 0 .../{otel-resources.yaml => resources.yaml} | 0 model/peer/{peer-common.yaml => common.yaml} | 0 .../{peer-registry.yaml => registry.yaml} | 0 ...precated.yaml => registry-deprecated.yaml} | 0 .../{process-metrics.yaml => metrics.yaml} | 0 .../{process-registry.yaml => registry.yaml} | 0 ...{process-resources.yaml => resources.yaml} | 0 .../{profile-common.yaml => common.yaml} | 0 .../{profile-registry.yaml => registry.yaml} | 0 ...precated.yaml => registry-deprecated.yaml} | 0 model/rpc/{rpc-metrics.yaml => metrics.yaml} | 0 .../rpc/{rpc-registry.yaml => registry.yaml} | 0 model/rpc/{rpc-spans.yaml => spans.yaml} | 0 .../{server-common.yaml => common.yaml} | 0 .../{server-registry.yaml => registry.yaml} | 0 .../{service-registry.yaml => registry.yaml} | 0 ...ental.yaml => resources-experimental.yaml} | 0 ...{service-resources.yaml => resources.yaml} | 0 .../{session-common.yaml => common.yaml} | 0 .../{session-registry.yaml => registry.yaml} | 0 .../{signalr-metrics.yaml => metrics.yaml} | 0 .../{signalr-registry.yaml => registry.yaml} | 0 .../{source-common.yaml => common.yaml} | 0 .../{source-registry.yaml => registry.yaml} | 0 ...precated.yaml => registry-deprecated.yaml} | 0 .../{system-metrics.yaml => metrics.yaml} | 0 .../{system-registry.yaml => registry.yaml} | 0 ...{telemetry-registry.yaml => registry.yaml} | 0 ...ental.yaml => resources-experimental.yaml} | 0 ...elemetry-resources.yaml => resources.yaml} | 0 .../{test-registry.yaml => registry.yaml} | 0 .../{thread-common.yaml => common.yaml} | 0 .../{thread-registry.yaml => registry.yaml} | 0 ...precated.yaml => registry-deprecated.yaml} | 0 .../tls/{tls-registry.yaml => registry.yaml} | 0 model/url/{url-common.yaml => common.yaml} | 0 .../url/{url-registry.yaml => registry.yaml} | 0 ...user-agent-registry.yaml => registry.yaml} | 0 .../{user-registry.yaml => registry.yaml} | 0 .../v8js/{v8js-metrics.yaml => metrics.yaml} | 0 .../{v8js-registry.yaml => registry.yaml} | 0 .../vcs/{vcs-registry.yaml => registry.yaml} | 0 ...{webengine-registry.yaml => registry.yaml} | 0 ...ebengine-resources.yaml => resources.yaml} | 0 169 files changed, 36 insertions(+), 35 deletions(-) rename model/andrioid/deprecated/{android-registry-deprecated.yaml => registry-deprecated.yaml} (100%) rename model/andrioid/{android-registry.yaml => registry.yaml} (100%) rename model/andrioid/{android-resources.yaml => resources.yaml} (100%) rename model/artifact/{artifact-registry.yaml => registry.yaml} (100%) rename model/aspnetcore/{aspnetcore-metrics.yaml => metrics.yaml} (100%) rename model/aspnetcore/{aspnetcore-registry.yaml => registry.yaml} (100%) rename model/aws/{aws-ecs-resources.yaml => ecs-resources.yaml} (100%) rename model/aws/{aws-eks-resources.yaml => eks-resources.yaml} (100%) rename model/aws/{aws-lambda-spans.yaml => lambda-spans.yaml} (100%) rename model/aws/{aws-logs-resources.yaml => logs-resources.yaml} (100%) rename model/aws/{aws-registry.yaml => registry.yaml} (100%) rename model/aws/{aws-sdk-spans.yml => sdk-spans.yml} (100%) rename model/azure/{azure-logs.yaml => logs.yaml} (100%) rename model/azure/{azure-registry.yaml => registry.yaml} (100%) rename model/browser/{browser-registry.yaml => registry.yaml} (100%) rename model/browser/{browser-resources.yaml => resources.yaml} (100%) rename model/cicd/{cicd-registry.yaml => registry.yaml} (100%) rename model/client/{client-common.yaml => common.yaml} (100%) rename model/client/{client-registry.yaml => registry.yaml} (100%) rename model/cloud/{cloud-registry.yaml => registry.yaml} (100%) rename model/cloud/{cloud-resources.yaml => resources.yaml} (100%) rename model/cloudevents/{cloudevents-registry.yaml => registry.yaml} (100%) rename model/cloudevents/{cloudevents-spans.yaml => spans.yaml} (100%) rename model/code/{code-common.yaml => common.yaml} (100%) rename model/code/{code-registry.yaml => registry.yaml} (100%) rename model/container/deprecated/{container-registry-deprecated.yaml => registry-deprecated.yaml} (100%) rename model/container/{container-metrics.yaml => metrics.yaml} (100%) rename model/container/{container-registry.yaml => registry.yaml} (100%) rename model/container/{container-resources.yaml => resources.yaml} (100%) rename model/cpu/{cpu-registry.yaml => registry.yaml} (100%) rename model/database/{database-common.yaml => common.yaml} (100%) rename model/database/deprecated/{database-metrics-deprecated.yaml => metrics-deprecated.yaml} (100%) rename model/database/deprecated/{database-registry-deprecated.yaml => registry-deprecated.yaml} (100%) rename model/database/{database-metrics.yaml => metrics.yaml} (100%) rename model/database/{database-registry.yaml => registry.yaml} (100%) rename model/database/{database-spans.yaml => spans.yaml} (100%) rename model/deployment/deprecated/{deployment-registry-deprecated.yaml => registry-deprecated.yaml} (100%) rename model/deployment/{deployment-registry.yaml => registry.yaml} (100%) rename model/deployment/{deployment-resources.yaml => resources.yaml} (100%) rename model/destination/{destination-common.yaml => common.yaml} (100%) rename model/destination/{destination-registry.yaml => registry.yaml} (100%) rename model/device/{device-events.yaml => events.yaml} (100%) rename model/device/{device-registry.yaml => registry.yaml} (100%) rename model/device/{device-resources.yaml => resources.yaml} (100%) rename model/disk/{disk-registry.yaml => registry.yaml} (100%) rename model/dns/{dns-metrics.yaml => metrics.yaml} (100%) rename model/dns/{dns-registry.yaml => registry.yaml} (100%) rename model/dotnet/{dotnet-registry.yaml => registry.yaml} (100%) rename model/dotnet/{dotnet-runtime-metrics.yaml => runtime-metrics.yaml} (100%) rename model/enduser/deprecated/{enduser-common.yaml => common.yaml} (100%) rename model/enduser/deprecated/{enduser-registry-deprecated.yaml => registry-deprecated.yaml} (100%) rename model/error/{error-registry.yaml => registry.yaml} (100%) rename model/event/{event-common.yaml => common.yaml} (100%) rename model/event/{event-registry.yaml => registry.yaml} (100%) rename model/exceptions/{exception-events.yaml => events.yaml} (100%) rename model/exceptions/{exception-logs.yaml => logs.yaml} (100%) rename model/exceptions/{exception-registry.yaml => registry.yaml} (100%) rename model/faas/{faas-common.yaml => common.yaml} (100%) rename model/faas/{faas-metrics.yaml => metrics.yaml} (100%) rename model/faas/{faas-registry.yaml => registry.yaml} (100%) rename model/faas/{faas-resources.yaml => resources.yaml} (100%) rename model/faas/{faas-spans.yaml => spans.yaml} (100%) rename model/feature-flag/{feature-flag-events.yaml => events.yaml} (100%) rename model/feature-flag/{feature-flag-logs.yaml => logs.yaml} (100%) rename model/feature-flag/{feature-flag-registry.yaml => registry.yaml} (100%) rename model/file/{file-registry.yaml => registry.yaml} (100%) rename model/gcp/{gcp-cloud-run-resources.yaml => cloud-run-resources.yaml} (100%) rename model/gcp/{gcp-client-common.yml => common.yml} (100%) rename model/gcp/{gcp-gce-resources.yaml => gce-resources.yaml} (100%) rename model/gcp/{gcp-registry.yaml => registry.yaml} (100%) rename model/gen-ai/deprecated/{gen-ai-registry-deprecated.yaml => registry-deprecated.yaml} (100%) rename model/gen-ai/{gen-ai-metrics.yaml => metrics.yaml} (100%) rename model/gen-ai/{gen-ai-registry.yaml => registry.yaml} (100%) rename model/gen-ai/{gen-ai-spans.yaml => spans.yaml} (100%) rename model/go/{go-metrics.yaml => metrics.yaml} (100%) rename model/go/{go-registry.yaml => registry.yaml} (100%) rename model/graphgl/{graphql-registry.yaml => registry.yaml} (100%) rename model/graphgl/{graphql-spans.yml => spans.yml} (100%) rename model/hardware/{hardware-common-metrics.yaml => common-metrics.yaml} (100%) rename model/hardware/{hardware-common.yaml => common.yaml} (100%) rename model/hardware/{hardware-registry.yaml => registry.yaml} (100%) rename model/heroku/{heroku-registry.yaml => registry.yaml} (100%) rename model/heroku/{heroku-resources.yaml => resources.yaml} (100%) rename model/host/{host-registry.yaml => registry.yaml} (100%) rename model/host/{host-resources.yaml => resources.yaml} (100%) rename model/http/{http-common.yaml => common.yaml} (100%) rename model/http/deprecated/{http-registry-deprecated.yaml => registry-deprecated.yaml} (100%) rename model/http/{http-metrics.yaml => metrics.yaml} (100%) rename model/http/{http-registry.yaml => registry.yaml} (100%) rename model/http/{http-spans.yaml => spans.yaml} (100%) rename model/ios/deprecated/{ios-registry-deprecated.yaml => registry-deprecated.yaml} (100%) rename model/jvm/deprecated/{jvm-metrics-deprecated.yaml => metrics-deprecated.yaml} (100%) rename model/jvm/{jvm-metrics-experimental.yaml => metrics-experimental.yaml} (100%) rename model/jvm/{jvm-metrics.yaml => metrics.yaml} (100%) rename model/jvm/{jvm-registry.yaml => registry.yaml} (100%) rename model/k8s/deprecated/{k8s-registry-deprecated.yaml => registry-deprecated.yaml} (100%) rename model/k8s/{k8s-metrics.yaml => metrics.yaml} (100%) rename model/k8s/{k8s-registry.yaml => registry.yaml} (100%) rename model/k8s/{k8s-resources.yaml => resources.yaml} (100%) rename model/kestrel/{kestrel-metrics.yaml => metrics.yaml} (100%) rename model/linux/{linux-registry.yaml => registry.yaml} (100%) rename model/log/{log-common.yaml => common.yaml} (100%) rename model/log/{log-registry.yaml => registry.yaml} (100%) rename model/messaging/{messaging-common.yaml => common.yaml} (100%) rename model/messaging/deprecated/{messaging-metrics-deprecated.yaml => metrics-deprecated.yaml} (100%) rename model/messaging/deprecated/{messaging-registry-deprecated.yaml => registry-deprecated.yaml} (100%) rename model/messaging/{messaging-metrics.yaml => metrics.yaml} (100%) rename model/messaging/{messaging-registry.yaml => registry.yaml} (100%) rename model/messaging/{messaging-spans.yaml => spans.yaml} (100%) rename model/network/{network-common.yaml => common.yaml} (100%) rename model/network/deprecated/{network-registry-deprecated.yaml => registry-deprecated.yaml} (100%) rename model/network/{network-registry.yaml => registry.yaml} (100%) rename model/nodejs/{nodejs-metrics.yaml => metrics.yaml} (100%) rename model/nodejs/{nodejs-registry.yaml => registry.yaml} (100%) rename model/oci/{oci-registry.yaml => registry.yaml} (100%) rename model/opentracing/{opentracing-common.yaml => common.yaml} (100%) rename model/opentracing/{opentracing-registry.yaml => registry.yaml} (100%) rename model/os/{os-registry.yaml => registry.yaml} (100%) rename model/os/{os-resources.yaml => resources.yaml} (100%) rename model/otel/{otel-status-common.yaml => common.yaml} (100%) rename model/otel/deprecated/{otel-registry-deprecated.yaml => registry-deprecated.yaml} (100%) rename model/otel/{otel-registry.yaml => registry.yaml} (100%) rename model/otel/{otel-resources.yaml => resources.yaml} (100%) rename model/peer/{peer-common.yaml => common.yaml} (100%) rename model/peer/{peer-registry.yaml => registry.yaml} (100%) rename model/process/deprecated/{process-registry-deprecated.yaml => registry-deprecated.yaml} (100%) rename model/process/{process-metrics.yaml => metrics.yaml} (100%) rename model/process/{process-registry.yaml => registry.yaml} (100%) rename model/process/{process-resources.yaml => resources.yaml} (100%) rename model/profile/{profile-common.yaml => common.yaml} (100%) rename model/profile/{profile-registry.yaml => registry.yaml} (100%) rename model/rpc/deprecated/{rpc-registry-deprecated.yaml => registry-deprecated.yaml} (100%) rename model/rpc/{rpc-metrics.yaml => metrics.yaml} (100%) rename model/rpc/{rpc-registry.yaml => registry.yaml} (100%) rename model/rpc/{rpc-spans.yaml => spans.yaml} (100%) rename model/server/{server-common.yaml => common.yaml} (100%) rename model/server/{server-registry.yaml => registry.yaml} (100%) rename model/service/{service-registry.yaml => registry.yaml} (100%) rename model/service/{service-resources-experimental.yaml => resources-experimental.yaml} (100%) rename model/service/{service-resources.yaml => resources.yaml} (100%) rename model/session/{session-common.yaml => common.yaml} (100%) rename model/session/{session-registry.yaml => registry.yaml} (100%) rename model/signalr/{signalr-metrics.yaml => metrics.yaml} (100%) rename model/signalr/{signalr-registry.yaml => registry.yaml} (100%) rename model/source/{source-common.yaml => common.yaml} (100%) rename model/source/{source-registry.yaml => registry.yaml} (100%) rename model/system/deprecated/{system-registry-deprecated.yaml => registry-deprecated.yaml} (100%) rename model/system/{system-metrics.yaml => metrics.yaml} (100%) rename model/system/{system-registry.yaml => registry.yaml} (100%) rename model/telemetry/{telemetry-registry.yaml => registry.yaml} (100%) rename model/telemetry/{telemetry-resources-experimental.yaml => resources-experimental.yaml} (100%) rename model/telemetry/{telemetry-resources.yaml => resources.yaml} (100%) rename model/test/{test-registry.yaml => registry.yaml} (100%) rename model/thread/{thread-common.yaml => common.yaml} (100%) rename model/thread/{thread-registry.yaml => registry.yaml} (100%) rename model/tls/deprecated/{tls-registry-deprecated.yaml => registry-deprecated.yaml} (100%) rename model/tls/{tls-registry.yaml => registry.yaml} (100%) rename model/url/{url-common.yaml => common.yaml} (100%) rename model/url/{url-registry.yaml => registry.yaml} (100%) rename model/user-agent/{user-agent-registry.yaml => registry.yaml} (100%) rename model/user/{user-registry.yaml => registry.yaml} (100%) rename model/v8js/{v8js-metrics.yaml => metrics.yaml} (100%) rename model/v8js/{v8js-registry.yaml => registry.yaml} (100%) rename model/vcs/{vcs-registry.yaml => registry.yaml} (100%) rename model/webengine/{webengine-registry.yaml => registry.yaml} (100%) rename model/webengine/{webengine-resources.yaml => resources.yaml} (100%) 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