Merge branch 'main' into rabbitmq-destination-name

.chloggen/.oracle_cloud.yaml

@@ -0,0 +1,22 @@
+# Use this changelog template to create an entry for release notes.
+#
+# If your change doesn't affect end users you should instead start
+# your pull request title with [chore] or use the "Skip Changelog" label.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: enhancement
+
+# The name of the area of concern in the attributes-registry, (e.g. http, cloud, db)
+component: cloud
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Add Oracle Cloud Infrastructure to Semantic Conventions
+
+# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
+# The values here must be integers.
+issues: [1658]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:

docs/attributes-registry/cloud.md

@@ -74,6 +74,8 @@ The following well-known definitions MUST be used if you set this attribute and
 | `gcp_kubernetes_engine` | Google Cloud Kubernetes Engine (GKE) | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
 | `gcp_openshift` | Red Hat OpenShift on Google Cloud | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
 | `ibm_cloud_openshift` | Red Hat OpenShift on IBM Cloud | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
+| `oracle_cloud_compute` | Compute on Oracle Cloud Infrastructure (OCI) | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
+| `oracle_cloud_oke` | Kubernetes Engine (OKE) on Oracle Cloud Infrastructure (OCI) | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
 | `tencent_cloud_cvm` | Tencent Cloud Cloud Virtual Machine (CVM) | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
 | `tencent_cloud_eks` | Tencent Cloud Elastic Kubernetes Service (EKS) | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
 | `tencent_cloud_scf` | Tencent Cloud Serverless Cloud Function (SCF) | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
@@ -90,4 +92,5 @@ The following well-known definitions MUST be used if you set this attribute and
 | `gcp` | Google Cloud Platform | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
 | `heroku` | Heroku Platform as a Service | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
 | `ibm_cloud` | IBM Cloud | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
+| `oracle_cloud` | Oracle Cloud Infrastructure (OCI) | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
 | `tencent_cloud` | Tencent Cloud | ![Experimental](https://img.shields.io/badge/-experimental-blue) |

docs/resource/cloud.md

@@ -78,6 +78,8 @@ The following well-known definitions MUST be used if you set this attribute and
 | `gcp_kubernetes_engine` | Google Cloud Kubernetes Engine (GKE) | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
 | `gcp_openshift` | Red Hat OpenShift on Google Cloud | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
 | `ibm_cloud_openshift` | Red Hat OpenShift on IBM Cloud | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
+| `oracle_cloud_compute` | Compute on Oracle Cloud Infrastructure (OCI) | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
+| `oracle_cloud_oke` | Kubernetes Engine (OKE) on Oracle Cloud Infrastructure (OCI) | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
 | `tencent_cloud_cvm` | Tencent Cloud Cloud Virtual Machine (CVM) | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
 | `tencent_cloud_eks` | Tencent Cloud Elastic Kubernetes Service (EKS) | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
 | `tencent_cloud_scf` | Tencent Cloud Serverless Cloud Function (SCF) | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
@@ -94,6 +96,7 @@ The following well-known definitions MUST be used if you set this attribute and
 | `gcp` | Google Cloud Platform | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
 | `heroku` | Heroku Platform as a Service | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
 | `ibm_cloud` | IBM Cloud | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
+| `oracle_cloud` | Oracle Cloud Infrastructure (OCI) | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
 | `tencent_cloud` | Tencent Cloud | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
 
 <!-- markdownlint-restore -->

model/cloud/registry.yaml

@@ -32,6 +32,10 @@ groups:
               value: 'ibm_cloud'
               brief: 'IBM Cloud'
               stability: experimental
+            - id: 'oracle_cloud'
+              value: 'oracle_cloud'
+              brief: 'Oracle Cloud Infrastructure (OCI)'
+              stability: experimental
             - id: 'tencent_cloud'
               value: 'tencent_cloud'
               brief: 'Tencent Cloud'
@@ -201,6 +205,14 @@ groups:
               value: 'ibm_cloud_openshift'
               brief: Red Hat OpenShift on IBM Cloud
               stability: experimental
+            - id: oracle_cloud_compute
+              value: 'oracle_cloud_compute'
+              brief: Compute on Oracle Cloud Infrastructure (OCI)
+              stability: experimental
+            - id: oracle_cloud_oke
+              value: 'oracle_cloud_oke'
+              brief: Kubernetes Engine (OKE) on Oracle Cloud Infrastructure (OCI)
+              stability: experimental
             - id: tencent_cloud_cvm
               value: 'tencent_cloud_cvm'
               brief: Tencent Cloud Cloud Virtual Machine (CVM)