diff --git a/.vscode/settings.json b/.vscode/settings.json index 1a42dbf20a..20f2b1ea67 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -10,7 +10,7 @@ "MD040": false, }, "yaml.schemas": { - "https://raw.githubusercontent.com/open-telemetry/weaver/v0.9.2/schemas/semconv.schema.json": [ + "https://raw.githubusercontent.com/open-telemetry/weaver/v0.11.0/schemas/semconv.schema.json": [ "model/**/*.yaml" ] }, diff --git a/dependencies.Dockerfile b/dependencies.Dockerfile index 12118bac51..a73ff3d3a2 100644 --- a/dependencies.Dockerfile +++ b/dependencies.Dockerfile @@ -3,7 +3,7 @@ # Dependabot can keep this file up to date with latest containers. # Weaver is used to generate markdown docs, and enforce policies on the model. -FROM otel/weaver:v0.10.0 AS weaver +FROM otel/weaver:v0.11.0 AS weaver # OPA is used to test policies enforced by weaver. FROM openpolicyagent/opa:0.70.0 AS opa diff --git a/model/android/resources.yaml b/model/android/resources.yaml index 9070a37688..bb5ac91145 100644 --- a/model/android/resources.yaml +++ b/model/android/resources.yaml @@ -1,6 +1,7 @@ groups: - id: resource.android type: resource + stability: experimental name: android brief: > The Android platform on which the Android application is running. diff --git a/model/aws/ecs-resources.yaml b/model/aws/ecs-resources.yaml index 44cc06b9e6..ae99943374 100644 --- a/model/aws/ecs-resources.yaml +++ b/model/aws/ecs-resources.yaml @@ -1,6 +1,7 @@ groups: - id: resource.aws.ecs type: resource + stability: experimental name: aws.ecs brief: > Resources used by AWS Elastic Container Service (ECS). diff --git a/model/aws/eks-resources.yaml b/model/aws/eks-resources.yaml index 5b8d142969..4b5cfd2dde 100644 --- a/model/aws/eks-resources.yaml +++ b/model/aws/eks-resources.yaml @@ -1,6 +1,7 @@ groups: - id: resource.aws.eks type: resource + stability: experimental name: aws.eks brief: > Resources used by AWS Elastic Kubernetes Service (EKS). diff --git a/model/aws/lambda-spans.yaml b/model/aws/lambda-spans.yaml index 934795bc40..367f88c88b 100644 --- a/model/aws/lambda-spans.yaml +++ b/model/aws/lambda-spans.yaml @@ -1,6 +1,7 @@ groups: - id: span.aws.lambda type: span + stability: experimental brief: > Span attributes used by AWS Lambda (in addition to general `faas` attributes). attributes: diff --git a/model/aws/logs-resources.yaml b/model/aws/logs-resources.yaml index 4c09b07570..f1c6093d80 100644 --- a/model/aws/logs-resources.yaml +++ b/model/aws/logs-resources.yaml @@ -1,6 +1,7 @@ groups: - id: resource.aws.log type: resource + stability: experimental name: aws.log brief: > Resources specific to Amazon Web Services. diff --git a/model/aws/sdk-spans.yml b/model/aws/sdk-spans.yml index 4ac5ccc369..59f8c5b783 100644 --- a/model/aws/sdk-spans.yml +++ b/model/aws/sdk-spans.yml @@ -1,6 +1,7 @@ groups: - id: span.aws.client type: span + stability: experimental span_kind: client brief: > The `aws` conventions apply to operations using the AWS SDK. They map request or response parameters @@ -32,6 +33,7 @@ groups: - id: span.dynamodb.batchgetitem.client brief: DynamoDB.BatchGetItem extends: span.aws.client + stability: experimental type: span span_kind: client attributes: @@ -44,6 +46,7 @@ groups: brief: DynamoDB.BatchWriteItem extends: span.aws.client type: span + stability: experimental span_kind: client attributes: - ref: aws.dynamodb.table_names @@ -57,6 +60,7 @@ groups: brief: DynamoDB.CreateTable extends: span.aws.client type: span + stability: experimental span_kind: client attributes: - ref: aws.dynamodb.global_secondary_indexes @@ -81,6 +85,7 @@ groups: brief: DynamoDB.DeleteItem extends: span.aws.client type: span + stability: experimental span_kind: client attributes: - ref: aws.dynamodb.table_names @@ -97,6 +102,7 @@ groups: brief: DynamoDB.DeleteTable extends: span.aws.client type: span + stability: experimental span_kind: client attributes: - ref: aws.dynamodb.table_names @@ -109,6 +115,7 @@ groups: brief: DynamoDB.DescribeTable extends: span.aws.client type: span + stability: experimental span_kind: client attributes: - ref: aws.dynamodb.table_names @@ -121,6 +128,7 @@ groups: brief: DynamoDB.GetItem extends: span.aws.client type: span + stability: experimental span_kind: client attributes: - ref: aws.dynamodb.table_names @@ -139,6 +147,7 @@ groups: brief: DynamoDB.ListTables extends: span.aws.client type: span + stability: experimental span_kind: client attributes: - ref: aws.dynamodb.exclusive_start_table @@ -152,6 +161,7 @@ groups: brief: DynamoDB.PutItem extends: span.aws.client type: span + stability: experimental span_kind: client attributes: - ref: aws.dynamodb.table_names @@ -165,6 +175,7 @@ groups: brief: DynamoDB.Query extends: span.aws.client type: span + stability: experimental span_kind: client attributes: - ref: aws.dynamodb.scan_forward @@ -193,6 +204,7 @@ groups: brief: DynamoDB.Scan extends: span.aws.client type: span + stability: experimental span_kind: client attributes: - ref: aws.dynamodb.segment @@ -228,6 +240,7 @@ groups: extends: span.aws.client type: span span_kind: client + stability: experimental attributes: - ref: aws.dynamodb.table_names requirement_level: recommended @@ -243,6 +256,7 @@ groups: brief: DynamoDB.UpdateTable extends: span.aws.client type: span + stability: experimental span_kind: client attributes: - ref: aws.dynamodb.attribute_definitions @@ -264,6 +278,7 @@ groups: - id: span.aws.s3.client extends: span.aws.client type: span + stability: experimental span_kind: client brief: "Attributes that exist for S3 request types." attributes: diff --git a/model/browser/resources.yaml b/model/browser/resources.yaml index 01b31567f7..f0546d79e9 100644 --- a/model/browser/resources.yaml +++ b/model/browser/resources.yaml @@ -1,6 +1,7 @@ groups: - id: resource.browser type: resource + stability: experimental name: browser brief: > The web browser in which the application represented by the resource is running. diff --git a/model/cloud/resources.yaml b/model/cloud/resources.yaml index 0daa6fdf9f..7e2859184c 100644 --- a/model/cloud/resources.yaml +++ b/model/cloud/resources.yaml @@ -1,6 +1,7 @@ groups: - id: resource.cloud type: resource + stability: experimental name: cloud brief: > A cloud environment (e.g. GCP, Azure, AWS) diff --git a/model/cloudfoundry/resources.yaml b/model/cloudfoundry/resources.yaml index 40d8c235bb..06c04982bc 100644 --- a/model/cloudfoundry/resources.yaml +++ b/model/cloudfoundry/resources.yaml @@ -1,6 +1,7 @@ groups: - id: resource.cloudfoundry.system type: resource + stability: experimental name: cloudfoundry.system brief: > The system component which is monitored. @@ -9,6 +10,7 @@ groups: - ref: cloudfoundry.system.instance.id - id: resource.cloudfoundry.app type: resource + stability: experimental name: cloudfoundry.app brief: > The application which is monitored. @@ -17,6 +19,7 @@ groups: - ref: cloudfoundry.app.name - id: resource.cloudfoundry.space type: resource + stability: experimental name: cloudfoundry.space brief: > The space of the application which is monitored. @@ -25,6 +28,7 @@ groups: - ref: cloudfoundry.space.name - id: resource.cloudfoundry.org type: resource + stability: experimental name: cloudfoundry.org brief: > The organization of the application which is monitored. @@ -33,6 +37,7 @@ groups: - ref: cloudfoundry.org.name - id: resource.cloudfoundry.process type: resource + stability: experimental name: cloudfoundry.process brief: > The process of the application which is monitored. diff --git a/model/container/resources.yaml b/model/container/resources.yaml index a3def21acd..473e21aa6d 100644 --- a/model/container/resources.yaml +++ b/model/container/resources.yaml @@ -1,6 +1,7 @@ groups: - id: resource.container type: resource + stability: experimental name: container brief: > A container instance. diff --git a/model/database/spans.yaml b/model/database/spans.yaml index df0a993543..476127d09c 100644 --- a/model/database/spans.yaml +++ b/model/database/spans.yaml @@ -152,6 +152,7 @@ groups: - id: span.db.postgresql.client type: span + stability: experimental extends: span.db.sql.client span_kind: client brief: > @@ -186,6 +187,7 @@ groups: - id: span.db.mysql.client type: span + stability: experimental extends: span.db.sql.client span_kind: client brief: > @@ -212,6 +214,7 @@ groups: - id: span.db.mariadb.client type: span + stability: experimental extends: span.db.sql.client span_kind: client brief: > diff --git a/model/deployment/resources.yaml b/model/deployment/resources.yaml index 18af6c6c66..44a3b6001d 100644 --- a/model/deployment/resources.yaml +++ b/model/deployment/resources.yaml @@ -1,6 +1,7 @@ groups: - id: resource.deployment type: resource + stability: experimental name: deployment brief: > The software deployment. diff --git a/model/device/resources.yaml b/model/device/resources.yaml index 179e4726f7..bc49bd51b7 100644 --- a/model/device/resources.yaml +++ b/model/device/resources.yaml @@ -1,6 +1,7 @@ groups: - id: resource.device type: resource + stability: experimental name: device brief: > The device on which the process represented by this resource is running. diff --git a/model/faas/resources.yaml b/model/faas/resources.yaml index a197e28ea5..62d014d31b 100644 --- a/model/faas/resources.yaml +++ b/model/faas/resources.yaml @@ -1,6 +1,7 @@ groups: - id: resource.faas type: resource + stability: experimental name: faas brief: > A serverless instance. diff --git a/model/faas/spans.yaml b/model/faas/spans.yaml index 683181502a..1712a09bba 100644 --- a/model/faas/spans.yaml +++ b/model/faas/spans.yaml @@ -1,6 +1,7 @@ groups: - id: span.faas type: span + stability: experimental brief: > This semantic convention describes an instance of a function that runs without provisioning or managing of servers (also known as @@ -22,6 +23,7 @@ groups: - id: span.faas.datasource type: span + stability: experimental brief: > Semantic Convention for FaaS triggered as a response to some data source operation such as a database or filesystem read/write. @@ -35,6 +37,7 @@ groups: - id: span.faas.timer type: span + stability: experimental brief: > Semantic Convention for FaaS scheduled to be executed regularly. attributes: @@ -44,6 +47,7 @@ groups: - id: span.faas.server span_kind: server type: span + stability: experimental brief: > Contains additional attributes for incoming FaaS spans. attributes: @@ -64,6 +68,7 @@ groups: - id: span.faas.client span_kind: client type: span + stability: experimental brief: > Contains additional attributes for outgoing FaaS spans. attributes: diff --git a/model/feature-flags/logs.yaml b/model/feature-flags/logs.yaml index edcd75250c..471b947470 100644 --- a/model/feature-flags/logs.yaml +++ b/model/feature-flags/logs.yaml @@ -2,6 +2,7 @@ groups: - id: event.feature_flag.evaluation type: event name: feature_flag.evaluation + stability: experimental brief: > Defines feature flag evaluation as an event. note: > diff --git a/model/gcp/cloud-run-resources.yaml b/model/gcp/cloud-run-resources.yaml index 86c54cb130..06d99dfe98 100644 --- a/model/gcp/cloud-run-resources.yaml +++ b/model/gcp/cloud-run-resources.yaml @@ -1,6 +1,7 @@ groups: - id: resource.gcp.cloud_run type: resource + stability: experimental name: gcp.cloud_run brief: > Resource used by Google Cloud Run. diff --git a/model/gcp/gce-resources.yaml b/model/gcp/gce-resources.yaml index cac414f2b0..d8cb411c4b 100644 --- a/model/gcp/gce-resources.yaml +++ b/model/gcp/gce-resources.yaml @@ -1,6 +1,7 @@ groups: - id: resource.gcp.gce type: resource + stability: experimental name: gcp.gce brief: > Resources used by Google Compute Engine (GCE). diff --git a/model/graphql/spans.yml b/model/graphql/spans.yml index 7e9e8a494c..4410b55ae6 100644 --- a/model/graphql/spans.yml +++ b/model/graphql/spans.yml @@ -1,6 +1,7 @@ groups: - id: span.graphql.server type: span + stability: experimental span_kind: server brief: > This document defines semantic conventions to apply when instrumenting the GraphQL implementation. They map diff --git a/model/heroku/resources.yaml b/model/heroku/resources.yaml index cfffc3a5b4..a7310a13c7 100644 --- a/model/heroku/resources.yaml +++ b/model/heroku/resources.yaml @@ -1,6 +1,7 @@ groups: - id: resource.heroku type: resource + stability: experimental name: heroku brief: > [Heroku dyno metadata](https://devcenter.heroku.com/articles/dyno-metadata) diff --git a/model/host/resources.yaml b/model/host/resources.yaml index 088b7c8c2e..f2e27d5847 100644 --- a/model/host/resources.yaml +++ b/model/host/resources.yaml @@ -1,6 +1,7 @@ groups: - id: resource.host type: resource + stability: experimental name: host brief: > A host is defined as a computing instance. For example, physical servers, virtual machines, switches or disk array. @@ -45,6 +46,7 @@ groups: - id: resource.host.cpu type: resource + stability: experimental name: host.cpu brief: > A host's CPU information diff --git a/model/k8s/resources.yaml b/model/k8s/resources.yaml index 3e25aff349..5448985baa 100644 --- a/model/k8s/resources.yaml +++ b/model/k8s/resources.yaml @@ -1,6 +1,7 @@ groups: - id: resource.k8s.cluster type: resource + stability: experimental name: k8s.cluster brief: > A Kubernetes Cluster. @@ -10,6 +11,7 @@ groups: - id: resource.k8s.node type: resource + stability: experimental name: k8s.node brief: > A Kubernetes Node object. @@ -19,6 +21,7 @@ groups: - id: resource.k8s.namespace type: resource + stability: experimental name: k8s.namespace brief: > A Kubernetes Namespace. @@ -27,6 +30,7 @@ groups: - id: resource.k8s.pod type: resource + stability: experimental name: k8s.pod brief: > A Kubernetes Pod object. @@ -39,6 +43,7 @@ groups: - id: resource.k8s.container type: resource + stability: experimental name: k8s.container brief: > A container in a [PodTemplate](https://kubernetes.io/docs/concepts/workloads/pods/#pod-templates). @@ -49,6 +54,7 @@ groups: - id: resource.k8s.replicaset type: resource + stability: experimental name: k8s.replicaset brief: > A Kubernetes ReplicaSet object. @@ -58,6 +64,7 @@ groups: - id: resource.k8s.deployment type: resource + stability: experimental name: k8s.deployment brief: > A Kubernetes Deployment object. @@ -67,6 +74,7 @@ groups: - id: resource.k8s.statefulset type: resource + stability: experimental name: k8s.statefulset brief: > A Kubernetes StatefulSet object. @@ -76,6 +84,7 @@ groups: - id: resource.k8s.daemonset type: resource + stability: experimental name: k8s.daemonset brief: > A Kubernetes DaemonSet object. @@ -85,6 +94,7 @@ groups: - id: resource.k8s.job type: resource + stability: experimental name: k8s.job brief: > A Kubernetes Job object. @@ -94,6 +104,7 @@ groups: - id: resource.k8s.cronjob type: resource + stability: experimental name: k8s.cronjob brief: > A Kubernetes CronJob object. diff --git a/model/os/resources.yaml b/model/os/resources.yaml index fe48ee9c5b..dbc34280c1 100644 --- a/model/os/resources.yaml +++ b/model/os/resources.yaml @@ -1,6 +1,7 @@ groups: - id: resource.os type: resource + stability: experimental name: os brief: > The operating system (OS) on which the process represented by this resource is running. diff --git a/model/otel/resources.yaml b/model/otel/resources.yaml index e07b139778..52ba927025 100644 --- a/model/otel/resources.yaml +++ b/model/otel/resources.yaml @@ -2,6 +2,7 @@ groups: - id: resource.otel.scope # This should not be a resource, but an attribute group. type: resource + stability: experimental name: otel.scope brief: Attributes used by non-OTLP exporters to represent OpenTelemetry Scope's concepts. attributes: diff --git a/model/process/resources.yaml b/model/process/resources.yaml index 3b3155439f..e6ac07e6ba 100644 --- a/model/process/resources.yaml +++ b/model/process/resources.yaml @@ -1,6 +1,7 @@ groups: - id: resource.process type: resource + stability: experimental name: process brief: > An operating system process. @@ -27,6 +28,7 @@ groups: - id: resource.process.runtime type: resource + stability: experimental name: process.runtime brief: > The single (language) runtime instance which is monitored. diff --git a/model/rpc/spans.yaml b/model/rpc/spans.yaml index ae26b7c256..029eade0ff 100644 --- a/model/rpc/spans.yaml +++ b/model/rpc/spans.yaml @@ -27,6 +27,7 @@ groups: - id: span.rpc.client type: span + stability: experimental brief: 'This document defines semantic conventions for remote procedure call client spans.' extends: rpc span_kind: client @@ -40,6 +41,7 @@ groups: - id: span.rpc.server type: span + stability: experimental extends: rpc span_kind: server brief: 'Semantic Convention for RPC server spans' @@ -61,6 +63,7 @@ groups: - id: span.rpc.grpc type: span + stability: experimental extends: rpc brief: 'Tech-specific attributes for gRPC.' attributes: @@ -76,6 +79,7 @@ groups: - id: span.rpc.jsonrpc type: span + stability: experimental extends: rpc brief: 'Tech-specific attributes for [JSON RPC](https://www.jsonrpc.org/).' attributes: @@ -121,6 +125,7 @@ groups: - id: span.rpc.connect_rpc type: span + stability: experimental extends: rpc brief: 'Tech-specific attributes for Connect RPC.' attributes: diff --git a/model/webengine/resources.yaml b/model/webengine/resources.yaml index 85eac2c52f..f208afc32f 100644 --- a/model/webengine/resources.yaml +++ b/model/webengine/resources.yaml @@ -1,6 +1,7 @@ groups: - id: resource.webengine type: resource + stability: experimental name: webengine brief: > Resource describing the packaged software running the application code. Web engines are typically executed using process.runtime.