Skip to content

Commit 83ddfee

Browse files
committed
Fix paths in OTel.io pages, create adjust-pages patch for OTel spec
1 parent 7faba2f commit 83ddfee

File tree

4 files changed

+52
-10
lines changed

4 files changed

+52
-10
lines changed

content/en/docs/languages/python/propagation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ This supports context propagation between database client and server when
125125
database log records are enabled. For more information, see:
126126

127127
- [OpenTelemetry Python sqlcommenter example](https://github.com/open-telemetry/opentelemetry-python/tree/main/docs/examples/sqlcommenter/)
128-
- [Semantic Conventions - Database Spans](/docs/specs/semconv/database/database-spans/#sql-commenter)
128+
- [Semantic Conventions - Database Spans](/docs/specs/semconv/db/database-spans/#sql-commenter)
129129
- [sqlcommenter](https://google.github.io/sqlcommenter/)
130130

131131
## Next steps

content/en/docs/zero-code/java/agent/supported-libraries.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ view execution. See
184184
**[6]** Database client metrics are available for those who opt-in to
185185
[semantic convention stability](/docs/specs/semconv/non-normative/db-migration/).
186186

187-
[Elasticsearch Client Spans]: /docs/specs/semconv/database/elasticsearch/
187+
[Elasticsearch Client Spans]: /docs/specs/semconv/db/elasticsearch/
188188
[HTTP Server Spans]: /docs/specs/semconv/http/http-spans/#http-server
189189
[HTTP Client Spans]: /docs/specs/semconv/http/http-spans/#http-client-span
190190
[HTTP Server Metrics]: /docs/specs/semconv/http/http-metrics/#http-server
@@ -194,9 +194,9 @@ view execution. See
194194
[RPC Server Metrics]: /docs/specs/semconv/rpc/rpc-metrics/#rpc-server
195195
[RPC Client Metrics]: /docs/specs/semconv/rpc/rpc-metrics/#rpc-client
196196
[Messaging Spans]: /docs/specs/semconv/messaging/messaging-spans/
197-
[Database Client Spans]: /docs/specs/semconv/database/database-spans/
198-
[Database Client Metrics]: /docs/specs/semconv/database/database-metrics/
199-
[Database Pool Metrics]: /docs/specs/semconv/database/database-metrics/
197+
[Database Client Spans]: /docs/specs/semconv/db/database-spans/
198+
[Database Client Metrics]: /docs/specs/semconv/db/database-metrics/
199+
[Database Pool Metrics]: /docs/specs/semconv/db/database-metrics/
200200
[JVM Runtime Metrics]: /docs/specs/semconv/runtime/jvm-metrics/
201201
[System Metrics]: /docs/specs/semconv/system/system-metrics/
202202
[GraphQL Server Spans]: /docs/specs/semconv/graphql/graphql-spans/

content/zh/docs/zero-code/java/agent/supported-libraries.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: 支持的库
33
linkTitle: 支持的库
4-
default_lang_commit: 1fe3f355b66260860b47b6cd79c768fd27402334
4+
default_lang_commit: 1fe3f355b66260860b47b6cd79c768fd27402334 # patched
55
drifted_from_default: true
66
weight: 11
77
# prettier-ignore
@@ -173,7 +173,7 @@ Java 代理开箱即用地对许多库、框架和应用服务器进行自动插
173173

174174
**[6]** 数据库客户端指标适用于选择加入[语义约定稳定性](/docs/specs/semconv/non-normative/db-migration/)的用户。
175175

176-
[Elasticsearch Client Spans]: /docs/specs/semconv/database/elasticsearch/
176+
[Elasticsearch Client Spans]: /docs/specs/semconv/db/elasticsearch/
177177
[HTTP Server Spans]: /docs/specs/semconv/http/http-spans/#http-server
178178
[HTTP Client Spans]: /docs/specs/semconv/http/http-spans/#http-client-span
179179
[HTTP Server Metrics]: /docs/specs/semconv/http/http-metrics/#http-server
@@ -183,9 +183,9 @@ Java 代理开箱即用地对许多库、框架和应用服务器进行自动插
183183
[RPC Server Metrics]: /docs/specs/semconv/rpc/rpc-metrics/#rpc-server
184184
[RPC Client Metrics]: /docs/specs/semconv/rpc/rpc-metrics/#rpc-client
185185
[Messaging Spans]: /docs/specs/semconv/messaging/messaging-spans/
186-
[Database Client Spans]: /docs/specs/semconv/database/database-spans/
187-
[Database Client Metrics]: /docs/specs/semconv/database/database-metrics/
188-
[Database Pool Metrics]: /docs/specs/semconv/database/database-metrics/
186+
[Database Client Spans]: /docs/specs/semconv/db/database-spans/
187+
[Database Client Metrics]: /docs/specs/semconv/db/database-metrics/
188+
[Database Pool Metrics]: /docs/specs/semconv/db/database-metrics/
189189
[JVM Runtime Metrics]: /docs/specs/semconv/runtime/jvm-metrics/
190190
[System Metrics]: /docs/specs/semconv/system/system-metrics/
191191
[GraphQL Server Spans]: /docs/specs/semconv/graphql/graphql-spans/

scripts/content-modules/adjust-pages.pl

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,33 @@ ($$$)
9595
return 0;
9696
}
9797

98+
# Keep the following as a template:
99+
# sub patchSpec_because_of_SemConv_DockerAPIVersions() {
100+
# return unless
101+
# # Restrict the patch to the proper spec, and section or file:
102+
# $ARGV =~ m|^tmp/semconv/docs/|
103+
# &&
104+
# # Call helper function that will cause the function to return early if the
105+
# # current version of the named spec (arg 2) is greater than the target
106+
# # version (arg 3). The first argument is a unique id that will be printed if
107+
# # the patch is outdated. Otherwise, if the patch is still relevant we fall
108+
# # through to the body of this patch function.
109+
# applyPatchOrPrintMsgIf('2025-11-21-docker-api-versions', 'semconv', '1.39.0-dev');
110+
111+
# # Give infor about the patch:
112+
# #
113+
# # For the problematic links, see:
114+
# # https://github.com/open-telemetry/semantic-conventions/issues/3103
115+
# #
116+
# # Replace older Docker API versions with the latest one like in:
117+
# # https://github.com/open-telemetry/semantic-conventions/pull/3093
118+
119+
# # This is the actual regex-based patch code:
120+
# s{
121+
# (https://docs.docker.com/reference/api/engine/version)/v1.(43|51)/(\#tag/)
122+
# }{$1/v1.52/$3}gx;
123+
# }
124+
98125
sub patchSpec_because_of_SemConv_DockerAPIVersions() {
99126
return unless
100127
# Restrict the patch to the proper spec, and section or file:
@@ -121,6 +148,19 @@ ()
121148
}{$1/v1.52/$3}gx;
122149
}
123150

151+
sub patchSpec_because_of_SemConv_DatabaseRenamedToDb() {
152+
return unless
153+
# Restrict the patch to the proper spec, and section or file:
154+
# Note that here we replace links into semconv from the spec
155+
$ARGV =~ m|^tmp/otel/specification/|
156+
&& applyPatchOrPrintMsgIf('2025-11-26-database-section-renamed-to-db', 'semconv', '1.39.0-dev');
157+
158+
# Give infor about the patch, see:
159+
# https://github.com/open-telemetry/opentelemetry.io/pull/8311#issue-3577941378
160+
161+
s|(/semconv)/database(/database-)|$1/db$2|g;
162+
}
163+
124164
sub getVersFromSubmodule() {
125165
my %repoNames = qw(
126166
otlp opentelemetry-proto
@@ -244,6 +284,8 @@ ()
244284
)
245285
}{$otelSpecRepoUrl/tree/v$otelSpecVers/$2}gx;
246286

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

249291
# Make website-local page references local:

0 commit comments

Comments
 (0)