diff --git a/.gitmodules b/.gitmodules index 9835e2ed4b03..61fa68dd51e0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -20,7 +20,7 @@ [submodule "content-modules/semantic-conventions"] path = content-modules/semantic-conventions url = https://github.com/open-telemetry/semantic-conventions - semconv-pin = v1.38.0 + semconv-pin = v1.38.0-58-g64c5c9a9 [submodule "content-modules/opamp-spec"] path = content-modules/opamp-spec url = https://github.com/open-telemetry/opamp-spec diff --git a/content-modules/semantic-conventions b/content-modules/semantic-conventions index 8e16df7981f9..64c5c9a94b98 160000 --- a/content-modules/semantic-conventions +++ b/content-modules/semantic-conventions @@ -1 +1 @@ -Subproject commit 8e16df7981f94b70ed1b9795c995094af995184f +Subproject commit 64c5c9a94b98723d6f5bea6d6306e0708c5c17c4 diff --git a/content/en/docs/languages/python/propagation.md b/content/en/docs/languages/python/propagation.md index d8dbd0c710ba..56eebdbfb7d3 100644 --- a/content/en/docs/languages/python/propagation.md +++ b/content/en/docs/languages/python/propagation.md @@ -125,7 +125,7 @@ This supports context propagation between database client and server when database log records are enabled. For more information, see: - [OpenTelemetry Python sqlcommenter example](https://github.com/open-telemetry/opentelemetry-python/tree/main/docs/examples/sqlcommenter/) -- [Semantic Conventions - Database Spans](/docs/specs/semconv/database/database-spans/#sql-commenter) +- [Semantic Conventions - Database Spans](/docs/specs/semconv/db/database-spans/#sql-commenter) - [sqlcommenter](https://google.github.io/sqlcommenter/) ## Next steps diff --git a/content/en/docs/zero-code/java/agent/supported-libraries.md b/content/en/docs/zero-code/java/agent/supported-libraries.md index ff94d6073524..7abf8e44c30d 100644 --- a/content/en/docs/zero-code/java/agent/supported-libraries.md +++ b/content/en/docs/zero-code/java/agent/supported-libraries.md @@ -184,7 +184,7 @@ view execution. See **[6]** Database client metrics are available for those who opt-in to [semantic convention stability](/docs/specs/semconv/non-normative/db-migration/). -[Elasticsearch Client Spans]: /docs/specs/semconv/database/elasticsearch/ +[Elasticsearch Client Spans]: /docs/specs/semconv/db/elasticsearch/ [HTTP Server Spans]: /docs/specs/semconv/http/http-spans/#http-server [HTTP Client Spans]: /docs/specs/semconv/http/http-spans/#http-client-span [HTTP Server Metrics]: /docs/specs/semconv/http/http-metrics/#http-server @@ -194,9 +194,9 @@ view execution. See [RPC Server Metrics]: /docs/specs/semconv/rpc/rpc-metrics/#rpc-server [RPC Client Metrics]: /docs/specs/semconv/rpc/rpc-metrics/#rpc-client [Messaging Spans]: /docs/specs/semconv/messaging/messaging-spans/ -[Database Client Spans]: /docs/specs/semconv/database/database-spans/ -[Database Client Metrics]: /docs/specs/semconv/database/database-metrics/ -[Database Pool Metrics]: /docs/specs/semconv/database/database-metrics/ +[Database Client Spans]: /docs/specs/semconv/db/database-spans/ +[Database Client Metrics]: /docs/specs/semconv/db/database-metrics/ +[Database Pool Metrics]: /docs/specs/semconv/db/database-metrics/ [JVM Runtime Metrics]: /docs/specs/semconv/runtime/jvm-metrics/ [System Metrics]: /docs/specs/semconv/system/system-metrics/ [GraphQL Server Spans]: /docs/specs/semconv/graphql/graphql-spans/ diff --git a/content/zh/docs/zero-code/java/agent/supported-libraries.md b/content/zh/docs/zero-code/java/agent/supported-libraries.md index 3d895842225f..bb2368720a13 100644 --- a/content/zh/docs/zero-code/java/agent/supported-libraries.md +++ b/content/zh/docs/zero-code/java/agent/supported-libraries.md @@ -1,7 +1,7 @@ --- title: 支持的库 linkTitle: 支持的库 -default_lang_commit: 1fe3f355b66260860b47b6cd79c768fd27402334 +default_lang_commit: 1fe3f355b66260860b47b6cd79c768fd27402334 # patched drifted_from_default: true weight: 11 # prettier-ignore @@ -173,7 +173,7 @@ Java 代理开箱即用地对许多库、框架和应用服务器进行自动插 **[6]** 数据库客户端指标适用于选择加入[语义约定稳定性](/docs/specs/semconv/non-normative/db-migration/)的用户。 -[Elasticsearch Client Spans]: /docs/specs/semconv/database/elasticsearch/ +[Elasticsearch Client Spans]: /docs/specs/semconv/db/elasticsearch/ [HTTP Server Spans]: /docs/specs/semconv/http/http-spans/#http-server [HTTP Client Spans]: /docs/specs/semconv/http/http-spans/#http-client-span [HTTP Server Metrics]: /docs/specs/semconv/http/http-metrics/#http-server @@ -183,9 +183,9 @@ Java 代理开箱即用地对许多库、框架和应用服务器进行自动插 [RPC Server Metrics]: /docs/specs/semconv/rpc/rpc-metrics/#rpc-server [RPC Client Metrics]: /docs/specs/semconv/rpc/rpc-metrics/#rpc-client [Messaging Spans]: /docs/specs/semconv/messaging/messaging-spans/ -[Database Client Spans]: /docs/specs/semconv/database/database-spans/ -[Database Client Metrics]: /docs/specs/semconv/database/database-metrics/ -[Database Pool Metrics]: /docs/specs/semconv/database/database-metrics/ +[Database Client Spans]: /docs/specs/semconv/db/database-spans/ +[Database Client Metrics]: /docs/specs/semconv/db/database-metrics/ +[Database Pool Metrics]: /docs/specs/semconv/db/database-metrics/ [JVM Runtime Metrics]: /docs/specs/semconv/runtime/jvm-metrics/ [System Metrics]: /docs/specs/semconv/system/system-metrics/ [GraphQL Server Spans]: /docs/specs/semconv/graphql/graphql-spans/ diff --git a/scripts/content-modules/adjust-pages.pl b/scripts/content-modules/adjust-pages.pl index 960326ecdcf3..50647cfe3393 100755 --- a/scripts/content-modules/adjust-pages.pl +++ b/scripts/content-modules/adjust-pages.pl @@ -95,6 +95,33 @@ ($$$) return 0; } +# Keep the following as a template: +# sub patchSpec_because_of_SemConv_DockerAPIVersions() { +# return unless +# # Restrict the patch to the proper spec, and section or file: +# $ARGV =~ m|^tmp/semconv/docs/| +# && +# # Call helper function that will cause the function to return early if the +# # current version of the named spec (arg 2) is greater than the target +# # version (arg 3). The first argument is a unique id that will be printed if +# # the patch is outdated. Otherwise, if the patch is still relevant we fall +# # through to the body of this patch function. +# applyPatchOrPrintMsgIf('2025-11-21-docker-api-versions', 'semconv', '1.39.0-dev'); + +# # Give infor about the patch: +# # +# # For the problematic links, see: +# # https://github.com/open-telemetry/semantic-conventions/issues/3103 +# # +# # Replace older Docker API versions with the latest one like in: +# # https://github.com/open-telemetry/semantic-conventions/pull/3093 + +# # This is the actual regex-based patch code: +# s{ +# (https://docs.docker.com/reference/api/engine/version)/v1.(43|51)/(\#tag/) +# }{$1/v1.52/$3}gx; +# } + sub patchSpec_because_of_SemConv_DockerAPIVersions() { return unless # Restrict the patch to the proper spec, and section or file: @@ -121,6 +148,19 @@ () }{$1/v1.52/$3}gx; } +sub patchSpec_because_of_SemConv_DatabaseRenamedToDb() { + return unless + # Restrict the patch to the proper spec, and section or file: + # Note that here we replace links into semconv from the spec + $ARGV =~ m|^tmp/otel/specification/| + && applyPatchOrPrintMsgIf('2025-11-26-database-section-renamed-to-db', 'semconv', '1.39.0-dev'); + + # Give infor about the patch, see: + # https://github.com/open-telemetry/opentelemetry.io/pull/8311#issue-3577941378 + + s|(/semconv)/database(/database-)|$1/db$2|g; +} + sub getVersFromSubmodule() { my %repoNames = qw( otlp opentelemetry-proto @@ -244,6 +284,8 @@ () ) }{$otelSpecRepoUrl/tree/v$otelSpecVers/$2}gx; + patchSpec_because_of_SemConv_DatabaseRenamedToDb(); + s|\.\./((?:examples/)?README\.md)|$otlpSpecRepoUrl/tree/v$otlpSpecVers/$1|g if $ARGV =~ /^tmp\/otlp/; # Make website-local page references local: diff --git a/static/refcache.json b/static/refcache.json index c191ed71edc3..971185558441 100644 --- a/static/refcache.json +++ b/static/refcache.json @@ -1725,15 +1725,15 @@ }, "https://docs.docker.com/reference/api/engine/version/v1.52/#tag/Container/operation/ContainerInspect": { "StatusCode": 206, - "LastSeen": "2025-11-21T19:23:12.270468-05:00" + "LastSeen": "2025-11-22T10:35:07.421431357Z" }, "https://docs.docker.com/reference/api/engine/version/v1.52/#tag/Container/operation/ContainerStats": { "StatusCode": 206, - "LastSeen": "2025-11-21T19:23:10.059932-05:00" + "LastSeen": "2025-11-22T10:35:08.136468454Z" }, "https://docs.docker.com/reference/api/engine/version/v1.52/#tag/Image/operation/ImageInspect": { "StatusCode": 206, - "LastSeen": "2025-11-21T19:23:12.089303-05:00" + "LastSeen": "2025-11-22T10:35:03.363219662Z" }, "https://docs.dynatrace.com/docs/shortlink/opentelemetry-collector": { "StatusCode": 206, @@ -12087,6 +12087,22 @@ "StatusCode": 206, "LastSeen": "2025-11-17T18:21:44.827050932Z" }, + "https://github.com/open-telemetry/opentelemetry-specification/blob/v1.51.0/oteps/0232-maturity-of-otel.md": { + "StatusCode": 206, + "LastSeen": "2025-11-18T10:38:03.969991421Z" + }, + "https://github.com/open-telemetry/opentelemetry-specification/blob/v1.51.0/spec-compliance-matrix.md#logs": { + "StatusCode": 206, + "LastSeen": "2025-11-18T10:37:46.685425344Z" + }, + "https://github.com/open-telemetry/opentelemetry-specification/blob/v1.51.0/specification/logs/api.md#logger": { + "StatusCode": 206, + "LastSeen": "2025-11-18T10:37:46.330840404Z" + }, + "https://github.com/open-telemetry/opentelemetry-specification/blob/v1.51.0/specification/logs/data-model.md#type-any": { + "StatusCode": 206, + "LastSeen": "2025-11-18T10:38:05.674928048Z" + }, "https://github.com/open-telemetry/opentelemetry-specification/issues/1413": { "StatusCode": 206, "LastSeen": "2025-11-15T09:41:50.553277453Z" @@ -13127,6 +13143,10 @@ "StatusCode": 206, "LastSeen": "2025-11-24T00:07:29.358988122Z" }, + "https://github.com/open-telemetry/semantic-conventions/pull/2984#discussion_r2466369361": { + "StatusCode": 206, + "LastSeen": "2025-11-06T10:37:26.044164511Z" + }, "https://github.com/open-telemetry/semantic-conventions/pull/981": { "StatusCode": 206, "LastSeen": "2025-11-15T09:44:24.463691055Z" @@ -19943,6 +19963,10 @@ "StatusCode": 200, "LastSeen": "2025-11-16T09:45:25.747304377Z" }, + "https://uaparser.dev/#demo": { + "StatusCode": 206, + "LastSeen": "2025-11-12T10:37:25.583538393Z" + }, "https://ucum.org/ucum": { "StatusCode": 200, "LastSeen": "2025-11-20T09:44:03.961482276Z"