From 42165ae045a435ba7fcf9c6d446a09338692b5a4 Mon Sep 17 00:00:00 2001 From: Liudmila Molkova Date: Wed, 8 Jan 2025 12:38:25 -0800 Subject: [PATCH 1/5] Update codeowners: use weaver-approvers group (#1725) --- .github/CODEOWNERS | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 6f7ec8d555..0f57fbc6be 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -110,8 +110,8 @@ /model/feature-flags/ @open-telemetry/specs-semconv-approvers @open-telemetry/semconv-feature-flag-approvers # Tooling -/policies/ @open-telemetry/specs-semconv-approvers @open-telemetry/weaver-maintainers -/policies_test/ @open-telemetry/specs-semconv-approvers @open-telemetry/weaver-maintainers -/templates/ @open-telemetry/specs-semconv-approvers @open-telemetry/weaver-maintainers -/internal/ @open-telemetry/specs-semconv-approvers @open-telemetry/weaver-maintainers -/docs/non-normative/code-generation.md @open-telemetry/specs-semconv-approvers @open-telemetry/weaver-maintainers +/policies/ @open-telemetry/specs-semconv-approvers @open-telemetry/weaver-approvers +/policies_test/ @open-telemetry/specs-semconv-approvers @open-telemetry/weaver-approvers +/templates/ @open-telemetry/specs-semconv-approvers @open-telemetry/weaver-approvers +/internal/ @open-telemetry/specs-semconv-approvers @open-telemetry/weaver-approvers +/docs/non-normative/code-generation.md @open-telemetry/specs-semconv-approvers @open-telemetry/weaver-approvers From f0c108784db1c44aa14dbc047d123f30d223d75e Mon Sep 17 00:00:00 2001 From: Christos Markou Date: Thu, 9 Jan 2025 02:01:00 +0200 Subject: [PATCH 2/5] Add k8s metrics for jobs and cronjobs (#1660) Signed-off-by: ChrsMark Co-authored-by: Liudmila Molkova --- .chloggen/add_k8s_jobs.yaml | 22 ++++ docs/non-normative/k8s-migration.md | 39 +++++++ docs/system/k8s-metrics.md | 172 ++++++++++++++++++++++++++++ model/k8s/metrics.yaml | 82 +++++++++++++ 4 files changed, 315 insertions(+) create mode 100755 .chloggen/add_k8s_jobs.yaml diff --git a/.chloggen/add_k8s_jobs.yaml b/.chloggen/add_k8s_jobs.yaml new file mode 100755 index 0000000000..1937c814f5 --- /dev/null +++ b/.chloggen/add_k8s_jobs.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: k8s + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Add k8s metrics for job and cronjob + +# 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: [1660] + +# (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/docs/non-normative/k8s-migration.md b/docs/non-normative/k8s-migration.md index aafab07ed6..39e7d464c5 100644 --- a/docs/non-normative/k8s-migration.md +++ b/docs/non-normative/k8s-migration.md @@ -49,6 +49,8 @@ and one for disabling the old schema called `semconv.k8s.disableLegacy`. Then: - [K8s StatefulsSet metrics](#k8s-statefulsset-metrics) - [K8s HorizontalPodAutoscaler metrics](#k8s-horizontalpodautoscaler-metrics) - [K8s DaemonSet metrics](#k8s-daemonset-metrics) + - [K8s Job metrics](#k8s-job-metrics) + - [K8s Cronjob metrics](#k8s-cronjob-metrics) @@ -195,3 +197,40 @@ The changes in their metric types are the following: | `k8s.daemonset.ready_nodes` (type: `gauge`) | `k8s.daemonset.ready_nodes` (type: `updowncounter`) | + +### K8s Job metrics + +The K8s Job metrics implemented by the Collector and specifically the +[k8scluster](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.115.0/receiver/k8sclusterreceiver/documentation.md) +receiver were introduced as semantic conventions in +[#1649](https://github.com/open-telemetry/semantic-conventions/pull/1660) (TODO: replace with SemConv version once +available). + +The changes in their metric types are the following: + + + +| Old (Collector) ![changed](https://img.shields.io/badge/changed-orange?style=flat) | New | +|----------------------------------------------------------|----------------------------------------| +| `k8s.job.active_pods` (type: `gauge`) | `k8s.job.active_pods` (type: `updowncounter`) | +| `k8s.job.failed_pods` (type: `gauge`) | `k8s.job.failed_pods` (type: `updowncounter`) | +| `k8s.job.desired_successful_pods` (type: `gauge`) | `k8s.job.desired_successful_pods` (type: `updowncounter`) | +| `k8s.job.max_parallel_pods` (type: `gauge`) | `k8s.job.max_parallel_pods` (type: `updowncounter`) | + +### K8s Cronjob metrics + +The K8s Cronjob metrics implemented by the Collector and specifically the +[k8scluster](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/v0.115.0/receiver/k8sclusterreceiver/documentation.md) +receiver were introduced as semantic conventions in +[#1649](https://github.com/open-telemetry/semantic-conventions/pull/1660) (TODO: replace with SemConv version once +available). + +The changes in their metric types are the following: + + + +| Old (Collector) ![changed](https://img.shields.io/badge/changed-orange?style=flat) | New | +|--------------------------------------------------|--------------------------------| +| `k8s.cronjob.active_jobs` (type: `gauge`) | `k8s.cronjob.active_jobs` (type: `updowncounter`) | + + diff --git a/docs/system/k8s-metrics.md b/docs/system/k8s-metrics.md index ccae842e5d..e95ba7fec1 100644 --- a/docs/system/k8s-metrics.md +++ b/docs/system/k8s-metrics.md @@ -57,6 +57,14 @@ and therefore inherit its attributes, like `k8s.pod.name` and `k8s.pod.uid`. - [Metric: `k8s.daemonset.desired_scheduled_nodes`](#metric-k8sdaemonsetdesired_scheduled_nodes) - [Metric: `k8s.daemonset.misscheduled_nodes`](#metric-k8sdaemonsetmisscheduled_nodes) - [Metric: `k8s.daemonset.ready_nodes`](#metric-k8sdaemonsetready_nodes) +- [Job Metrics](#job-metrics) + - [Metric: `k8s.job.active_pods`](#metric-k8sjobactive_pods) + - [Metric: `k8s.job.failed_pods`](#metric-k8sjobfailed_pods) + - [Metric: `k8s.job.successful_pods`](#metric-k8sjobsuccessful_pods) + - [Metric: `k8s.job.desired_successful_pods`](#metric-k8sjobdesired_successful_pods) + - [Metric: `k8s.job.max_parallel_pods`](#metric-k8sjobmax_parallel_pods) +- [CronJob Metrics](#cronjob-metrics) + - [Metric: `k8s.cronjob.active_jobs`](#metric-k8scronjobactive_jobs) @@ -856,5 +864,169 @@ This metric SHOULD, at a minimum, be reported against a +## Job Metrics + +**Description:** Job level metrics captured under the namespace `k8s.job`. + +### Metric: `k8s.job.active_pods` + +This metric is [recommended][MetricRecommended]. + + + + + + + + +| Name | Instrument Type | Unit (UCUM) | Description | Stability | +| -------- | --------------- | ----------- | -------------- | --------- | +| `k8s.job.active_pods` | UpDownCounter | `{pod}` | The number of pending and actively running pods for a job [1] | ![Experimental](https://img.shields.io/badge/-experimental-blue) | + +**[1]:** This metric aligns with the `active` field of the +[K8s JobStatus](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#jobstatus-v1-batch). + +This metric SHOULD, at a minimum, be reported against a +[`k8s.job`](../resource/k8s.md#job) resource. + + + + + + +### Metric: `k8s.job.failed_pods` + +This metric is [recommended][MetricRecommended]. + + + + + + + + +| Name | Instrument Type | Unit (UCUM) | Description | Stability | +| -------- | --------------- | ----------- | -------------- | --------- | +| `k8s.job.failed_pods` | UpDownCounter | `{pod}` | The number of pods which reached phase Failed for a job [1] | ![Experimental](https://img.shields.io/badge/-experimental-blue) | + +**[1]:** This metric aligns with the `failed` field of the +[K8s JobStatus](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#jobstatus-v1-batch). + +This metric SHOULD, at a minimum, be reported against a +[`k8s.job`](../resource/k8s.md#job) resource. + + + + + + +### Metric: `k8s.job.successful_pods` + +This metric is [recommended][MetricRecommended]. + + + + + + + + +| Name | Instrument Type | Unit (UCUM) | Description | Stability | +| -------- | --------------- | ----------- | -------------- | --------- | +| `k8s.job.successful_pods` | UpDownCounter | `{pod}` | The number of pods which reached phase Succeeded for a job [1] | ![Experimental](https://img.shields.io/badge/-experimental-blue) | + +**[1]:** This metric aligns with the `succeeded` field of the +[K8s JobStatus](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#jobstatus-v1-batch). + +This metric SHOULD, at a minimum, be reported against a +[`k8s.job`](../resource/k8s.md#job) resource. + + + + + + +### Metric: `k8s.job.desired_successful_pods` + +This metric is [recommended][MetricRecommended]. + + + + + + + + +| Name | Instrument Type | Unit (UCUM) | Description | Stability | +| -------- | --------------- | ----------- | -------------- | --------- | +| `k8s.job.desired_successful_pods` | UpDownCounter | `{pod}` | The desired number of successfully finished pods the job should be run with [1] | ![Experimental](https://img.shields.io/badge/-experimental-blue) | + +**[1]:** This metric aligns with the `completions` field of the +[K8s JobSpec](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#jobspec-v1-batch). + +This metric SHOULD, at a minimum, be reported against a +[`k8s.job`](../resource/k8s.md#job) resource. + + + + + + +### Metric: `k8s.job.max_parallel_pods` + +This metric is [recommended][MetricRecommended]. + + + + + + + + +| Name | Instrument Type | Unit (UCUM) | Description | Stability | +| -------- | --------------- | ----------- | -------------- | --------- | +| `k8s.job.max_parallel_pods` | UpDownCounter | `{pod}` | The max desired number of pods the job should run at any given time [1] | ![Experimental](https://img.shields.io/badge/-experimental-blue) | + +**[1]:** This metric aligns with the `parallelism` field of the +[K8s JobSpec](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#jobspec-v1-batch. + +This metric SHOULD, at a minimum, be reported against a +[`k8s.job`](../resource/k8s.md#job) resource. + + + + + + +## CronJob Metrics + +**Description:** CronJob level metrics captured under the namespace `k8s.cronjob`. + +### Metric: `k8s.cronjob.active_jobs` + +This metric is [recommended][MetricRecommended]. + + + + + + + + +| Name | Instrument Type | Unit (UCUM) | Description | Stability | +| -------- | --------------- | ----------- | -------------- | --------- | +| `k8s.cronjob.active_jobs` | UpDownCounter | `{job}` | The number of actively running jobs for a cronjob [1] | ![Experimental](https://img.shields.io/badge/-experimental-blue) | + +**[1]:** This metric aligns with the `active` field of the +[K8s CronJobStatus](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#cronjobstatus-v1-batch). + +This metric SHOULD, at a minimum, be reported against a +[`k8s.cronjob`](../resource/k8s.md#cronjob) resource. + + + + + + [DocumentStatus]: https://opentelemetry.io/docs/specs/otel/document-status [MetricRecommended]: /docs/general/metric-requirement-level.md#recommended diff --git a/model/k8s/metrics.yaml b/model/k8s/metrics.yaml index 6debfdc24c..1301662270 100644 --- a/model/k8s/metrics.yaml +++ b/model/k8s/metrics.yaml @@ -360,3 +360,85 @@ groups: [`k8s.daemonset`](../resource/k8s.md#daemonset) resource. instrument: updowncounter unit: "{node}" + + # k8s.job.* metrics + - id: metric.k8s.job.active_pods + type: metric + metric_name: k8s.job.active_pods + stability: experimental + brief: "The number of pending and actively running pods for a job" + instrument: updowncounter + unit: "{pod}" + note: | + This metric aligns with the `active` field of the + [K8s JobStatus](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#jobstatus-v1-batch). + + This metric SHOULD, at a minimum, be reported against a + [`k8s.job`](../resource/k8s.md#job) resource. + - id: metric.k8s.job.failed_pods + type: metric + metric_name: k8s.job.failed_pods + stability: experimental + brief: "The number of pods which reached phase Failed for a job" + instrument: updowncounter + unit: "{pod}" + note: | + This metric aligns with the `failed` field of the + [K8s JobStatus](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#jobstatus-v1-batch). + + This metric SHOULD, at a minimum, be reported against a + [`k8s.job`](../resource/k8s.md#job) resource. + - id: metric.k8s.job.successful_pods + type: metric + metric_name: k8s.job.successful_pods + stability: experimental + brief: "The number of pods which reached phase Succeeded for a job" + instrument: updowncounter + unit: "{pod}" + note: | + This metric aligns with the `succeeded` field of the + [K8s JobStatus](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#jobstatus-v1-batch). + + This metric SHOULD, at a minimum, be reported against a + [`k8s.job`](../resource/k8s.md#job) resource. + - id: metric.k8s.job.desired_successful_pods + type: metric + metric_name: k8s.job.desired_successful_pods + stability: experimental + brief: "The desired number of successfully finished pods the job should be run with" + instrument: updowncounter + unit: "{pod}" + note: | + This metric aligns with the `completions` field of the + [K8s JobSpec](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#jobspec-v1-batch). + + This metric SHOULD, at a minimum, be reported against a + [`k8s.job`](../resource/k8s.md#job) resource. + - id: metric.k8s.job.max_parallel_pods + type: metric + metric_name: k8s.job.max_parallel_pods + stability: experimental + brief: "The max desired number of pods the job should run at any given time" + instrument: updowncounter + unit: "{pod}" + note: | + This metric aligns with the `parallelism` field of the + [K8s JobSpec](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#jobspec-v1-batch. + + This metric SHOULD, at a minimum, be reported against a + [`k8s.job`](../resource/k8s.md#job) resource. + + # k8s.job.* metrics + - id: metric.k8s.cronjob.active_jobs + type: metric + metric_name: k8s.cronjob.active_jobs + stability: experimental + brief: "The number of actively running jobs for a cronjob" + instrument: updowncounter + unit: "{job}" + note: | + This metric aligns with the `active` field of the + [K8s CronJobStatus](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.30/#cronjobstatus-v1-batch). + + This metric SHOULD, at a minimum, be reported against a + [`k8s.cronjob`](../resource/k8s.md#cronjob) resource. From dfb38f156967fde1564b5a1fd7202726d282d2cb Mon Sep 17 00:00:00 2001 From: Tyler Yahn Date: Wed, 8 Jan 2025 16:35:37 -0800 Subject: [PATCH 3/5] Update http-spans.md example POST (#1727) Co-authored-by: Liudmila Molkova --- docs/http/http-spans.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/http/http-spans.md b/docs/http/http-spans.md index 0b382115cf..6d54263fcd 100644 --- a/docs/http/http-spans.md +++ b/docs/http/http-spans.md @@ -735,7 +735,7 @@ Span name: `POST /uploads/:document_id`. | Attribute name | Value | | :------------------- | :---------------------------------------------- | -| `http.request.method`| `"GET"` | +| `http.request.method`| `"POST"` | | `url.path` | `"/uploads/4"` | | `url.scheme` | `"https"` | | `http.route` | `"/uploads/:document_id"` | From 65f3f8f2a45ab2aef750ab6e2285d0347b0b3c48 Mon Sep 17 00:00:00 2001 From: Adrian Cole <64215+codefromthecrypt@users.noreply.github.com> Date: Thu, 9 Jan 2025 17:59:09 +0800 Subject: [PATCH 4/5] Adds `mistral_ai` as a `gen_ai.system` attribute value (#1719) Signed-off-by: Adrian Cole Co-authored-by: Liudmila Molkova Co-authored-by: Joao Grassi <5938087+joaopgrassi@users.noreply.github.com> --- .chloggen/1719.yaml | 22 ++++++++++++++++++++++ docs/attributes-registry/gen-ai.md | 1 + docs/gen-ai/gen-ai-events.md | 5 +++++ docs/gen-ai/gen-ai-metrics.md | 5 +++++ docs/gen-ai/gen-ai-spans.md | 1 + model/gen-ai/registry.yaml | 4 ++++ 6 files changed, 38 insertions(+) create mode 100644 .chloggen/1719.yaml diff --git a/.chloggen/1719.yaml b/.chloggen/1719.yaml new file mode 100644 index 0000000000..efcabfa174 --- /dev/null +++ b/.chloggen/1719.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: genai + +# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). +note: Adds `mistral_ai` as a `gen_ai.system` attribute value. + +# 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: [1719] + +# (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/docs/attributes-registry/gen-ai.md b/docs/attributes-registry/gen-ai.md index 61a0b08cce..c29800aad6 100644 --- a/docs/attributes-registry/gen-ai.md +++ b/docs/attributes-registry/gen-ai.md @@ -77,6 +77,7 @@ If none of these options apply, the `gen_ai.system` SHOULD be set to `_OTHER`. | `gemini` | Gemini | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `groq` | Groq | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `ibm.watsonx.ai` | IBM Watsonx AI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | +| `mistral_ai` | Mistral AI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `openai` | OpenAI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `perplexity` | Perplexity | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `vertex_ai` | Vertex AI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | diff --git a/docs/gen-ai/gen-ai-events.md b/docs/gen-ai/gen-ai-events.md index b43bb2578f..445347e74d 100644 --- a/docs/gen-ai/gen-ai-events.md +++ b/docs/gen-ai/gen-ai-events.md @@ -92,6 +92,7 @@ If none of these options apply, the `gen_ai.system` SHOULD be set to `_OTHER`. | `gemini` | Gemini | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `groq` | Groq | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `ibm.watsonx.ai` | IBM Watsonx AI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | +| `mistral_ai` | Mistral AI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `openai` | OpenAI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `perplexity` | Perplexity | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `vertex_ai` | Vertex AI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | @@ -155,6 +156,7 @@ If none of these options apply, the `gen_ai.system` SHOULD be set to `_OTHER`. | `gemini` | Gemini | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `groq` | Groq | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `ibm.watsonx.ai` | IBM Watsonx AI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | +| `mistral_ai` | Mistral AI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `openai` | OpenAI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `perplexity` | Perplexity | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `vertex_ai` | Vertex AI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | @@ -218,6 +220,7 @@ If none of these options apply, the `gen_ai.system` SHOULD be set to `_OTHER`. | `gemini` | Gemini | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `groq` | Groq | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `ibm.watsonx.ai` | IBM Watsonx AI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | +| `mistral_ai` | Mistral AI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `openai` | OpenAI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `perplexity` | Perplexity | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `vertex_ai` | Vertex AI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | @@ -296,6 +299,7 @@ If none of these options apply, the `gen_ai.system` SHOULD be set to `_OTHER`. | `gemini` | Gemini | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `groq` | Groq | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `ibm.watsonx.ai` | IBM Watsonx AI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | +| `mistral_ai` | Mistral AI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `openai` | OpenAI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `perplexity` | Perplexity | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `vertex_ai` | Vertex AI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | @@ -360,6 +364,7 @@ If none of these options apply, the `gen_ai.system` SHOULD be set to `_OTHER`. | `gemini` | Gemini | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `groq` | Groq | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `ibm.watsonx.ai` | IBM Watsonx AI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | +| `mistral_ai` | Mistral AI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `openai` | OpenAI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `perplexity` | Perplexity | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `vertex_ai` | Vertex AI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | diff --git a/docs/gen-ai/gen-ai-metrics.md b/docs/gen-ai/gen-ai-metrics.md index ac473e6c76..8efa2376e7 100644 --- a/docs/gen-ai/gen-ai-metrics.md +++ b/docs/gen-ai/gen-ai-metrics.md @@ -112,6 +112,7 @@ If none of these options apply, the `gen_ai.system` SHOULD be set to `_OTHER`. | `gemini` | Gemini | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `groq` | Groq | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `ibm.watsonx.ai` | IBM Watsonx AI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | +| `mistral_ai` | Mistral AI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `openai` | OpenAI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `perplexity` | Perplexity | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `vertex_ai` | Vertex AI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | @@ -213,6 +214,7 @@ Instrumentations SHOULD document the list of errors they report. | `gemini` | Gemini | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `groq` | Groq | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `ibm.watsonx.ai` | IBM Watsonx AI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | +| `mistral_ai` | Mistral AI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `openai` | OpenAI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `perplexity` | Perplexity | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `vertex_ai` | Vertex AI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | @@ -312,6 +314,7 @@ Instrumentations SHOULD document the list of errors they report. | `gemini` | Gemini | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `groq` | Groq | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `ibm.watsonx.ai` | IBM Watsonx AI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | +| `mistral_ai` | Mistral AI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `openai` | OpenAI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `perplexity` | Perplexity | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `vertex_ai` | Vertex AI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | @@ -398,6 +401,7 @@ If none of these options apply, the `gen_ai.system` SHOULD be set to `_OTHER`. | `gemini` | Gemini | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `groq` | Groq | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `ibm.watsonx.ai` | IBM Watsonx AI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | +| `mistral_ai` | Mistral AI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `openai` | OpenAI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `perplexity` | Perplexity | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `vertex_ai` | Vertex AI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | @@ -483,6 +487,7 @@ If none of these options apply, the `gen_ai.system` SHOULD be set to `_OTHER`. | `gemini` | Gemini | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `groq` | Groq | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `ibm.watsonx.ai` | IBM Watsonx AI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | +| `mistral_ai` | Mistral AI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `openai` | OpenAI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `perplexity` | Perplexity | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `vertex_ai` | Vertex AI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | diff --git a/docs/gen-ai/gen-ai-spans.md b/docs/gen-ai/gen-ai-spans.md index 24a70cade6..99cfb96f8b 100644 --- a/docs/gen-ai/gen-ai-spans.md +++ b/docs/gen-ai/gen-ai-spans.md @@ -126,6 +126,7 @@ Instrumentations SHOULD document the list of errors they report. | `gemini` | Gemini | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `groq` | Groq | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `ibm.watsonx.ai` | IBM Watsonx AI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | +| `mistral_ai` | Mistral AI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `openai` | OpenAI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `perplexity` | Perplexity | ![Experimental](https://img.shields.io/badge/-experimental-blue) | | `vertex_ai` | Vertex AI | ![Experimental](https://img.shields.io/badge/-experimental-blue) | diff --git a/model/gen-ai/registry.yaml b/model/gen-ai/registry.yaml index 09c36698e4..dd7d36230e 100644 --- a/model/gen-ai/registry.yaml +++ b/model/gen-ai/registry.yaml @@ -61,6 +61,10 @@ groups: stability: experimental value: "groq" brief: 'Groq' + - id: mistral_ai + stability: experimental + value: "mistral_ai" + brief: 'Mistral AI' brief: The Generative AI product as identified by the client or server instrumentation. note: | From 1aa6a5c024f806ca15260c2e83bee2c1d63a50b2 Mon Sep 17 00:00:00 2001 From: Joao Grassi <5938087+joaopgrassi@users.noreply.github.com> Date: Fri, 10 Jan 2025 03:42:18 +0100 Subject: [PATCH 5/5] Messaging: Align span kind in example tables with the spec (#1730) --- docs/messaging/messaging-spans.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/messaging/messaging-spans.md b/docs/messaging/messaging-spans.md index cda4fcfa54..0d13af08bd 100644 --- a/docs/messaging/messaging-spans.md +++ b/docs/messaging/messaging-spans.md @@ -608,7 +608,7 @@ flowchart LR; | Links | | | Span Send A, Span Send B | | Link attributes | | | Span Send A: `messaging.message.id`: `"a1"` | | | | | Span Send B: `messaging.message.id`: `"a2"` | -| SpanKind | `PRODUCER` | `PRODUCER` | `CONSUMER` | +| SpanKind | `PRODUCER` | `PRODUCER` | `CLIENT` | | `server.address` | `"ms"` | `"ms"` | `"ms"` | | `server.port` | `1234` | `1234` | `1234` | | `messaging.system` | `"kafka"` | `"kafka"` | `"kafka"` | @@ -657,7 +657,7 @@ flowchart LR; | Span name | `create Q` | `create Q` | `send Q` | `poll Q` | `poll Q` | | Parent | | | | | | | Links | | | | Span Create A | Span Create B | -| SpanKind | `PRODUCER` | `PRODUCER` | `CLIENT` | `CONSUMER` | `CONSUMER` | +| SpanKind | `PRODUCER` | `PRODUCER` | `CLIENT` | `CLIENT` | `CLIENT` | | `server.address` | `"ms"` | `"ms"` | `"ms"` | `"ms"` | `"ms"` | | `server.port` | `1234` | `1234` | `1234` | `1234` | `1234` | | `messaging.system` | `"kafka"` | `"kafka"` | `"kafka"` | `"kafka"` | `"kafka"` | @@ -702,7 +702,7 @@ flowchart LR; | Span name | `send Q` | `poll Q` | `poll Q` | | Parent | | | | | Links | | Span Publish | Span Publish | -| SpanKind | `PRODUCER` | `CONSUMER` | `CONSUMER` | +| SpanKind | `PRODUCER` | `CLIENT` | `CLIENT` | | `server.address` | `"ms"` | `"ms"` | `"ms"` | | `server.port` | `1234` | `1234` | `1234` | | `messaging.system` | `"kafka"` | `"kafka"` | `"kafka"` |