Skip to content

Commit

Permalink
Update opentelemetry-specification version to v1.39.0 (#5552)
Browse files Browse the repository at this point in the history
  • Loading branch information
opentelemetrybot authored Nov 9, 2024
1 parent a5aae30 commit bea4a33
Show file tree
Hide file tree
Showing 9 changed files with 32 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
[submodule "content-modules/opentelemetry-specification"]
path = content-modules/opentelemetry-specification
url = https://github.com/open-telemetry/opentelemetry-specification.git
spec-pin = v1.38.0
spec-pin = v1.39.0
[submodule "content-modules/community"]
path = content-modules/community
url = https://github.com/open-telemetry/community
Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/languages/go/instrumentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -1096,7 +1096,7 @@ telemetry backends.
[instrumentation library]: ../libraries/
[opentelemetry collector]:
https://github.com/open-telemetry/opentelemetry-collector
[logs bridge API]: /docs/specs/otel/logs/bridge-api
[logs bridge API]: /docs/specs/otel/logs/api/
[log data model]: /docs/specs/otel/logs/data-model
[`go.opentelemetry.io/otel`]: https://pkg.go.dev/go.opentelemetry.io/otel
[`go.opentelemetry.io/otel/exporters/stdout/stdoutmetric`]:
Expand Down
8 changes: 4 additions & 4 deletions content/en/docs/languages/java/api-components.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ logBridgeWarning: >
While the `LoggerProvider` / `Logger` APIs are structurally similar to the
equivalent trace and metric APIs, they serve a different use case. As of now,
`LoggerProvider` / `Logger` and associated classes represent the [Log Bridge
API](/docs/specs/otel/logs/bridge-api/), which exists to write log appenders
to bridge logs recorded through other log APIs / frameworks into
OpenTelemetry. They are not intended for end user use as a replacement for
Log4j / SLF4J / Logback / etc.
API](/docs/specs/otel/logs/api/), which exists to write log appenders to
bridge logs recorded through other log APIs / frameworks into OpenTelemetry.
They are not intended for end user use as a replacement for Log4j / SLF4J /
Logback / etc.
cSpell:ignore: Dotel kotlint Logback updowncounter
---

Expand Down
4 changes: 2 additions & 2 deletions content/en/docs/languages/java/instrumentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,8 @@ While the [LoggerProvider](../api-components/#loggerprovider) /
equivalent [trace](../api-components/#tracerprovider) and
[metric](../api-components/#meterprovider) APIs, they serve a different use
case. As of now, `LoggerProvider` / `Logger` and associated classes represent
the [Log Bridge API](/docs/specs/otel/logs/bridge-api/), which exists to write
log appenders to bridge logs recorded through other log APIs / frameworks into
the [Log Bridge API](/docs/specs/otel/logs/api/), which exists to write log
appenders to bridge logs recorded through other log APIs / frameworks into
OpenTelemetry. They are not intended for end user use as a replacement for Log4j
/ SLF4J / Logback / etc.

Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/specs/status.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ same as the **Protocol** status.

### [Logging][]

- {{% spec_status "Bridge API" "otel/logs/bridge-api" "Status" %}}
- {{% spec_status "Bridge API" "otel/logs/api" "Status" %}}
- {{% spec_status "SDK" "otel/logs/sdk" "Status" %}}
- {{% spec_status "Event API" "otel/logs/event-api" "Status" %}}
- {{% spec_status "Protocol" "otlp" "Status" %}}
Expand Down
2 changes: 1 addition & 1 deletion content/en/docs/zero-code/python/logs-example.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ auto-instrumentation of logs. The example below is based on the logs example in
> Metrics API, because it's not used by application developers to create logs.
> Instead, they would use this bridge API to setup log appenders in the standard
> language-specific logging libraries. More information can be found
> [here](/docs/specs/otel/logs/bridge-api).
> [here](/docs/specs/otel/logs/api/).
Start by creating the examples directory and the example Python file:

Expand Down
18 changes: 17 additions & 1 deletion scripts/content-modules/adjust-pages.pl
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,14 @@
my $semConvRef = "$otelSpecRepoUrl/blob/main/semantic_conventions/README.md";
my $specBasePath = '/docs/specs';
my %versions = qw(
spec: 1.38.0
spec: 1.39.0
otlp: 1.3.2
semconv: 1.28.0
);
my $otelSpecVers = $versions{'spec:'};
my $otlpSpecVers = $versions{'otlp:'};
my $semconvVers = $versions{'semconv:'};
my $warn2 = 0; # TODO remove along with warning 002

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

# SPECIFICATION custom processing

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

s|\(https://github.com/open-telemetry/opentelemetry-specification\)|($specBasePath/otel/)|;
s|(\]\()/specification/|$1$specBasePath/otel/)|;
s|\.\./semantic_conventions/README.md|$semConvRef| if $ARGV =~ /overview/;
Expand Down
4 changes: 4 additions & 0 deletions static/refcache.json
Original file line number Diff line number Diff line change
Expand Up @@ -5075,6 +5075,10 @@
"StatusCode": 200,
"LastSeen": "2024-06-12T11:21:46.656082+02:00"
},
"https://github.com/golang/go/issues/68652#issuecomment-2274452424": {
"StatusCode": 200,
"LastSeen": "2024-11-07T20:32:07.730871-05:00"
},
"https://github.com/google/pprof": {
"StatusCode": 200,
"LastSeen": "2024-10-24T15:10:16.695786+02:00"
Expand Down

0 comments on commit bea4a33

Please sign in to comment.