From 66b62d8203c140a8f6e15fbe5bf55fa7ea11325b Mon Sep 17 00:00:00 2001 From: OpenTelemetry Bot <107717825+opentelemetrybot@users.noreply.github.com> Date: Tue, 11 Jun 2024 18:38:22 +0200 Subject: [PATCH 1/2] Update opentelemetry-specification version to v1.34.0 (#4655) --- .gitmodules | 2 +- .htmltest.yml | 2 ++ content-modules/opentelemetry-specification | 2 +- layouts/shortcodes/spec_status.html | 2 +- scripts/content-modules/adjust-pages.pl | 3 ++- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index f41bc0568c72..e96093a77b6a 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.33.0 + spec-pin = v1.34.0 [submodule "content-modules/community"] path = content-modules/community url = https://github.com/open-telemetry/community diff --git a/.htmltest.yml b/.htmltest.yml index 53e80a8d75fb..8e64377a99d9 100644 --- a/.htmltest.yml +++ b/.htmltest.yml @@ -72,3 +72,5 @@ IgnoreURLs: # list of regexs of paths or URLs to be ignored - ^https://wikipedia.org/wiki/(S.M.A.R.T|Hop_) # TODO move into content/en/blog/2023/contributing-to-otel/index.md once https://github.com/open-telemetry/opentelemetry.io/issues/3889 is implemented - ^https://shorturl.at/vLYZ0$ + # TODO remove while or after fixing https://github.com/open-telemetry/opentelemetry.io/issues/4656 + - ^/docs/specs/otel/versioning-and-stability/#experimental diff --git a/content-modules/opentelemetry-specification b/content-modules/opentelemetry-specification index a7bb6473769d..518b1a57df9c 160000 --- a/content-modules/opentelemetry-specification +++ b/content-modules/opentelemetry-specification @@ -1 +1 @@ -Subproject commit a7bb6473769d93ddbe063071c94729a242a2cdb2 +Subproject commit 518b1a57df9c5dcb1e7110b408cb4c16e9c28505 diff --git a/layouts/shortcodes/spec_status.html b/layouts/shortcodes/spec_status.html index a78cb177715d..3a3e85d10102 100644 --- a/layouts/shortcodes/spec_status.html +++ b/layouts/shortcodes/spec_status.html @@ -25,7 +25,7 @@ - https://opentelemetry.io/docs/specs/otel/document-status/ - https://github.com/open-telemetry/opentelemetry-proto#maturity-level */ -}} -{{ $statusValueRE := "(?i:experimental|stable|deprecated|removed|mixed|feature.freeze|alpha|beta)" -}} +{{ $statusValueRE := "(?i:development|experimental|stable|deprecated|removed|mixed|feature.freeze|alpha|beta)" -}} {{ $statusRE := printf "%s(,\\s*%s)*" $statusValueRE $statusValueRE -}} {{ with findRE $statusRE $statusLine -}} {{ $status = index . 0 -}} diff --git a/scripts/content-modules/adjust-pages.pl b/scripts/content-modules/adjust-pages.pl index b0f9dd7bc94d..f5df542d6a2d 100755 --- a/scripts/content-modules/adjust-pages.pl +++ b/scripts/content-modules/adjust-pages.pl @@ -18,7 +18,7 @@ my $semConvRef = "$otelSpecRepoUrl/blob/main/semantic_conventions/README.md"; my $specBasePath = '/docs/specs'; my %versions = qw( - spec: 1.33.0 + spec: 1.34.0 otlp: 1.3.1 semconv: 1.26.0 ); @@ -133,6 +133,7 @@ () s|(/context/api-propagators.md)#propagators-api|$1|g; s|(/semantic_conventions/faas.md)#function-as-a-service|$1|g; s|(/resource/sdk.md)#resource-sdk|$1|g; + s|(event-api.md#)(data-model)|$1event-$2|g; s|\.\.\/README.md\b|$otelSpecRepoUrl/|g if $ARGV =~ /specification._index/; s|\.\.\/README.md\b|..| if $ARGV =~ /specification.library-guidelines.md/; From b30a02d42f1b59af22d03b8f2bbaea6bd1b60bae Mon Sep 17 00:00:00 2001 From: OpenTelemetry Bot <107717825+opentelemetrybot@users.noreply.github.com> Date: Wed, 12 Jun 2024 08:59:12 +0200 Subject: [PATCH 2/2] Auto-update registry versions (a5ac0f19a04baac233ed298369dc7f60e448863a) (#4665) --- data/registry/instrumentation-js-cerbos.yml | 2 +- data/registry/instrumentation-ruby-all.yml | 2 +- data/registry/instrumentation-ruby-ethon.yml | 2 +- data/registry/instrumentation-ruby-rails.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/registry/instrumentation-js-cerbos.yml b/data/registry/instrumentation-js-cerbos.yml index c16a310b167a..edd52bcbbdbe 100644 --- a/data/registry/instrumentation-js-cerbos.yml +++ b/data/registry/instrumentation-js-cerbos.yml @@ -18,5 +18,5 @@ createdAt: 2023-09-13 package: name: '@cerbos/opentelemetry' registry: npm - version: 0.5.0 + version: 0.5.1 isFirstParty: true diff --git a/data/registry/instrumentation-ruby-all.yml b/data/registry/instrumentation-ruby-all.yml index 425025db8ef2..010d96ceefaf 100644 --- a/data/registry/instrumentation-ruby-all.yml +++ b/data/registry/instrumentation-ruby-all.yml @@ -14,4 +14,4 @@ createdAt: 2020-11-09 package: registry: gems name: opentelemetry-instrumentation-all - version: 0.60.0 + version: 0.61.0 diff --git a/data/registry/instrumentation-ruby-ethon.yml b/data/registry/instrumentation-ruby-ethon.yml index 5e10c103b83c..b15b7b1898ca 100644 --- a/data/registry/instrumentation-ruby-ethon.yml +++ b/data/registry/instrumentation-ruby-ethon.yml @@ -15,4 +15,4 @@ createdAt: 2020-11-09 package: registry: gems name: opentelemetry-instrumentation-ethon - version: 0.21.5 + version: 0.21.6 diff --git a/data/registry/instrumentation-ruby-rails.yml b/data/registry/instrumentation-ruby-rails.yml index e6cbd3b5ac37..e0171514ef31 100644 --- a/data/registry/instrumentation-ruby-rails.yml +++ b/data/registry/instrumentation-ruby-rails.yml @@ -14,4 +14,4 @@ createdAt: 2020-11-09 package: registry: gems name: opentelemetry-instrumentation-rails - version: 0.30.1 + version: 0.30.2