Merge branch 'main' into jpkrohling/CVE-2024-36129

open-telemetry · Jun 5, 2024 · 32b2c43 · 32b2c43
2 parents 5f042fb + 7bb7dbb
commit 32b2c43
Show file tree

Hide file tree

Showing 207 changed files with 496 additions and 346 deletions.
diff --git a/content/en/docs/collector/_index.md b/content/en/docs/collector/_index.md
@@ -3,7 +3,7 @@ title: Collector
 description: Vendor-agnostic way to receive, process and export telemetry data.
 aliases: [collector/about]
 cascade:
-  vers: 0.101.0
+  vers: 0.102.0
 weight: 270
 ---
 

diff --git a/content/en/docs/demo/architecture.md b/content/en/docs/demo/architecture.md
@@ -39,21 +39,23 @@ frontendproxy -->|HTTP| imageprovider
 queue -->|TCP| accountingservice
 queue -->|TCP| frauddetectionservice
 
-checkoutservice --->|gRPC| cartservice --> cache
-checkoutservice --->|gRPC| productcatalogservice
-checkoutservice --->|gRPC| currencyservice
-checkoutservice --->|HTTP| emailservice
-checkoutservice --->|gRPC| paymentservice
+frontend -->|gRPC| cartservice
+frontend -->|gRPC| currencyservice
+
+checkoutservice -->|gRPC| cartservice --> cache
+checkoutservice -->|gRPC| productcatalogservice
+checkoutservice -->|gRPC| currencyservice
+checkoutservice -->|HTTP| emailservice
+checkoutservice -->|gRPC| paymentservice
 checkoutservice -->|gRPC| shippingservice
-checkoutservice --->|TCP| queue
+checkoutservice -->|TCP| queue
 
 frontend -->|gRPC| adservice
-frontend -->|gRPC| cartservice
 frontend -->|gRPC| productcatalogservice
-frontend -->|gRPC| checkoutservice
-frontend -->|gRPC| currencyservice
-frontend -->|gRPC| recommendationservice -->|gRPC| productcatalogservice
-frontend -->|gRPC| shippingservice -->|HTTP| quoteservice
+frontend --->|gRPC| checkoutservice
+frontend ---->|gRPC| recommendationservice -->|gRPC| productcatalogservice
+
+shippingservice -->|HTTP| quoteservice
 
 end
 

diff --git a/content/en/docs/languages/java/configuration.md b/content/en/docs/languages/java/configuration.md
diff --git a/content/en/docs/languages/java/instrumentation.md b/content/en/docs/languages/java/instrumentation.md
@@ -361,6 +361,8 @@ It allows you to autoconfigure the OpenTelemetry SDK based on a standard set of
 supported environment variables and system properties. Each environment variable
 has a corresponding system property named the same way but as lower case and
 using the `.` (dot) character instead of the `_` (underscore) as separator.
+Reference the [configuration](/docs/languages/java/configuration/) page for
+details on all available options.
 
 The logical service name can be specified via the `OTEL_SERVICE_NAME`
 environment variable (or `otel.service.name` system property).

diff --git a/content/en/docs/zero-code/java/spring-boot-starter/additional-instrumentations.md b/content/en/docs/zero-code/java/spring-boot-starter/additional-instrumentations.md
@@ -1,8 +1,5 @@
 ---
 title: Additional instrumentation
-description:
-  Instrumentations in addition to the out of the box instrumentation of the
-  starter
 weight: 50
 ---
 

diff --git a/content/en/docs/zero-code/java/spring-boot-starter/annotations.md b/content/en/docs/zero-code/java/spring-boot-starter/annotations.md
@@ -1,6 +1,5 @@
 ---
 title: Annotations
-description: Using instrumentation annotations with the Spring starter.
 weight: 60
 ---
 

diff --git a/content/en/docs/zero-code/java/spring-boot-starter/getting-started.md b/content/en/docs/zero-code/java/spring-boot-starter/getting-started.md
@@ -1,6 +1,5 @@
 ---
-title: Getting started with the Spring Boot starter
-linkTitle: Getting Started
+title: Getting started
 weight: 20
 cSpell:ignore: springboot
 ---
@@ -14,7 +13,7 @@ application. For the pros and cons, see [Java zero-code instrumentation](..).
 
 ### Compatibility
 
-The OpenTelemetry Spring Boot starter works with Spring Boot 2.0 and 3.0, and
+The OpenTelemetry Spring Boot starter works with Spring Boot 2.6+ and 3.0+, and
 Spring Boot native image applications. The
 [opentelemetry-java-examples/spring-native](https://github.com/open-telemetry/opentelemetry-java-examples/tree/main/spring-native)
 repository contains an example of a Spring Boot Native image application
@@ -53,9 +52,7 @@ The following example shows how to import both BOMs using Maven:
 </dependencyManagement>
 ```
 
-With Gradle and Spring Boot, you have
-[two ways](https://docs.spring.io/spring-boot/docs/current/gradle-plugin/reference/htmlsingle/)
-to import a BOM.
+With Gradle and Spring Boot, you have two ways to import a BOM.
 
 You can use the Gradle’s native BOM support by adding `dependencies`:
 

diff --git a/content/en/docs/zero-code/java/spring-boot-starter/other-spring-autoconfig.md b/content/en/docs/zero-code/java/spring-boot-starter/other-spring-autoconfig.md
@@ -1,6 +1,5 @@
 ---
 title: Other Spring autoconfiguration
-description: Spring autoconfiguration without the OpenTelemetry Spring starter
 cSpell:ignore: autoconfigurations
 weight: 70
 ---

diff --git a/...nt/en/docs/zero-code/java/spring-boot-starter/out-of-the-box-instrumentation.md b/...nt/en/docs/zero-code/java/spring-boot-starter/out-of-the-box-instrumentation.md
@@ -1,6 +1,5 @@
 ---
 title: Out of the box instrumentation
-description: Out of the box instrumentation for the starter
 weight: 40
 cSpell:ignore: autoconfigurations autoconfigures logback webflux webmvc
 ---

diff --git a/content/en/docs/zero-code/java/spring-boot-starter/sdk-configuration.md b/content/en/docs/zero-code/java/spring-boot-starter/sdk-configuration.md
@@ -1,6 +1,5 @@
 ---
 title: SDK configuration
-description: Configure the SDK with the OpenTelemetry starter
 weight: 30
 cSpell:ignore: customizer distro
 ---

diff --git a/content/ja/_index.md b/content/ja/_index.md
@@ -0,0 +1,82 @@
+---
+title: OpenTelemetry
+description: >-
+  効果的な観測を可能にする、高品質でユビキタスかつポータブルなテレメトリー
+developer_note:
+  blocks/coverコラム（以下で使用）は、ファイル名に "background" を含む画像ファイルを背景画像として使用します。
+---
+
+<div class="d-none"><a rel="me" href="https://fosstodon.org/@opentelemetry"></a></div>
+
+{{< blocks/cover image_anchor="top" height="max" color="primary" >}}
+
+<!-- prettier-ignore -->
+![OpenTelemetry](/img/logos/opentelemetry-horizontal-color.svg)
+{.otel-logo}
+
+<!-- prettier-ignore -->
+{{% param description %}}
+{.display-6}
+
+<div class="l-primary-buttons mt-5">
+
+- [より詳しく学ぶ](/docs/what-is-opentelemetry/)
+- [デモを試す](/docs/demo/)
+- [インテグレーションを探す](/ecosystem/integrations)
+
+</div>
+
+<div class="h3 mt-4">
+あなたのロールに応じて<a class="text-secondary" href="/docs/getting-started/">始めてみましょう</a>
+</div>
+<div class="l-get-started-buttons">
+
+- [開発者（Dev）](/docs/getting-started/dev/)
+- [運用担当者（Ops）](/docs/getting-started/ops/)
+
+</div>
+{{< /blocks/cover >}}
+
+{{% blocks/lead color="white" %}}
+
+OpenTelemetry は API、SDK、ツールのコレクションです。
+テレメトリーデータ（メトリクス、ログ、トレース）の計装、生成、収集、エクスポートに使用し、ソフトウェアのパフォーマンスや動作の分析に役立てましょう。
+
+> OpenTelemetryは[いくつかの言語](/docs/languages/)で **一般的に利用可能** で、使用に適しています。
+
+{{% /blocks/lead %}}
+
+{{% blocks/section color="dark" type="row" %}}
+
+{{% blocks/feature icon="fas fa-chart-line" title="トレース、メトリクス、ログ"%}}
+
+サービスやソフトウェアからテレメトリーデータを作成・収集し、様々な分析ツールに転送します。
+
+{{% /blocks/feature %}}
+
+{{% blocks/feature icon="fas fa-magic" title="ドロップイン計装" %}}
+
+OpenTelemetryは、[Spring](https://spring.io)、[ASP.NET Core](https://docs.microsoft.com/aspnet/core)、[Express](https://expressjs.com)、[Quarkus](https://quarkus.io)などの一般的なライブラリやフレームワークとインテグレートされています！
+インストールとインテグレーションは、数行のコードで行えるほど簡単です。
+
+{{% /blocks/feature %}}
+
+{{% blocks/feature icon="fab fa-github" title="オープンソース、ベンダー非依存" %}}
+
+100％フリーでオープンソースのOpenTelemetryは、オブザーバビリティ分野の[業界リーダー](/ecosystem/vendors/)によって採用され、サポートされています。
+
+{{% /blocks/feature %}}
+
+{{% /blocks/section %}}
+
+{{% blocks/section color="secondary" type="cncf" %}}
+
+**OpenTelemetryは[CNCF][] [incubating][]プロジェクトです。**<br>OpenTracingとOpenCensusのプロジェクトが合併して設立されました。
+
+[![CNCF logo][]][cncf]
+
+[cncf]: https://cncf.io
+[cncf logo]: /img/logos/cncf-white.svg
+[incubating]: https://www.cncf.io/projects/
+
+{{% /blocks/section %}}
diff --git a/content/zh/docs/concepts/context-propagation.md b/content/zh/docs/concepts/context-propagation.md
@@ -0,0 +1,37 @@
+---
+title: 上下文传播
+weight: 10
+description: 了解实现分布式追踪的概念。
+---
+
+通过上下文传播，[信号](/docs/concepts/signals)可以相互关联，
+无论它们是在何处生成的。
+尽管它不仅限于链路追踪，但它允许 [trace](/docs/concepts/signals/traces)
+跨进程和网络边界任意分布的服务构建相关系统的关联信息。
+
+我们通过两个子概念来定义上下文传播：上下文和传播。
+
+## 上下文
+
+**上下文**是一个对象，它包含发送和接收服务
+（或[执行单元](/docs/specs/otel/glossary/#execution-unit)）
+用于将一个信号与另一个信号关联起来的信息。
+
+例如，如果服务 A 调用服务 B，那么服务 A 中 ID 在上下文中的 span 将用作服务
+B 中创建的下一个 span 的父 span。
+上下文中的 trace ID 也将用于服务 B 中创建的下一个 span，
+这表示该 span 与服务 A 中的 span 属于同一 trace 的一部分。
+
+## 传播
+
+**传播**是上下文在服务和进程之间移动的机制。
+它序列化或反序列化上下文对象并提供要从一个服务传播到另一个服务的相关信息。
+传播通常由检测库处理并且对用户是透明的，但如果你需要手动传播上下文，则可以使用传播 API。
+
+OpenTelemetry 维护着几个官方传播器。
+默认传播器使用 [W3C 追踪上下文](https://www.w3.org/TR/trace-context/)
+规范指定的标头。
+
+## 规范
+
+要了解有关上下文传播的更多信息，请参阅[上下文规范](/docs/specs/otel/context/)。
diff --git a/data/instrumentation.yaml b/data/instrumentation.yaml
@@ -26,7 +26,7 @@ go:
   status:
     traces: stable
     metrics: stable
-    logs: alpha
+    logs: beta
 java:
   name: Java
   status:

diff --git a/data/registry/collector-builder.yml b/data/registry/collector-builder.yml
@@ -17,5 +17,5 @@ createdAt: 2023-12-18
 package:
   registry: go
   name: go.opentelemetry.io/collector/cmd/builder
-  version: v0.101.0
+  version: v0.102.0
   quickInstall: false
diff --git a/data/registry/collector-exporter-alertmanager.yml b/data/registry/collector-exporter-alertmanager.yml
@@ -17,7 +17,7 @@ authors:
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alertmanagerexporter
-  version: v0.101.0
+  version: v0.102.0
 urls:
   repo: https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/alertmanagerexporter
 createdAt: 2023-12-05
diff --git a/data/registry/collector-exporter-alibaba-cloud-log-service.yml b/data/registry/collector-exporter-alibaba-cloud-log-service.yml
@@ -17,4 +17,4 @@ createdAt: 2021-02-24
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter
-  version: v0.101.0
+  version: v0.102.0
diff --git a/data/registry/collector-exporter-aws-xray.yml b/data/registry/collector-exporter-aws-xray.yml
@@ -16,4 +16,4 @@ createdAt: 2020-06-06
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter
-  version: v0.101.0
+  version: v0.102.0
diff --git a/data/registry/collector-exporter-awscloudwatchlogs.yml b/data/registry/collector-exporter-awscloudwatchlogs.yml
@@ -16,4 +16,4 @@ createdAt: 2020-11-05
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter
-  version: v0.101.0
+  version: v0.102.0
diff --git a/data/registry/collector-exporter-awsemf.yml b/data/registry/collector-exporter-awsemf.yml
@@ -16,4 +16,4 @@ createdAt: 2020-06-06
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter
-  version: v0.101.0
+  version: v0.102.0
diff --git a/data/registry/collector-exporter-awss3.yml b/data/registry/collector-exporter-awss3.yml
@@ -17,4 +17,4 @@ createdAt: 2020-11-05
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awss3exporter
-  version: v0.101.0
+  version: v0.102.0
diff --git a/data/registry/collector-exporter-azure-monitor.yml b/data/registry/collector-exporter-azure-monitor.yml
@@ -16,4 +16,4 @@ createdAt: 2020-06-06
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuremonitorexporter
-  version: v0.101.0
+  version: v0.102.0
diff --git a/data/registry/collector-exporter-azuredataexplorer.yml b/data/registry/collector-exporter-azuredataexplorer.yml
@@ -17,4 +17,4 @@ createdAt: 2020-11-05
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/azuredataexplorerexporter
-  version: v0.101.0
+  version: v0.102.0
diff --git a/data/registry/collector-exporter-carbon.yml b/data/registry/collector-exporter-carbon.yml
@@ -16,4 +16,4 @@ createdAt: 2020-06-06
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/carbonexporter
-  version: v0.101.0
+  version: v0.102.0
diff --git a/data/registry/collector-exporter-cassandra.yml b/data/registry/collector-exporter-cassandra.yml
@@ -17,4 +17,4 @@ createdAt: 2020-11-05
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/cassandraexporter
-  version: v0.101.0
+  version: v0.102.0
diff --git a/data/registry/collector-exporter-clickhouse.yml b/data/registry/collector-exporter-clickhouse.yml
@@ -17,4 +17,4 @@ createdAt: 2020-11-05
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/clickhouseexporter
-  version: v0.101.0
+  version: v0.102.0
diff --git a/data/registry/collector-exporter-coralogix.yml b/data/registry/collector-exporter-coralogix.yml
@@ -16,4 +16,4 @@ createdAt: 2020-11-05
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/coralogixexporter
-  version: v0.101.0
+  version: v0.102.0
diff --git a/data/registry/collector-exporter-datadog.yml b/data/registry/collector-exporter-datadog.yml
@@ -16,4 +16,4 @@ createdAt: 2020-06-06
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter
-  version: v0.101.0
+  version: v0.102.0
diff --git a/data/registry/collector-exporter-dataset.yml b/data/registry/collector-exporter-dataset.yml
@@ -16,4 +16,4 @@ createdAt: 2020-06-06
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datasetexporter
-  version: v0.101.0
+  version: v0.102.0
diff --git a/data/registry/collector-exporter-debug.yml b/data/registry/collector-exporter-debug.yml
@@ -16,4 +16,4 @@ createdAt: 2020-11-05
 package:
   registry: go-collector
   name: go.opentelemetry.io/collector/exporter/debugexporter
-  version: v0.101.0
+  version: v0.102.0
diff --git a/data/registry/collector-exporter-elasticsearch.yml b/data/registry/collector-exporter-elasticsearch.yml
@@ -16,4 +16,4 @@ createdAt: 2020-11-05
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/elasticsearchexporter
-  version: v0.101.0
+  version: v0.102.0
diff --git a/data/registry/collector-exporter-file.yml b/data/registry/collector-exporter-file.yml
@@ -16,4 +16,4 @@ createdAt: 2020-11-05
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter
-  version: v0.101.0
+  version: v0.102.0
diff --git a/data/registry/collector-exporter-googlecloud.yml b/data/registry/collector-exporter-googlecloud.yml
@@ -17,4 +17,4 @@ createdAt: 2020-06-06
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudexporter
-  version: v0.101.0
+  version: v0.102.0
diff --git a/data/registry/collector-exporter-googlecloudpubsub.yml b/data/registry/collector-exporter-googlecloudpubsub.yml
@@ -16,4 +16,4 @@ createdAt: 2020-11-05
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlecloudpubsubexporter
-  version: v0.101.0
+  version: v0.102.0
diff --git a/data/registry/collector-exporter-googlemanagedprometheus.yml b/data/registry/collector-exporter-googlemanagedprometheus.yml
@@ -18,4 +18,4 @@ createdAt: 2022-10-27
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/googlemanagedprometheusexporter
-  version: v0.101.0
+  version: v0.102.0
diff --git a/data/registry/collector-exporter-honeycombmarker.yml b/data/registry/collector-exporter-honeycombmarker.yml
@@ -18,4 +18,4 @@ createdAt: 2023-10-17
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/honeycombmarkerexporter
-  version: v0.101.0
+  version: v0.102.0
diff --git a/data/registry/collector-exporter-influxdb.yml b/data/registry/collector-exporter-influxdb.yml
@@ -17,4 +17,4 @@ createdAt: 2020-11-05
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/influxdbexporter
-  version: v0.101.0
+  version: v0.102.0
diff --git a/data/registry/collector-exporter-instana.yml b/data/registry/collector-exporter-instana.yml
@@ -16,4 +16,4 @@ createdAt: 2020-06-06
 package:
   registry: go-collector
   name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/instanaexporter
-  version: v0.101.0
+  version: v0.102.0