diff --git a/.gitmodules b/.gitmodules index db570f1fafb6..62474b67aaf8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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.39.0 + spec-pin = v1.40.0 [submodule "content-modules/community"] path = content-modules/community url = https://github.com/open-telemetry/community diff --git a/content-modules/opentelemetry-specification b/content-modules/opentelemetry-specification index 8954d3b52509..0d046c07e2b2 160000 --- a/content-modules/opentelemetry-specification +++ b/content-modules/opentelemetry-specification @@ -1 +1 @@ -Subproject commit 8954d3b525098dc4dadc364e7b82da9235c7f37e +Subproject commit 0d046c07e2b24bc2405a3e1d367f93ab102d889d diff --git a/scripts/content-modules/adjust-pages.pl b/scripts/content-modules/adjust-pages.pl index fa649db7ba56..db93a479b42a 100755 --- a/scripts/content-modules/adjust-pages.pl +++ b/scripts/content-modules/adjust-pages.pl @@ -18,14 +18,14 @@ my $semConvRef = "$otelSpecRepoUrl/blob/main/semantic_conventions/README.md"; my $specBasePath = '/docs/specs'; my %versions = qw( - spec: 1.39.0 + spec: 1.40.0 otlp: 1.4.0 semconv: 1.29.0 ); my $otelSpecVers = $versions{'spec:'}; my $otlpSpecVers = $versions{'otlp:'}; my $semconvVers = $versions{'semconv:'}; -my $patchMsg2 = 0; # TODO remove along with patch-message 002 +my %patchMsgCount; sub printTitleAndFrontMatter() { print "---\n"; @@ -43,13 +43,14 @@ () $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 "INFO [001]: $0: remove obsolete code now that OTel spec has been updated.\n" - } - $frontMatterFromFile .= "linkTitle: API\naliases: [bridge-api]\n"; } + # Sample front-matter patch: + # + # } elsif ($ARGV =~ /otel\/specification\/logs\/api.md$/) { + # $frontMatterFromFile .= "linkTitle: API\naliases: [bridge-api]\n"; + # printPatchInfoIf("2024-12-01-bridge-api", $otelSpecVers ne "1.39.0"); + # } + my $titleMaybeQuoted = ($title =~ ':') ? "\"$title\"" : $title; print "title: $titleMaybeQuoted\n" if $frontMatterFromFile !~ /title: /; if ($title =~ /^OpenTelemetry (Protocol )?(.*)/) { @@ -64,6 +65,12 @@ () print "---\n"; } +sub printPatchInfoIf($$) { + my ($patchID, $specVersTest) = @_; + print STDOUT "INFO [$patchID]: $0: remove obsolete patch code now that OTel spec has been updated.\n" + if $specVersTest && !$patchMsgCount{$patchID}++; +} + # main while(<>) { @@ -117,12 +124,11 @@ () # SPECIFICATION custom processing # TODO: drop the entire if 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 ($ARGV =~ /otel\/spec/) { - s|(/api\.md)#logs-api\b|$1|g; - print STDOUT "INFO [002]: $0: remove obsolete patch code now that OTel spec has been updated.\n" - if $otelSpecVers ne "1.39.0" && !$patchMsg2++ + # https://github.com/open-telemetry/opentelemetry-specification/issues/4338, + # which should be vers > 1.40.0. + if ($ARGV =~ /otel\/specification\/logs/) { + s|(/data-model.md/?)#event-name\b|$1#field-eventname|g; + printPatchInfoIf("2024-12-13-event-name", $otelSpecVers ne "1.40.0"); } s|\(https://github.com/open-telemetry/opentelemetry-specification\)|($specBasePath/otel/)|; diff --git a/static/refcache.json b/static/refcache.json index c5dbf18bfcaf..3c42bd47e024 100644 --- a/static/refcache.json +++ b/static/refcache.json @@ -13803,6 +13803,10 @@ "StatusCode": 206, "LastSeen": "2024-01-18T19:55:40.781807-05:00" }, + "https://www.jaegertracing.io/sdk-migration/#propagation-format": { + "StatusCode": 206, + "LastSeen": "2024-12-13T05:25:28.899615-05:00" + }, "https://www.java.com/en/": { "StatusCode": 200, "LastSeen": "2024-01-18T19:55:46.525923-05:00"