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/content/zh/docs/_index.md b/content/zh/docs/_index.md index 69a252ffb76d..7f9cb02680cd 100644 --- a/content/zh/docs/_index.md +++ b/content/zh/docs/_index.md @@ -8,7 +8,7 @@ OpenTelemetry 也被称为 OTel，是一个供应商中立的、开源的[可观 可用于插桩、生成、采集和导出[链路](concepts/signals/traces/)、 [指标](concepts/signals/metrics/)和[日志](concepts/signals/logs/)等遥测数据。 -OpenTelemetry 作为一个行业标准，得到了 40 多个可观测供应商的支持， -被许多[代码库、服务和应用](/ecosystem/integrations/)集成，被众多[最终用户](/ecosystem/adopters/)采用。 +OpenTelemetry 作为一个行业标准，得到了 [40 多个可观测供应商的支持](/ecosystem/vendors/)， +被许多[代码库、服务和应用](/ecosystem/integrations/)集成，被[众多最终用户](/ecosystem/adopters/)采用。 ![OpenTelemetry 基准架构](/img/otel-diagram.svg) diff --git a/data/ecosystem/adopters.yaml b/data/ecosystem/adopters.yaml index 479a9ff01f13..34aa5befd199 100644 --- a/data/ecosystem/adopters.yaml +++ b/data/ecosystem/adopters.yaml @@ -1,4 +1,4 @@ -# cSpell:ignore Dyte Farfetch Globale Datenrettungsdienste Uplight Wandera Zocdoc Skyscanner VTEX +# cSpell:ignore Dyte Farfetch Globale Datenrettungsdienste Uplight Wandera Zocdoc Sicredi Skyscanner VTEX - name: AppDirect url: https://www.appdirect.com/ components: [Collector] @@ -83,6 +83,11 @@ components: [Collector, Go, Ruby] reference: '' contact: '' +- name: Sicredi + url: https://www.sicredi.com.br/ + components: [Collector, Go, Java, Python] + reference: '' + contact: https://github.com/igorestevanjasinski - name: Skyscanner url: https://www.skyscanner.net/ components: [Collector, Go, Java, Javascript, Python] diff --git a/data/registry/exporter-dotnet-azure.yml b/data/registry/exporter-dotnet-azure.yml index 46d2b2e83d27..c87d35750387 100644 --- a/data/registry/exporter-dotnet-azure.yml +++ b/data/registry/exporter-dotnet-azure.yml @@ -13,7 +13,7 @@ authors: package: name: Azure.Monitor.OpenTelemetry.Exporter registry: nuget - version: 1.3.0-beta.2 + version: 1.3.0 urls: repo: https://github.com/Azure/azure-sdk-for-net/tree/main/sdk/monitor/Azure.Monitor.OpenTelemetry.Exporter createdAt: 2021-11-01 diff --git a/data/registry/exporter-dotnet-onecollector.yml b/data/registry/exporter-dotnet-onecollector.yml index 47d56670b51e..35e87e5be775 100644 --- a/data/registry/exporter-dotnet-onecollector.yml +++ b/data/registry/exporter-dotnet-onecollector.yml @@ -18,4 +18,4 @@ createdAt: 2023-03-03 package: registry: nuget name: OpenTelemetry.Exporter.OneCollector - version: 1.8.0 + version: 1.9.0-rc.1 diff --git a/data/registry/instrumentation-js-express.yml b/data/registry/instrumentation-js-express.yml index 028c8194c606..d4fb8f35fec8 100644 --- a/data/registry/instrumentation-js-express.yml +++ b/data/registry/instrumentation-js-express.yml @@ -14,4 +14,4 @@ createdAt: 2020-11-09 package: registry: npm name: '@opentelemetry/instrumentation-express' - version: 0.40.0 + version: 0.40.1 diff --git a/data/registry/instrumentation-js-mongodb.yml b/data/registry/instrumentation-js-mongodb.yml index 6ead04300e33..5b47f3842380 100644 --- a/data/registry/instrumentation-js-mongodb.yml +++ b/data/registry/instrumentation-js-mongodb.yml @@ -14,4 +14,4 @@ createdAt: 2020-11-09 package: registry: npm name: '@opentelemetry/instrumentation-mongodb' - version: 0.44.0 + version: 0.45.0 diff --git a/data/registry/resource-detector-js-azure.yml b/data/registry/resource-detector-js-azure.yml index 835a3b3bcff4..8241d99155bd 100644 --- a/data/registry/resource-detector-js-azure.yml +++ b/data/registry/resource-detector-js-azure.yml @@ -15,4 +15,4 @@ createdAt: 2022-12-07 package: registry: npm name: '@opentelemetry/resource-detector-azure' - version: 0.2.8 + version: 0.2.9 diff --git a/data/registry/resource-detector-js-container.yml b/data/registry/resource-detector-js-container.yml index fa9b3e19d0ad..dcdc33cfe3d3 100644 --- a/data/registry/resource-detector-js-container.yml +++ b/data/registry/resource-detector-js-container.yml @@ -17,4 +17,4 @@ createdAt: 2022-12-07 package: registry: npm name: '@opentelemetry/resource-detector-container' - version: 0.3.10 + version: 0.3.11 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/;