From 45e91aedff7d347955ba09269b871f8fd9049ce3 Mon Sep 17 00:00:00 2001 From: Josh Suereth Date: Wed, 7 May 2025 18:49:44 -0400 Subject: [PATCH] (chore) Move off deprecated group type resource to entity group type. (#2231) --- docs/resource/cloud-provider/aws/ecs.md | 2 +- docs/resource/cloud-provider/aws/eks.md | 2 +- docs/resource/cloud-provider/aws/logs.md | 2 +- model/android/resources.yaml | 2 +- model/app/resources.yaml | 2 +- model/aws/ecs-resources.yaml | 4 ++-- model/aws/eks-resources.yaml | 4 ++-- model/aws/logs-resources.yaml | 4 ++-- model/browser/resources.yaml | 2 +- model/cicd/resources.yaml | 6 ++--- model/cloud/resources.yaml | 2 +- model/cloudfoundry/resources.yaml | 10 ++++----- model/container/resources.yaml | 2 +- model/deployment/resources.yaml | 2 +- model/device/resources.yaml | 2 +- model/faas/resources.yaml | 2 +- model/gcp/apphub.yaml | 6 ++--- model/gcp/cloud-run-resources.yaml | 2 +- model/gcp/gce-resources.yaml | 2 +- model/heroku/resources.yaml | 2 +- model/host/resources.yaml | 4 ++-- model/k8s/resources.yaml | 28 ++++++++++++------------ model/os/resources.yaml | 2 +- model/otel/resources.yaml | 2 +- model/process/resources.yaml | 4 ++-- model/service/resources.yaml | 2 +- model/telemetry/resources.yaml | 4 ++-- model/vcs/resources.yaml | 4 ++-- model/webengine/resources.yaml | 2 +- 29 files changed, 57 insertions(+), 57 deletions(-) diff --git a/docs/resource/cloud-provider/aws/ecs.md b/docs/resource/cloud-provider/aws/ecs.md index e45c2cf1d..9b7199533 100644 --- a/docs/resource/cloud-provider/aws/ecs.md +++ b/docs/resource/cloud-provider/aws/ecs.md @@ -16,7 +16,7 @@ linkTitle: ECS **type:** `aws.ecs` -**Description:** Resources used by AWS Elastic Container Service (ECS). +**Description:** Entities used by AWS Elastic Container Service (ECS). | Attribute | Type | Description | Examples | [Requirement Level](https://opentelemetry.io/docs/specs/semconv/general/attribute-requirement-level/) | Stability | |---|---|---|---|---|---| diff --git a/docs/resource/cloud-provider/aws/eks.md b/docs/resource/cloud-provider/aws/eks.md index 9958ec084..b2dbbfcbd 100644 --- a/docs/resource/cloud-provider/aws/eks.md +++ b/docs/resource/cloud-provider/aws/eks.md @@ -16,7 +16,7 @@ linkTitle: EKS **type:** `aws.eks` -**Description:** Resources used by AWS Elastic Kubernetes Service (EKS). +**Description:** Entities used by AWS Elastic Kubernetes Service (EKS). | Attribute | Type | Description | Examples | [Requirement Level](https://opentelemetry.io/docs/specs/semconv/general/attribute-requirement-level/) | Stability | |---|---|---|---|---|---| diff --git a/docs/resource/cloud-provider/aws/logs.md b/docs/resource/cloud-provider/aws/logs.md index 1192a7fc8..1f3823f8d 100644 --- a/docs/resource/cloud-provider/aws/logs.md +++ b/docs/resource/cloud-provider/aws/logs.md @@ -16,7 +16,7 @@ linkTitle: Logs **type:** `aws.log` -**Description:** Resources specific to Amazon Web Services. +**Description:** Entities specific to Amazon Web Services. | Attribute | Type | Description | Examples | [Requirement Level](https://opentelemetry.io/docs/specs/semconv/general/attribute-requirement-level/) | Stability | |---|---|---|---|---|---| diff --git a/model/android/resources.yaml b/model/android/resources.yaml index 6e0a1f632..a3fb5dd98 100644 --- a/model/android/resources.yaml +++ b/model/android/resources.yaml @@ -1,6 +1,6 @@ groups: - id: resource.android - type: resource + type: entity stability: development name: android brief: > diff --git a/model/app/resources.yaml b/model/app/resources.yaml index bd21fd82d..8107e463c 100644 --- a/model/app/resources.yaml +++ b/model/app/resources.yaml @@ -1,6 +1,6 @@ groups: - id: resource.app - type: resource + type: entity stability: development name: app brief: > diff --git a/model/aws/ecs-resources.yaml b/model/aws/ecs-resources.yaml index d89db888d..c9cf73f17 100644 --- a/model/aws/ecs-resources.yaml +++ b/model/aws/ecs-resources.yaml @@ -1,10 +1,10 @@ groups: - id: resource.aws.ecs - type: resource + type: entity stability: development name: aws.ecs brief: > - Resources used by AWS Elastic Container Service (ECS). + Entities used by AWS Elastic Container Service (ECS). attributes: - ref: aws.ecs.container.arn requirement_level: recommended diff --git a/model/aws/eks-resources.yaml b/model/aws/eks-resources.yaml index 1447014b9..ad1488371 100644 --- a/model/aws/eks-resources.yaml +++ b/model/aws/eks-resources.yaml @@ -1,10 +1,10 @@ groups: - id: resource.aws.eks - type: resource + type: entity stability: development name: aws.eks brief: > - Resources used by AWS Elastic Kubernetes Service (EKS). + Entities used by AWS Elastic Kubernetes Service (EKS). attributes: - ref: aws.eks.cluster.arn requirement_level: recommended diff --git a/model/aws/logs-resources.yaml b/model/aws/logs-resources.yaml index e74008506..d4b3962eb 100644 --- a/model/aws/logs-resources.yaml +++ b/model/aws/logs-resources.yaml @@ -1,10 +1,10 @@ groups: - id: resource.aws.log - type: resource + type: entity stability: development name: aws.log brief: > - Resources specific to Amazon Web Services. + Entities specific to Amazon Web Services. attributes: - ref: aws.log.group.names requirement_level: recommended diff --git a/model/browser/resources.yaml b/model/browser/resources.yaml index 411d8248c..83a1392e5 100644 --- a/model/browser/resources.yaml +++ b/model/browser/resources.yaml @@ -1,6 +1,6 @@ groups: - id: resource.browser - type: resource + type: entity stability: development name: browser brief: > diff --git a/model/cicd/resources.yaml b/model/cicd/resources.yaml index 41899e82e..a285b2ab5 100644 --- a/model/cicd/resources.yaml +++ b/model/cicd/resources.yaml @@ -1,6 +1,6 @@ groups: - id: resource.cicd.pipeline - type: resource + type: entity stability: development name: cicd.pipeline brief: > @@ -9,7 +9,7 @@ groups: - ref: cicd.pipeline.name - id: resource.cicd.pipeline.run - type: resource + type: entity stability: development name: cicd.pipeline.run brief: > @@ -19,7 +19,7 @@ groups: - ref: cicd.pipeline.run.url.full - id: resource.cicd.worker - type: resource + type: entity stability: development name: cicd.worker brief: > diff --git a/model/cloud/resources.yaml b/model/cloud/resources.yaml index 92bd6c319..e318b98a1 100644 --- a/model/cloud/resources.yaml +++ b/model/cloud/resources.yaml @@ -1,6 +1,6 @@ groups: - id: resource.cloud - type: resource + type: entity stability: development name: cloud brief: > diff --git a/model/cloudfoundry/resources.yaml b/model/cloudfoundry/resources.yaml index 158c8bb2b..0dffd3d93 100644 --- a/model/cloudfoundry/resources.yaml +++ b/model/cloudfoundry/resources.yaml @@ -1,6 +1,6 @@ groups: - id: resource.cloudfoundry.system - type: resource + type: entity stability: development name: cloudfoundry.system brief: > @@ -9,7 +9,7 @@ groups: - ref: cloudfoundry.system.id - ref: cloudfoundry.system.instance.id - id: resource.cloudfoundry.app - type: resource + type: entity stability: development name: cloudfoundry.app brief: > @@ -18,7 +18,7 @@ groups: - ref: cloudfoundry.app.id - ref: cloudfoundry.app.name - id: resource.cloudfoundry.space - type: resource + type: entity stability: development name: cloudfoundry.space brief: > @@ -27,7 +27,7 @@ groups: - ref: cloudfoundry.space.id - ref: cloudfoundry.space.name - id: resource.cloudfoundry.org - type: resource + type: entity stability: development name: cloudfoundry.org brief: > @@ -36,7 +36,7 @@ groups: - ref: cloudfoundry.org.id - ref: cloudfoundry.org.name - id: resource.cloudfoundry.process - type: resource + type: entity stability: development name: cloudfoundry.process brief: > diff --git a/model/container/resources.yaml b/model/container/resources.yaml index 2452de0c2..2630124a2 100644 --- a/model/container/resources.yaml +++ b/model/container/resources.yaml @@ -1,6 +1,6 @@ groups: - id: resource.container - type: resource + type: entity stability: development name: container brief: > diff --git a/model/deployment/resources.yaml b/model/deployment/resources.yaml index df6e49483..83aada192 100644 --- a/model/deployment/resources.yaml +++ b/model/deployment/resources.yaml @@ -1,6 +1,6 @@ groups: - id: resource.deployment - type: resource + type: entity stability: development name: deployment brief: > diff --git a/model/device/resources.yaml b/model/device/resources.yaml index b9f8621f3..fd8f5837c 100644 --- a/model/device/resources.yaml +++ b/model/device/resources.yaml @@ -1,6 +1,6 @@ groups: - id: resource.device - type: resource + type: entity stability: development name: device brief: > diff --git a/model/faas/resources.yaml b/model/faas/resources.yaml index 616cab44e..fa430c477 100644 --- a/model/faas/resources.yaml +++ b/model/faas/resources.yaml @@ -1,6 +1,6 @@ groups: - id: resource.faas - type: resource + type: entity stability: development name: faas brief: > diff --git a/model/gcp/apphub.yaml b/model/gcp/apphub.yaml index 6a707cebe..2ffddd04a 100644 --- a/model/gcp/apphub.yaml +++ b/model/gcp/apphub.yaml @@ -1,6 +1,6 @@ groups: - id: resource.gcp.apphub.application - type: resource + type: entity stability: development name: gcp.apphub.application brief: > @@ -14,7 +14,7 @@ groups: - ref: gcp.apphub.application.id requirement_level: required - id: resource.gcp.apphub.service - type: resource + type: entity stability: development name: gcp.apphub.service brief: > @@ -28,7 +28,7 @@ groups: - ref: gcp.apphub.service.criticality_type requirement_level: required - id: resource.gcp.apphub.workload - type: resource + type: entity stability: development name: gcp.apphub.workload brief: > diff --git a/model/gcp/cloud-run-resources.yaml b/model/gcp/cloud-run-resources.yaml index 6dc637886..8c1e2da13 100644 --- a/model/gcp/cloud-run-resources.yaml +++ b/model/gcp/cloud-run-resources.yaml @@ -1,6 +1,6 @@ groups: - id: resource.gcp.cloud_run - type: resource + type: entity stability: development name: gcp.cloud_run brief: > diff --git a/model/gcp/gce-resources.yaml b/model/gcp/gce-resources.yaml index 90e399e41..2e2c8195b 100644 --- a/model/gcp/gce-resources.yaml +++ b/model/gcp/gce-resources.yaml @@ -1,6 +1,6 @@ groups: - id: resource.gcp.gce - type: resource + type: entity stability: development name: gcp.gce brief: > diff --git a/model/heroku/resources.yaml b/model/heroku/resources.yaml index 81636caea..3f17cf478 100644 --- a/model/heroku/resources.yaml +++ b/model/heroku/resources.yaml @@ -1,6 +1,6 @@ groups: - id: resource.heroku - type: resource + type: entity stability: development name: heroku brief: > diff --git a/model/host/resources.yaml b/model/host/resources.yaml index 2a36dbb0f..4bd87fcd8 100644 --- a/model/host/resources.yaml +++ b/model/host/resources.yaml @@ -1,6 +1,6 @@ groups: - id: resource.host - type: resource + type: entity stability: development name: host brief: > @@ -45,7 +45,7 @@ groups: requirement_level: opt_in - id: resource.host.cpu - type: resource + type: entity stability: development name: host.cpu brief: > diff --git a/model/k8s/resources.yaml b/model/k8s/resources.yaml index 322861404..50f755e09 100644 --- a/model/k8s/resources.yaml +++ b/model/k8s/resources.yaml @@ -1,6 +1,6 @@ groups: - id: resource.k8s.cluster - type: resource + type: entity stability: development name: k8s.cluster brief: > @@ -10,7 +10,7 @@ groups: - ref: k8s.cluster.uid - id: resource.k8s.node - type: resource + type: entity stability: development name: k8s.node brief: > @@ -24,7 +24,7 @@ groups: requirement_level: opt_in - id: resource.k8s.namespace - type: resource + type: entity stability: development name: k8s.namespace brief: > @@ -37,7 +37,7 @@ groups: requirement_level: opt_in - id: resource.k8s.pod - type: resource + type: entity stability: development name: k8s.pod brief: > @@ -51,7 +51,7 @@ groups: requirement_level: opt_in - id: resource.k8s.container - type: resource + type: entity stability: development name: k8s.container brief: > @@ -62,7 +62,7 @@ groups: - ref: k8s.container.status.last_terminated_reason - id: resource.k8s.replicaset - type: resource + type: entity stability: development name: k8s.replicaset brief: > @@ -76,7 +76,7 @@ groups: requirement_level: opt_in - id: resource.k8s.deployment - type: resource + type: entity stability: development name: k8s.deployment brief: > @@ -90,7 +90,7 @@ groups: requirement_level: opt_in - id: resource.k8s.statefulset - type: resource + type: entity stability: development name: k8s.statefulset brief: > @@ -104,7 +104,7 @@ groups: requirement_level: opt_in - id: resource.k8s.daemonset - type: resource + type: entity stability: development name: k8s.daemonset brief: > @@ -118,7 +118,7 @@ groups: requirement_level: opt_in - id: resource.k8s.job - type: resource + type: entity stability: development name: k8s.job brief: > @@ -132,7 +132,7 @@ groups: requirement_level: opt_in - id: resource.k8s.cronjob - type: resource + type: entity stability: development name: k8s.cronjob brief: > @@ -146,7 +146,7 @@ groups: requirement_level: opt_in - id: resource.k8s.replicationcontroller - type: resource + type: entity stability: development name: k8s.replicationcontroller brief: > @@ -156,7 +156,7 @@ groups: - ref: k8s.replicationcontroller.name - id: resource.k8s.hpa - type: resource + type: entity stability: development name: k8s.hpa brief: > @@ -166,7 +166,7 @@ groups: - ref: k8s.hpa.name - id: resource.k8s.resourcequota - type: resource + type: entity stability: development name: k8s.resourcequota brief: > diff --git a/model/os/resources.yaml b/model/os/resources.yaml index 13f5ac6a7..fe9c9e347 100644 --- a/model/os/resources.yaml +++ b/model/os/resources.yaml @@ -1,6 +1,6 @@ groups: - id: resource.os - type: resource + type: entity stability: development name: os brief: > diff --git a/model/otel/resources.yaml b/model/otel/resources.yaml index ba78711b4..311050167 100644 --- a/model/otel/resources.yaml +++ b/model/otel/resources.yaml @@ -1,7 +1,7 @@ groups: - id: resource.otel.scope # This should not be a resource, but an attribute group. - type: resource + type: entity stability: development name: otel.scope brief: Attributes used by non-OTLP exporters to represent OpenTelemetry Scope's concepts. diff --git a/model/process/resources.yaml b/model/process/resources.yaml index 6140291af..55529613b 100644 --- a/model/process/resources.yaml +++ b/model/process/resources.yaml @@ -1,6 +1,6 @@ groups: - id: resource.process - type: resource + type: entity stability: development name: process brief: > @@ -27,7 +27,7 @@ groups: - ref: process.linux.cgroup - id: resource.process.runtime - type: resource + type: entity stability: development name: process.runtime brief: > diff --git a/model/service/resources.yaml b/model/service/resources.yaml index 40432c7ec..391a22c98 100644 --- a/model/service/resources.yaml +++ b/model/service/resources.yaml @@ -1,6 +1,6 @@ groups: - id: resource.service - type: resource + type: entity name: service brief: > A service instance. diff --git a/model/telemetry/resources.yaml b/model/telemetry/resources.yaml index 75766aadb..9a7aaa8d2 100644 --- a/model/telemetry/resources.yaml +++ b/model/telemetry/resources.yaml @@ -1,7 +1,7 @@ groups: - id: resource.telemetry.sdk name: telemetry.sdk - type: resource + type: entity stability: stable brief: > The telemetry SDK used to capture data recorded by the instrumentation libraries. @@ -14,7 +14,7 @@ groups: requirement_level: required - id: resource.telemetry.distro name: 'telemetry.distro' - type: resource + type: entity stability: development brief: > The distribution of telemetry SDK used to capture data recorded by the instrumentation libraries. diff --git a/model/vcs/resources.yaml b/model/vcs/resources.yaml index fc71d99cb..7c38ba134 100644 --- a/model/vcs/resources.yaml +++ b/model/vcs/resources.yaml @@ -1,6 +1,6 @@ groups: - id: resource.vcs.repo - type: resource + type: entity stability: development name: vcs.repo brief: > @@ -10,7 +10,7 @@ groups: - ref: vcs.repository.name - id: resource.vcs.ref - type: resource + type: entity stability: development name: vcs.ref brief: > diff --git a/model/webengine/resources.yaml b/model/webengine/resources.yaml index f66d73dfa..374448351 100644 --- a/model/webengine/resources.yaml +++ b/model/webengine/resources.yaml @@ -1,6 +1,6 @@ groups: - id: resource.webengine - type: resource + type: entity stability: development name: webengine brief: >