Skip to content

Commit bea4a33

Browse files
Update opentelemetry-specification version to v1.39.0 (#5552)
1 parent a5aae30 commit bea4a33

File tree

9 files changed

+32
-12
lines changed

9 files changed

+32
-12
lines changed

.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
[submodule "content-modules/opentelemetry-specification"]
88
path = content-modules/opentelemetry-specification
99
url = https://github.com/open-telemetry/opentelemetry-specification.git
10-
spec-pin = v1.38.0
10+
spec-pin = v1.39.0
1111
[submodule "content-modules/community"]
1212
path = content-modules/community
1313
url = https://github.com/open-telemetry/community

content/en/docs/languages/go/instrumentation.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1096,7 +1096,7 @@ telemetry backends.
10961096
[instrumentation library]: ../libraries/
10971097
[opentelemetry collector]:
10981098
https://github.com/open-telemetry/opentelemetry-collector
1099-
[logs bridge API]: /docs/specs/otel/logs/bridge-api
1099+
[logs bridge API]: /docs/specs/otel/logs/api/
11001100
[log data model]: /docs/specs/otel/logs/data-model
11011101
[`go.opentelemetry.io/otel`]: https://pkg.go.dev/go.opentelemetry.io/otel
11021102
[`go.opentelemetry.io/otel/exporters/stdout/stdoutmetric`]:

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ logBridgeWarning: >
55
While the `LoggerProvider` / `Logger` APIs are structurally similar to the
66
equivalent trace and metric APIs, they serve a different use case. As of now,
77
`LoggerProvider` / `Logger` and associated classes represent the [Log Bridge
8-
API](/docs/specs/otel/logs/bridge-api/), which exists to write log appenders
9-
to bridge logs recorded through other log APIs / frameworks into
10-
OpenTelemetry. They are not intended for end user use as a replacement for
11-
Log4j / SLF4J / Logback / etc.
8+
API](/docs/specs/otel/logs/api/), which exists to write log appenders to
9+
bridge logs recorded through other log APIs / frameworks into OpenTelemetry.
10+
They are not intended for end user use as a replacement for Log4j / SLF4J /
11+
Logback / etc.
1212
cSpell:ignore: Dotel kotlint Logback updowncounter
1313
---
1414

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,8 @@ While the [LoggerProvider](../api-components/#loggerprovider) /
191191
equivalent [trace](../api-components/#tracerprovider) and
192192
[metric](../api-components/#meterprovider) APIs, they serve a different use
193193
case. As of now, `LoggerProvider` / `Logger` and associated classes represent
194-
the [Log Bridge API](/docs/specs/otel/logs/bridge-api/), which exists to write
195-
log appenders to bridge logs recorded through other log APIs / frameworks into
194+
the [Log Bridge API](/docs/specs/otel/logs/api/), which exists to write log
195+
appenders to bridge logs recorded through other log APIs / frameworks into
196196
OpenTelemetry. They are not intended for end user use as a replacement for Log4j
197197
/ SLF4J / Logback / etc.
198198

content/en/docs/specs/status.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ same as the **Protocol** status.
9292

9393
### [Logging][]
9494

95-
- {{% spec_status "Bridge API" "otel/logs/bridge-api" "Status" %}}
95+
- {{% spec_status "Bridge API" "otel/logs/api" "Status" %}}
9696
- {{% spec_status "SDK" "otel/logs/sdk" "Status" %}}
9797
- {{% spec_status "Event API" "otel/logs/event-api" "Status" %}}
9898
- {{% spec_status "Protocol" "otlp" "Status" %}}

content/en/docs/zero-code/python/logs-example.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ auto-instrumentation of logs. The example below is based on the logs example in
2424
> Metrics API, because it's not used by application developers to create logs.
2525
> Instead, they would use this bridge API to setup log appenders in the standard
2626
> language-specific logging libraries. More information can be found
27-
> [here](/docs/specs/otel/logs/bridge-api).
27+
> [here](/docs/specs/otel/logs/api/).
2828
2929
Start by creating the examples directory and the example Python file:
3030

scripts/content-modules/adjust-pages.pl

+17-1
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,14 @@
1818
my $semConvRef = "$otelSpecRepoUrl/blob/main/semantic_conventions/README.md";
1919
my $specBasePath = '/docs/specs';
2020
my %versions = qw(
21-
spec: 1.38.0
21+
spec: 1.39.0
2222
otlp: 1.3.2
2323
semconv: 1.28.0
2424
);
2525
my $otelSpecVers = $versions{'spec:'};
2626
my $otlpSpecVers = $versions{'otlp:'};
2727
my $semconvVers = $versions{'semconv:'};
28+
my $warn2 = 0; # TODO remove along with warning 002
2829

2930
sub printTitleAndFrontMatter() {
3031
print "---\n";
@@ -42,6 +43,12 @@ ()
4243
$frontMatterFromFile =~ s/linkTitle: .*/$& $semconvVers/;
4344
# $frontMatterFromFile =~ s/body_class: .*/$& td-page--draft/;
4445
# $frontMatterFromFile =~ s/cascade:\n/$& draft: true\n/;
46+
} elsif ($ARGV =~ /otel\/specification\/logs\/api.md$/) {
47+
if ($otelSpecVers ne "1.39.0") {
48+
# TODO: delete the enclosing elsif body
49+
print STDOUT "WARNING [001]: $0: remove obsolete code now that OTel spec has been updated.\n"
50+
}
51+
$frontMatterFromFile .= "linkTitle: API\naliases: [bridge-api]\n";
4552
}
4653
my $titleMaybeQuoted = ($title =~ ':') ? "\"$title\"" : $title;
4754
print "title: $titleMaybeQuoted\n" if $frontMatterFromFile !~ /title: /;
@@ -109,6 +116,15 @@ ()
109116

110117
# SPECIFICATION custom processing
111118

119+
# TODO: drop the entire if-then-else statement patch code when OTel spec vers contains
120+
# https://github.com/open-telemetry/opentelemetry-specification/pull/4287,
121+
# which should be vers > 1.39.0.
122+
if ($otelSpecVers eq "1.39.0") {
123+
s|(/api\.md)#logs-api\b|$1|g;
124+
} elsif ($ARGV =~ /otel\/spec/) {
125+
print STDOUT "WARNING [002]: $0: remove obsolete code now that OTel spec has been updated.\n" unless $warn2++
126+
}
127+
112128
s|\(https://github.com/open-telemetry/opentelemetry-specification\)|($specBasePath/otel/)|;
113129
s|(\]\()/specification/|$1$specBasePath/otel/)|;
114130
s|\.\./semantic_conventions/README.md|$semConvRef| if $ARGV =~ /overview/;

static/refcache.json

+4
Original file line numberDiff line numberDiff line change
@@ -5075,6 +5075,10 @@
50755075
"StatusCode": 200,
50765076
"LastSeen": "2024-06-12T11:21:46.656082+02:00"
50775077
},
5078+
"https://github.com/golang/go/issues/68652#issuecomment-2274452424": {
5079+
"StatusCode": 200,
5080+
"LastSeen": "2024-11-07T20:32:07.730871-05:00"
5081+
},
50785082
"https://github.com/google/pprof": {
50795083
"StatusCode": 200,
50805084
"LastSeen": "2024-10-24T15:10:16.695786+02:00"

0 commit comments

Comments
 (0)