Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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.39.0
[submodule "content-modules/opamp-spec"]
path = content-modules/opamp-spec
url = https://github.com/open-telemetry/opamp-spec
Expand Down
2 changes: 1 addition & 1 deletion content-modules/semantic-conventions
2 changes: 1 addition & 1 deletion content/en/docs/languages/python/propagation.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions content/en/docs/zero-code/java/agent/supported-libraries.md
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,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
Expand All @@ -198,9 +198,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/
Expand Down
10 changes: 5 additions & 5 deletions content/zh/docs/zero-code/java/agent/supported-libraries.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: 支持的库
linkTitle: 支持的库
default_lang_commit: 1fe3f355b66260860b47b6cd79c768fd27402334
default_lang_commit: 1fe3f355b66260860b47b6cd79c768fd27402334 # patched
drifted_from_default: true
weight: 11
# prettier-ignore
Expand Down Expand Up @@ -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
Expand All @@ -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/
Expand Down
49 changes: 25 additions & 24 deletions scripts/content-modules/adjust-pages.pl
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
qw(
spec: 1.53.0
otlp: 1.9.0
semconv: 1.38.0
semconv: 1.39.0
);
# Versions map without the colon in the keys
my %versions = map { s/://r => $versionsRaw{$_} } keys %versionsRaw;
Expand Down Expand Up @@ -125,23 +125,21 @@ ($$$)
}

# =================================================================================
# KEEP THE FOLLOWING AS A TEMPLATE; copy it and modify it as needed.
# KEEP THE FOLLOWING SUB AS AN EXAMPLE / TEMPLATE; copy it and modify it as needed.
# =================================================================================
sub patchSpec_because_of_SemConv_DockerAPIVersions_AsTemplate() {

sub patchSpec_because_of_SpecName_SomeDescription_AsTemplate() {
# The code below uses semconv as an example. Adapt as needed.
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
# patch should not be applied. The patch is applied if the submodule version
# (from .gitmodules) starts with 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.
#
# Specify the target version as, e.g., '1.38.0', or to apply only to dev
# versions, use '1.38.0-' with a trailing hyphen.
applyPatchOrPrintMsgIf('2025-11-21-docker-api-versions', 'semconv', '1.38.0');
# 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('2026-01-01-some-unique-id', 'semconv', '1.39.0-dev');

# Give infor about the patch:
#
Expand All @@ -162,19 +160,8 @@ ()
# 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
# patch should not be applied. See patch template above for details.
applyPatchOrPrintMsgIf('2025-11-21-docker-api-versions', 'semconv', '1.38.0');

# 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;
Expand All @@ -185,14 +172,27 @@ ()
# 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.38.0-');
&& applyPatchOrPrintMsgIf('2025-11-26-database-section-renamed-to-db', 'semconv', '1.39.0');

# Give infor about the patch, see:
# https://github.com/open-telemetry/opentelemetry.io/pull/8311#issue-3577941378

# Match both localized paths and GitHub URLs:
s|(/semconv)/database(/database-)|$1/db$2|g;
}

sub patchSpec_because_of_SemConv_MetricRPCServerDurationRenamedToMetricRPCServerCallDuration() {
return unless
$ARGV =~ m|^tmp/otel/specification/|
&& applyPatchOrPrintMsgIf('2025-12-05-metric-rpc-server-duration-renamed-to-rpc-server-call-duration', 'semconv', '1.39.0');

# Give infor about the patch, see:
# https://github.com/open-telemetry/opentelemetry-specification/pull/4778

# Replace the old metric anchor with the new one
s|#metric-rpcserverduration|#metric-rpcservercallduration|g;
}

sub getVersFromSubmodule() {
my %repoNames = qw(
otlp opentelemetry-proto
Expand Down Expand Up @@ -317,6 +317,7 @@ ()
}{$otelSpecRepoUrl/tree/v$otelSpecVers/$2}gx;

patchSpec_because_of_SemConv_DatabaseRenamedToDb();
patchSpec_because_of_SemConv_MetricRPCServerDurationRenamedToMetricRPCServerCallDuration();

s|\.\./((?:examples/)?README\.md)|$otlpSpecRepoUrl/tree/v$otlpSpecVers/$1|g if $ARGV =~ /^tmp\/otlp/;

Expand Down
Loading