diff --git a/.gitmodules b/.gitmodules index 7aac69906c84..3d14d9a90a4d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,7 +8,7 @@ [submodule "content-modules/opentelemetry-specification"] path = content-modules/opentelemetry-specification url = https://github.com/open-telemetry/opentelemetry-specification.git - spec-pin = v1.40.0 + spec-pin = v1.41.0 [submodule "content-modules/community"] path = content-modules/community url = https://github.com/open-telemetry/community diff --git a/content-modules/opentelemetry-specification b/content-modules/opentelemetry-specification index 0d046c07e2b2..a834643a1ddf 160000 --- a/content-modules/opentelemetry-specification +++ b/content-modules/opentelemetry-specification @@ -1 +1 @@ -Subproject commit 0d046c07e2b24bc2405a3e1d367f93ab102d889d +Subproject commit a834643a1ddff6a3417f6475115d9839a40a609e diff --git a/content/en/blog/2024/otel-generative-ai/index.md b/content/en/blog/2024/otel-generative-ai/index.md index 624bf7212ec2..3f350bac5728 100644 --- a/content/en/blog/2024/otel-generative-ai/index.md +++ b/content/en/blog/2024/otel-generative-ai/index.md @@ -48,7 +48,7 @@ The [Semantic Conventions for Generative AI](/docs/specs/semconv/gen-ai/) focus on capturing insights into AI model behavior through three primary signals: [Traces](/docs/concepts/signals/traces/), [Metrics](/docs/concepts/signals/metrics/), and -[Events](/docs/specs/otel/logs/event-api/). +[Events](https://github.com/open-telemetry/opentelemetry-specification/blob/v1.40.0/specification/logs/event-api.md). Together, these signals provide a comprehensive monitoring framework, enabling better cost management, performance tuning, and request tracing. @@ -74,13 +74,19 @@ model responses, providing a granular view of model interactions. These insights are invaluable for debugging and optimizing AI applications where unexpected behaviors may arise. -{{% alert title="Note" color="info" %}} Note that we decided to use -[events emitted](/docs/specs/otel/logs/api/#emit-an-event) with the +{{% alert title="Note" color="info" %}} + +Note that we decided to use [events emitted] with the [Logs API](/docs/specs/otel/logs/api/) specification in the Semantic Conventions for Generative AI. Events allows for us to define specific [semantic conventions](/docs/specs/semconv/general/events/) for the user prompts and model responses that we capture. This addition to the API is in development -and considered unstable.{{% /alert %}} +and considered unstable. + +[events emitted]: + https://github.com/open-telemetry/opentelemetry-specification/blob/v1.40.0/specification/logs/api.md#emit-an-event + +{{% /alert %}} ### Extending Observability with Vendor-Specific Attributes diff --git a/scripts/content-modules/adjust-pages.pl b/scripts/content-modules/adjust-pages.pl index dc70d5bd3404..b54b90a21668 100755 --- a/scripts/content-modules/adjust-pages.pl +++ b/scripts/content-modules/adjust-pages.pl @@ -18,7 +18,7 @@ my $semConvRef = "$otelSpecRepoUrl/blob/main/semantic_conventions/README.md"; my $specBasePath = '/docs/specs'; my %versions = qw( - spec: 1.40.0 + spec: 1.41.0 otlp: 1.5.0 semconv: 1.29.0 ); @@ -68,7 +68,7 @@ () sub printPatchInfoIf($$) { my ($patchID, $specVersTest) = @_; - print STDOUT "INFO [$patchID]: $0: remove obsolete patch code now that OTel spec has been updated.\n" + print STDOUT "INFO [$patchID]: $0: remove obsolete patch code now that spec(s) have been updated.\n" if $specVersTest && !$patchMsgCount{$patchID}++; } @@ -108,6 +108,13 @@ ($$) ## Semconv if ($ARGV =~ /\/semconv/) { + my $otel_spec_event_deprecation = '(opentelemetry-specification/blob/main/specification/logs)/event-(api|sdk).md'; + if (/$otel_spec_event_deprecation/) { + # Cf. https://github.com/open-telemetry/opentelemetry-specification/pull/4359 + s|$otel_spec_event_deprecation\b|$1/|g; + printPatchInfoIf("2025-01-22-event-(api|sdk)", $semconvVers ne "1.29.0"); + } + s|(\]\()/docs/|$1$specBasePath/semconv/|g; s|(\]:\s*)/docs/|$1$specBasePath/semconv/|; @@ -124,12 +131,16 @@ ($$) # SPECIFICATION custom processing - # TODO: drop the entire if statement patch code when OTel spec vers contains - # https://github.com/open-telemetry/opentelemetry-specification/issues/4338, - # which should be vers > 1.40.0. - if ($ARGV =~ /otel\/specification\/logs/) { - s|(/data-model.md/?)#event-name\b|$1#field-eventname|g; - printPatchInfoIf("2024-12-13-event-name", $otelSpecVers ne "1.40.0"); + my $semconv_attr_naming_md = '(semantic-conventions/blob/main/docs/general)/naming.md(#\w+)?'; + if ($ARGV =~ /^tmp\/otel\/specification/ && /$semconv_attr_naming_md/) { + s|$semconv_attr_naming_md\b|$1/attribute-naming.md|g; + printPatchInfoIf("2025-01-22-attribute-naming.md", $semconvVers ne "1.29.0"); + } + + my $semconv_attr_naming = '(/docs/specs/semconv/general)/naming/'; + if ($ARGV =~ /^tmp\/otel\/specification/ && /$semconv_attr_naming/) { + s|$semconv_attr_naming|$1/attribute-naming/|g; + printPatchInfoIf("2025-01-22-attribute-naming", $semconvVers ne "1.29.0"); } s|\(https://github.com/open-telemetry/opentelemetry-specification\)|($specBasePath/otel/)|; diff --git a/static/refcache.json b/static/refcache.json index 87f1c727befc..171deb627a38 100644 --- a/static/refcache.json +++ b/static/refcache.json @@ -11207,6 +11207,14 @@ "StatusCode": 206, "LastSeen": "2025-01-17T16:51:59.014871-05:00" }, + "https://github.com/open-telemetry/opentelemetry-specification/blob/v1.40.0/specification/logs/api.md#emit-an-event": { + "StatusCode": 206, + "LastSeen": "2025-01-22T05:55:29.802398-05:00" + }, + "https://github.com/open-telemetry/opentelemetry-specification/blob/v1.40.0/specification/logs/event-api.md": { + "StatusCode": 206, + "LastSeen": "2025-01-22T05:55:29.317655-05:00" + }, "https://github.com/open-telemetry/opentelemetry-specification/compare/v1.24.0...v1.25.0": { "StatusCode": 200, "LastSeen": "2024-01-30T16:04:58.243312-05:00" @@ -13195,6 +13203,42 @@ "StatusCode": 200, "LastSeen": "2024-01-30T06:06:25.505322-05:00" }, + "https://github.com/prometheus/OpenMetrics/blob/v1.0.0/specification/OpenMetrics.md#counter-1": { + "StatusCode": 206, + "LastSeen": "2025-01-22T05:33:01.875313-05:00" + }, + "https://github.com/prometheus/OpenMetrics/blob/v1.0.0/specification/OpenMetrics.md#exemplars": { + "StatusCode": 206, + "LastSeen": "2025-01-22T05:33:02.735655-05:00" + }, + "https://github.com/prometheus/OpenMetrics/blob/v1.0.0/specification/OpenMetrics.md#gaugehistogram": { + "StatusCode": 206, + "LastSeen": "2025-01-22T05:32:59.977992-05:00" + }, + "https://github.com/prometheus/OpenMetrics/blob/v1.0.0/specification/OpenMetrics.md#info": { + "StatusCode": 206, + "LastSeen": "2025-01-22T05:32:54.414042-05:00" + }, + "https://github.com/prometheus/OpenMetrics/blob/v1.0.0/specification/OpenMetrics.md#metric": { + "StatusCode": 206, + "LastSeen": "2025-01-22T05:32:55.75186-05:00" + }, + "https://github.com/prometheus/OpenMetrics/blob/v1.0.0/specification/OpenMetrics.md#metricfamily": { + "StatusCode": 206, + "LastSeen": "2025-01-22T05:32:52.083975-05:00" + }, + "https://github.com/prometheus/OpenMetrics/blob/v1.0.0/specification/OpenMetrics.md#protobuf-format": { + "StatusCode": 206, + "LastSeen": "2025-01-22T05:32:55.492783-05:00" + }, + "https://github.com/prometheus/OpenMetrics/blob/v1.0.0/specification/OpenMetrics.md#stateset": { + "StatusCode": 206, + "LastSeen": "2025-01-22T05:32:57.022487-05:00" + }, + "https://github.com/prometheus/OpenMetrics/blob/v1.0.0/specification/OpenMetrics.md#supporting-target-metadata-in-both-push-based-and-pull-based-systems": { + "StatusCode": 206, + "LastSeen": "2025-01-22T05:33:04.063828-05:00" + }, "https://github.com/prometheus/OpenMetrics/blob/v1.0.0/specification/OpenMetrics.md#unit": { "StatusCode": 206, "LastSeen": "2025-01-16T13:35:25.270082-05:00"