Merge remote-tracking branch 'origin/main' into extend-gen-ai-system-…

…values
open-telemetry · May 30, 2024 · 123ed4e · 123ed4e
2 parents 6b59f94 + b56bad3
commit 123ed4e
Show file tree

Hide file tree

Showing 89 changed files with 1,293 additions and 758 deletions.
diff --git a/.chloggen/1024.yaml b/.chloggen/1024.yaml
@@ -0,0 +1,4 @@
+change_type: enhancement
+component: db
+note: List SQL database systems on the SQL semantic conventions.
+issues: [1024]
diff --git a/.chloggen/1069.yaml b/.chloggen/1069.yaml
@@ -0,0 +1,7 @@
+change_type: enhancement
+
+component: db
+
+note: 'Update database span name: clarify that target depends on the operation and should not be set when corresponding data is not available.'
+
+issues: [1045]
diff --git a/.chloggen/1070.yaml b/.chloggen/1070.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: db
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Mention how to capture collection and operation names from query text in the registry
+
+# 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: [ 1070 ]
+
+# (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:
diff --git a/.chloggen/811.yaml b/.chloggen/811.yaml
@@ -0,0 +1,4 @@
+change_type: enhancement
+component: gen-ai
+note: Adding metrics for GenAI clients.
+issues: [811]
diff --git a/.chloggen/database-batch-operations.yaml b/.chloggen/database-batch-operations.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: db
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Add support for database batch operations
+
+# 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: [ 712 ]
+
+# (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:
diff --git a/.chloggen/influxdb.yaml b/.chloggen/influxdb.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: db
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Add semantic convention of InfluxDB
+
+# 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: [949]
+
+# (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:
diff --git a/.chloggen/user_ns.yaml b/.chloggen/user_ns.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: new_component
+
+# The name of the area of concern in the attributes-registry, (e.g. http, cloud, db)
+component: user
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: BREAKING - deprecate `enduser` in favor of a new `user` namespace. Add more `user` attributes.
+
+# 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: [731]
+
+# (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:
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -34,7 +34,6 @@ body:
         - area:device
         - area:disk
         - area:dns
-        - area:enduser
         - area:error
         - area:event
         - area:exception
@@ -71,6 +70,7 @@ body:
         - area:tls
         - area:url
         - area:user-agent
+        - area:user
         - area:webengine
         # End semconv area list
   - type: textarea

diff --git a/.github/ISSUE_TEMPLATE/change_proposal.yaml b/.github/ISSUE_TEMPLATE/change_proposal.yaml
@@ -27,7 +27,6 @@ body:
         - area:device
         - area:disk
         - area:dns
-        - area:enduser
         - area:error
         - area:event
         - area:exception
@@ -64,6 +63,7 @@ body:
         - area:tls
         - area:url
         - area:user-agent
+        - area:user
         - area:webengine
         # End semconv area list
   - type: textarea

diff --git a/.github/ISSUE_TEMPLATE/new-conventions.yaml b/.github/ISSUE_TEMPLATE/new-conventions.yaml
@@ -36,7 +36,6 @@ body:
         - area:device
         - area:disk
         - area:dns
-        - area:enduser
         - area:error
         - area:event
         - area:exception
@@ -73,6 +72,7 @@ body:
         - area:tls
         - area:url
         - area:user-agent
+        - area:user
         - area:webengine
         # End semconv area list
   - type: textarea

diff --git a/docs/attributes-registry/README.md b/docs/attributes-registry/README.md
@@ -83,6 +83,7 @@ Currently, the following namespaces exist:
 - [Thread](thread.md)
 - [TLS](tls.md)
 - [URL](url.md)
+- [User](user.md)
 - [User Agent](user-agent.md)
 - [Webengine](webengine.md)
 

diff --git a/docs/attributes-registry/android.md b/docs/attributes-registry/android.md
@@ -31,6 +31,6 @@ This document defines attributes that represents an occurrence of a lifecycle tr
 
 | Value        | Description                                                                                                                                                            | Stability                                                        |
 | ------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------- |
-| `created`    | Any time before Activity.onResume() or, if the app has no Activity, Context.startService() has been called in the app for the first time.                              | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
 | `background` | Any time after Activity.onPause() or, if the app has no Activity, Context.stopService() has been called when the app was in the foreground state.                      | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
+| `created`    | Any time before Activity.onResume() or, if the app has no Activity, Context.startService() has been called in the app for the first time.                              | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
 | `foreground` | Any time after Activity.onResume() or, if the app has no Activity, Context.startService() has been called when the app was in either the created or background states. | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
diff --git a/docs/attributes-registry/aspnetcore.md b/docs/attributes-registry/aspnetcore.md
@@ -24,10 +24,10 @@ ASP.NET Core attributes
 
 | Value       | Description                                                      | Stability                                                  |
 | ----------- | ---------------------------------------------------------------- | ---------------------------------------------------------- |
+| `aborted`   | Exception handling didn't run because the request was aborted.   | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
 | `handled`   | Exception was handled by the exception handling middleware.      | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
-| `unhandled` | Exception was not handled by the exception handling middleware.  | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
 | `skipped`   | Exception handling was skipped because the response had started. | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
-| `aborted`   | Exception handling didn't run because the request was aborted.   | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
+| `unhandled` | Exception was not handled by the exception handling middleware.  | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
 
 `aspnetcore.rate_limiting.result` has the following list of well-known values. If one of them applies, then the respective value MUST be used; otherwise, a custom value MAY be used.
 
@@ -42,5 +42,5 @@ ASP.NET Core attributes
 
 | Value     | Description     | Stability                                                  |
 | --------- | --------------- | ---------------------------------------------------------- |
-| `success` | Match succeeded | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
 | `failure` | Match failed    | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
+| `success` | Match succeeded | ![Stable](https://img.shields.io/badge/-stable-lightgreen) |
diff --git a/docs/attributes-registry/cloud.md b/docs/attributes-registry/cloud.md
@@ -50,26 +50,26 @@ The following well-known definitions MUST be used if you set this attribute and
 | `alibaba_cloud_ecs`         | Alibaba Cloud Elastic Compute Service          | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
 | `alibaba_cloud_fc`          | Alibaba Cloud Function Compute                 | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
 | `alibaba_cloud_openshift`   | Red Hat OpenShift on Alibaba Cloud             | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
+| `aws_app_runner`            | AWS App Runner                                 | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
 | `aws_ec2`                   | AWS Elastic Compute Cloud                      | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
 | `aws_ecs`                   | AWS Elastic Container Service                  | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
 | `aws_eks`                   | AWS Elastic Kubernetes Service                 | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
-| `aws_lambda`                | AWS Lambda                                     | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
 | `aws_elastic_beanstalk`     | AWS Elastic Beanstalk                          | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
-| `aws_app_runner`            | AWS App Runner                                 | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
+| `aws_lambda`                | AWS Lambda                                     | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
 | `aws_openshift`             | Red Hat OpenShift on AWS (ROSA)                | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
-| `azure_vm`                  | Azure Virtual Machines                         | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
+| `azure_aks`                 | Azure Kubernetes Service                       | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
+| `azure_app_service`         | Azure App Service                              | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
 | `azure_container_apps`      | Azure Container Apps                           | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
 | `azure_container_instances` | Azure Container Instances                      | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
-| `azure_aks`                 | Azure Kubernetes Service                       | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
 | `azure_functions`           | Azure Functions                                | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
-| `azure_app_service`         | Azure App Service                              | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
 | `azure_openshift`           | Azure Red Hat OpenShift                        | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
+| `azure_vm`                  | Azure Virtual Machines                         | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
+| `gcp_app_engine`            | Google Cloud App Engine (GAE)                  | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
 | `gcp_bare_metal_solution`   | Google Bare Metal Solution (BMS)               | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
-| `gcp_compute_engine`        | Google Cloud Compute Engine (GCE)              | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
+| `gcp_cloud_functions`       | Google Cloud Functions (GCF)                   | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
 | `gcp_cloud_run`             | Google Cloud Run                               | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
+| `gcp_compute_engine`        | Google Cloud Compute Engine (GCE)              | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
 | `gcp_kubernetes_engine`     | Google Cloud Kubernetes Engine (GKE)           | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
-| `gcp_cloud_functions`       | Google Cloud Functions (GCF)                   | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
-| `gcp_app_engine`            | Google Cloud App Engine (GAE)                  | ![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) |
 | `tencent_cloud_cvm`         | Tencent Cloud Cloud Virtual Machine (CVM)      | ![Experimental](https://img.shields.io/badge/-experimental-blue) |

diff --git a/docs/attributes-registry/container.md b/docs/attributes-registry/container.md
@@ -40,9 +40,9 @@ The ID is assigned by the container runtime and can vary in different environmen
 
 | Value    | Description                                                                                                     | Stability                                                        |
 | -------- | --------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------- |
-| `user`   | When tasks of the cgroup are in user mode (Linux). When all container processes are in user mode (Windows).     | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
-| `system` | When CPU is used by the system (host OS)                                                                        | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
 | `kernel` | When tasks of the cgroup are in kernel mode (Linux). When all container processes are in kernel mode (Windows). | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
+| `system` | When CPU is used by the system (host OS)                                                                        | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
+| `user`   | When tasks of the cgroup are in user mode (Linux). When all container processes are in user mode (Windows).     | ![Experimental](https://img.shields.io/badge/-experimental-blue) |
 
 ## Container Deprecated Attributes