Skip to content

Commit 149cb6f

Browse files
Update semantic-conventions version to v1.30.0 (#6077)
Co-authored-by: Patrice Chalin
1 parent f37118d commit 149cb6f

File tree

6 files changed

+358
-38
lines changed

6 files changed

+358
-38
lines changed

.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
[submodule "content-modules/semantic-conventions"]
2121
path = content-modules/semantic-conventions
2222
url = https://github.com/open-telemetry/semantic-conventions
23-
semconv-pin = v1.29.0
23+
semconv-pin = v1.30.0
2424
[submodule "content-modules/opamp-spec"]
2525
path = content-modules/opamp-spec
2626
url = https://github.com/open-telemetry/opamp-spec

content-modules/semantic-conventions

content/en/blog/2024/prometheus-compatibility-survey/index.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@ of their opinions on units or delimiters.
8888

8989
## Dots and Underscores
9090

91-
OpenTelemetry [specifies](/docs/specs/semconv/general/attribute-naming/) that
92-
conventions should use dots as the namespace delimiter, and underscores as the
93-
delimiter between "multi-word-dot-delimited components" (for example,
91+
OpenTelemetry [specifies](/docs/specs/semconv/general/naming/) that conventions
92+
should use dots as the namespace delimiter, and underscores as the delimiter
93+
between "multi-word-dot-delimited components" (for example,
9494
`http.response.status_code`). On the other hand, Prometheus
9595
[uses underscores](https://prometheus.io/docs/concepts/data_model/#metric-names-and-labels)
9696
as its delimiter.

content/en/docs/languages/java/api.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -468,8 +468,8 @@ is a bundle of key value pairs representing the
468468
See [semantic attributes](#semantic-attributes) for attribute constants
469469
generated from the semantic conventions.
470470

471-
See [attribute naming](/docs/specs/semconv/general/attribute-naming/) for
472-
guidance on attribute naming.
471+
See [attribute naming](/docs/specs/semconv/general/naming/) for guidance on
472+
attribute naming.
473473

474474
The following code snippet explores `Attributes` API usage:
475475

scripts/content-modules/adjust-pages.pl

+11-31
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
qw(
2525
spec: 1.41.0
2626
otlp: 1.5.0
27-
semconv: 1.29.0
27+
semconv: 1.30.0
2828
);
2929
# Versions map without the colon in the keys
3030
my %versions = map { s/://r => $versionsRaw{$_} } keys %versionsRaw;
@@ -93,28 +93,21 @@ ($$$)
9393
return 0;
9494
}
9595

96-
sub patchAttrNaming() {
97-
return unless $ARGV =~ /^tmp\/otel\/specification/
98-
&& applyPatchOrPrintMsgIf('2025-01-22-attribute-naming', 'semconv', '1.29.0');
99-
100-
my $semconv_attr_naming = '(/docs/specs/semconv/general)/naming/';
101-
s|$semconv_attr_naming|$1/attribute-naming/|g if /$semconv_attr_naming/;
102-
}
103-
10496
sub patchEventAliases() {
10597
return unless $ARGV =~ /^tmp\/otel\/specification\/logs\//
10698
&& applyPatchOrPrintMsgIf('2025-01-23-event-aliases', 'spec', '1.41.0');
10799

108100
my $aliases = '^( - )(event-(api|sdk))$';
109-
s|$aliases|$1./$2|g if /$aliases/;
101+
s|$aliases|$1./$2|;
110102
}
111103

112-
sub patchSemConvAlias() {
113-
return unless $ARGV =~ /^tmp\/semconv\/docs\/general\//
114-
&& applyPatchOrPrintMsgIf('2025-01-23-general-aliases', 'semconv', '1.29.0');
104+
sub patchSemConv1_30_0() {
105+
return unless $ARGV =~ /^tmp\/semconv\/docs\//
106+
&& applyPatchOrPrintMsgIf('2025-01-24-emit-an-event', 'semconv', '1.30.0');
115107

116-
my $aliases = '\[docs/specs/semconv/general/(trace-general)\]';
117-
s|$aliases|[$1]|g if /$aliases/;
108+
s|Emit Event API|Log API|;
109+
s|(docs/specs/otel/logs/api.md#emit-a)n-event|$1-logrecord|;
110+
s|\[semantic-convention-groups\]|[group-stability]|;
118111
}
119112

120113
sub getVersFromSubmodule() {
@@ -158,9 +151,8 @@ ()
158151
while(<>) {
159152
$lineNum++;
160153
last if /^-?-->/;
161-
patchAttrNaming();
162154
patchEventAliases();
163-
patchSemConvAlias();
155+
patchSemConv1_30_0();
164156
$frontMatterFromFile .= $_;
165157
}
166158
next;
@@ -193,28 +185,14 @@ ()
193185
## Semconv
194186

195187
if ($ARGV =~ /^tmp\/semconv/) {
196-
if (applyPatchOrPrintMsgIf('2025-01-22-event-(api|sdk)', 'semconv', '1.29.0')) {
197-
# Cf. https://github.com/open-telemetry/opentelemetry-specification/pull/4359
198-
my $otel_spec_event_deprecation = '(opentelemetry-specification/blob/main/specification/logs)/event-(api|sdk).md';
199-
s|$otel_spec_event_deprecation\b|$1/|g if /$otel_spec_event_deprecation/;
200-
}
201-
202188
s|(\]\()/docs/|$1$specBasePath/semconv/|g;
203189
s|(\]:\s*)/docs/|$1$specBasePath/semconv/|;
204190

205191
s|\((/model/.*?)\)|($semconvSpecRepoUrl/tree/v$semconvVers/$1)|g;
206192
}
207193

208-
209194
# SPECIFICATION custom processing
210195

211-
if ($ARGV =~ /^tmp\/otel\/specification/ && applyPatchOrPrintMsgIf('2025-01-22-attribute-naming.md', 'semconv', '1.29.0')) {
212-
my $semconv_attr_naming_md = '(semantic-conventions/blob/main/docs/general)/naming.md(#\w+)?';
213-
s|$semconv_attr_naming_md\b|$1/attribute-naming.md|g if /$semconv_attr_naming_md/;
214-
}
215-
216-
patchAttrNaming(); # TEMPORARY patch
217-
218196
s|\(https://github.com/open-telemetry/opentelemetry-specification\)|($specBasePath/otel/)|;
219197
s|(\]\()/specification/|$1$specBasePath/otel/)|;
220198
s|\.\./specification/(.*?\))|../otel/$1|g if $ARGV =~ /otel\/specification/;
@@ -254,5 +232,7 @@ ()
254232

255233
s|\]\((proto/opamp.proto)\)|]($opAmpSpecRepoUrl/blob/main/$1)|;
256234

235+
patchSemConv1_30_0();
236+
257237
print;
258238
}

0 commit comments

Comments
 (0)