Merge branch 'main' into main

open-telemetry · Jan 1, 2025 · 929bb11 · 929bb11
2 parents 922fcb9 + 69511a8
commit 929bb11
Show file tree

Hide file tree

Showing 25 changed files with 57 additions and 45 deletions.
diff --git a/content/en/blog/2023/otel-arrow/index.md b/content/en/blog/2023/otel-arrow/index.md
@@ -140,7 +140,7 @@ aligning OpenTelemetry more closely with modern data pipelines that are
 increasingly pivoting towards Apache Arrow.
 
 A specification for this protocol (OTEP 0156) can be found
-[here](https://github.com/open-telemetry/oteps/blob/main/text/0156-columnar-encoding.md).
+[here](https://github.com/open-telemetry/opentelemetry-specification/blob/main/oteps/0156-columnar-encoding.md).
 A reference implementation of the encoding/decoding function can be accessed
 [here](https://github.com/open-telemetry/otel-arrow).
 
@@ -269,7 +269,7 @@ invaluable assistance.
 ## Links
 
 - OpenTelemetry Protocol with Apache Arrow Specification -
-  [OTEP 0156](https://github.com/open-telemetry/oteps/blob/main/text/0156-columnar-encoding.md)
+  [OTEP 0156](https://github.com/open-telemetry/opentelemetry-specification/blob/main/oteps/0156-columnar-encoding.md)
 - OpenTelemetry Protocol with Apache Arrow (encoder/decoder)
   [repository](https://github.com/open-telemetry/otel-arrow).
 - Receiver

diff --git a/content/en/blog/2024/fuzzing-audit-results.md b/content/en/blog/2024/fuzzing-audit-results.md
@@ -5,7 +5,7 @@ date: 2024-12-20
 author: '[Adam Korczynski](https://github.com/AdamKorcz)'
 issue: 5798
 sig: GC
-cSpell:ignore: Korczynski containerd
+cSpell:ignore: containerd Korczynski
 ---
 
 OpenTelemetry is happy to announce the completion of the Collector's fuzzing

diff --git a/content/en/blog/2024/otel-arrow-production/index.md b/content/en/blog/2024/otel-arrow-production/index.md
@@ -54,7 +54,7 @@ The compression bridge consists of two OpenTelemetry Collectors labeled exporter
 and receiver, or they could equally be two pools of load-balanced collectors.
 
 As described in the
-[OTEP 0156 design document](https://github.com/open-telemetry/oteps/blob/main/text/0156-columnar-encoding.md#mapping-otel-entities-to-arrow-records),
+[OTEP 0156 design document](https://github.com/open-telemetry/opentelemetry-specification/blob/main/oteps/0156-columnar-encoding.md#mapping-otel-entities-to-arrow-records),
 the exporter converts arbitrary OpenTelemetry data into an Arrow record batch.
 The Arrow record batch is a block of memory, with a standardized layout, making
 it possible to exchange data across address spaces and virtual process

diff --git a/content/en/blog/2024/profiling.md b/content/en/blog/2024/profiling.md
@@ -58,7 +58,7 @@ utilization at a code-level and allows for this profiling data to be stored,
 queried, and analyzed over time and across different attributes. It’s an
 important technique for developers and performance engineers to understand
 exactly what’s happening in their code. OpenTelemetry’s
-[profiling signal](https://github.com/open-telemetry/oteps/blob/main/text/profiles/0239-profiles-data-model.md)
+[profiling signal](https://github.com/open-telemetry/opentelemetry-specification/blob/main/oteps/profiles/0239-profiles-data-model.md)
 expands upon the work that has been done in this space and, as a first for the
 industry, connects profiles with other telemetry signals from applications and
 infrastructure. This allows developers and operators to correlate resource

diff --git a/content/en/docs/collector/architecture.md b/content/en/docs/collector/architecture.md
@@ -83,7 +83,7 @@ service:
 ```
 
 The previous example defines a pipeline for the traces type of telemetry data,
-with three receivers, two processors, and three exporters.
+with two receivers, two processors, and two exporters.
 
 ### Receivers
 

diff --git a/content/en/docs/concepts/instrumentation/libraries.md b/content/en/docs/concepts/instrumentation/libraries.md
@@ -115,7 +115,7 @@ to help you decide how to minimize dependency conflicts:
 - While your instrumentation stabilizes, consider shipping it as a separate
   package, so that it never causes issues for users who don't use it. You can
   keep it in your repository, or
-  [add it to OpenTelemetry](https://github.com/open-telemetry/oteps/blob/main/text/0155-external-modules.md#contrib-components),
+  [add it to OpenTelemetry](https://github.com/open-telemetry/opentelemetry-specification/blob/main/oteps/0155-external-modules.md#contrib-components),
   so it ships with other instrumentation libraries.
 - Semantic conventions are [stable, but subject to evolution][]: while this does
   not cause any functional issues, you might need to update your instrumentation

diff --git a/content/en/docs/concepts/signals/_index.md b/content/en/docs/concepts/signals/_index.md
@@ -20,7 +20,7 @@ OpenTelemetry currently supports [traces](/docs/concepts/signals/traces),
 [metrics](/docs/concepts/signals/metrics), [logs](/docs/concepts/signals/logs)
 and [baggage](/docs/concepts/signals/baggage). _Events_ are a specific type of
 log, and
-[_profiles_ are being worked on](https://github.com/open-telemetry/oteps/blob/main/text/profiles/0212-profiling-vision.md)
+[_profiles_ are being worked on](https://github.com/open-telemetry/opentelemetry-specification/blob/main/oteps/profiles/0212-profiling-vision.md)
 by the Profiling Working Group.
 
 [signals]: /docs/specs/otel/glossary/#signals
diff --git a/content/en/docs/demo/services/recommendation.md b/content/en/docs/demo/services/recommendation.md
@@ -8,7 +8,7 @@ cSpell:ignore: cpython instrumentor NOTSET
 This service is responsible to get a list of recommended products for the user
 based on existing product IDs the user is browsing.
 
-[Recommendation service source](https://github.com/open-telemetry/opentelemetry-demo/blob/main/src/recommendationservice/)
+[Recommendation service source](https://github.com/open-telemetry/opentelemetry-demo/blob/main/src/recommendation/)
 
 ## Auto-instrumentation
 

diff --git a/content/en/docs/zero-code/java/agent/annotations.md b/content/en/docs/zero-code/java/agent/annotations.md
@@ -7,17 +7,18 @@ cSpell:ignore: Flowable javac reactivestreams reactivex
 ---
 
 For most users, the out-of-the-box instrumentation is completely sufficient and
-nothing more has to be done. Sometimes, however, users wish to create
+nothing more needs to be done. Sometimes, however, users wish to create
 [spans](/docs/concepts/signals/traces/#spans) for their own custom code without
-doing too much code change.
+having to change much code. The `WithSpan` and `WithAttribute` annotations
+support those use cases.
 
 ## Dependencies
 
 You'll need to add a dependency on the
 `opentelemetry-instrumentation-annotations` library to use the `@WithSpan`
 annotation.
 
-### Maven
+{{< tabpane text=true >}} {{% tab "Maven" %}}
 
 ```xml
 <dependencies>
@@ -29,6 +30,8 @@ annotation.
 </dependencies>
 ```
 
+{{% /tab %}} {{% tab "Gradle" %}}
+
 ### Gradle
 
 ```groovy
@@ -37,10 +40,12 @@ dependencies {
 }
 ```
 
+{{% /tab %}} {{< /tabpane >}}
+
 ## Creating spans around methods with `@WithSpan`
 
-To create a [span](/docs/concepts/signals/traces/#spans) corresponding to one of
-your method, annotate the method with `@WithSpan`.
+To create a [span](/docs/concepts/signals/traces/#spans) that instruments a
+particular method, annotate the method with `@WithSpan`.
 
 ```java
 import io.opentelemetry.instrumentation.annotations.WithSpan;
@@ -78,9 +83,10 @@ types listed below, then the span will not be ended until the future completes.
 ## Adding attributes to the span with `@SpanAttribute`
 
 When a [span](/docs/concepts/signals/traces/#spans) is created for an annotated
-method the values of the arguments to the method invocation can be automatically
-added as [attributes](/docs/concepts/signals/traces/#attributes) to the created
-span by annotating the method parameters with the `@SpanAttribute` annotation.
+method, the values of the arguments to the method invocation can be
+automatically added as [attributes](/docs/concepts/signals/traces/#attributes)
+to the created span. Simply annotate the method parameters with the
+`@SpanAttribute` annotation:
 
 ```java
 import io.opentelemetry.instrumentation.annotations.SpanAttribute;

diff --git a/content/en/docs/zero-code/java/agent/configuration.md b/content/en/docs/zero-code/java/agent/configuration.md
@@ -21,24 +21,24 @@ The agent can consume configuration from one or more of the following sources
 
 ## Configuring with Environment Variables
 
-In some environments, configuring via Environment Variables is more preferred.
-Any setting configurable with a System Property can also be configured with an
-Environment Variable. Many settings below include both options, but where they
-don't apply the following steps to determine the correct name mapping of the
-desired System Property:
+In certain environments, configuring settings through environment variables is
+often preferred. Any setting that can be configured using a system property can
+also be set using an environment variable. While many of the settings below
+provide examples for both formats, for those that do not, use the following
+steps to determine the correct name mapping for the desired system property:
 
-- Convert the System Property to uppercase.
+- Convert the system property name to uppercase.
 - Replace all `.` and `-` characters with `_`.
 
 For example `otel.instrumentation.common.default-enabled` would convert to
 `OTEL_INSTRUMENTATION_COMMON_DEFAULT_ENABLED`.
 
 ## Configuration file
 
-You can provide a path to agent configuration file by setting the following
+You can provide a path to an agent configuration file by setting the following
 property:
 
-{{% config_option name="otel.javaagent.configuration-file" %}} Path to valid
+{{% config_option name="otel.javaagent.configuration-file" %}} Path to a valid
 Java properties file which contains the agent configuration.
 {{% /config_option %}}
 

diff --git a/content/en/docs/zero-code/java/agent/disable.md b/content/en/docs/zero-code/java/agent/disable.md
@@ -26,10 +26,11 @@ to have more control of which instrumentation is applied.
 {{% config_option name="otel.instrumentation.[name].enabled" %}} Set to `true`
 to enable each desired instrumentation individually. {{% /config_option %}}
 
-> **Note**: Some instrumentation relies on other instrumentation to function
-> properly. When selectively enabling instrumentation, be sure to enable the
-> transitive dependencies too. Determining this dependency relationship is left
-> as an exercise to the user.
+{{% alert title="Note" color="warning" %}} Some instrumentation relies on other
+instrumentation to function properly. When selectively enabling instrumentation,
+be sure to enable the transitive dependencies too. Determining this dependency
+relationship is left as an exercise to the user. This is considered advanced
+usage and is not recommended for most users. {{% /alert %}}
 
 ## Enable manual instrumentation only
 

diff --git a/content/en/docs/zero-code/java/agent/instrumentation/http.md b/content/en/docs/zero-code/java/agent/instrumentation/http.md
@@ -39,9 +39,10 @@ instrumentations.
 
 ## Capturing servlet request parameters
 
-You can configure the agent to capture predefined HTTP request parameter as span
-attributes for requests that are handled by Servlet API. Use the following
-property to define which servlet request parameters you want to capture:
+You can configure the agent to capture predefined HTTP request parameters as
+span attributes for requests that are handled by the Servlet API. Use the
+following property to define which servlet request parameters you want to
+capture:
 
 {{% config_option name="otel.instrumentation.servlet.experimental.capture-request-parameters" %}}
 A comma-separated list of request parameter names. {{% /config_option %}}

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
@@ -92,7 +92,7 @@ Starter AOP dependency to your project:
 </dependencies>
 ```
 
-{{% /tab %}} {{% tab header="Gradle (`gradle.build`)" lang=Gradle %}}
+{{% /tab %}} {{% tab header="Gradle (`build.gradle`)" lang=Gradle %}}
 
 ```kotlin
 dependencies {

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
@@ -117,7 +117,7 @@ The OpenTelemetry starter uses OpenTelemetry Spring Boot
 </dependency>
 ```
 
-{{% /tab %}} {{% tab header="Gradle (`gradle.build`)" lang=Gradle %}}
+{{% /tab %}} {{% tab header="Gradle (`build.gradle`)" lang=Gradle %}}
 
 ```kotlin
 implementation("io.opentelemetry.instrumentation:opentelemetry-spring-boot-starter")

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
@@ -40,7 +40,7 @@ Check out the implementation
 </dependencies>
 ```
 
-{{% /tab %}} {{% tab header="Gradle (`gradle.build`)" lang=Gradle %}}
+{{% /tab %}} {{% tab header="Gradle (`build.gradle`)" lang=Gradle %}}
 
 ```kotlin
 dependencies {

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
@@ -112,7 +112,7 @@ from tracing:
 </dependencies>
 ```
 
-{{% /tab %}} {{% tab header="Gradle (`gradle.build`)" lang=Gradle %}}
+{{% /tab %}} {{% tab header="Gradle (`build.gradle`)" lang=Gradle %}}
 
 ```kotlin
 dependencies {
@@ -265,7 +265,7 @@ Use the following snippet in your pom.xml file to generate the
 </build>
 ```
 
-{{% /tab %}} {{% tab header="Gradle (`gradle.build`)" lang=Gradle %}}
+{{% /tab %}} {{% tab header="Gradle (`build.gradle`)" lang=Gradle %}}
 
 ```kotlin
 springBoot {

diff --git a/content/ja/docs/concepts/instrumentation/libraries.md b/content/ja/docs/concepts/instrumentation/libraries.md
@@ -87,7 +87,7 @@ OpenTelemetry API は、抽象化と動作しない実装のセットです。
 - OpenTelemetry Trace APIは2021年初めに安定版に達しました。このAPIは[Semantic Versioning 2.0](/docs/specs/otel/versioning-and-stability/)にしがたっていて、開発チームはAPIの安定性を真剣に受け止めています。
 - 依存する場合は、もっとも早い安定版の OpenTelemetry API (1.0.\*)を使用し、新機能を使用する必要がない限り、アップデートは避けてください。
 - あなたの計装が安定するまでの間、それを別のパッケージとしてリリースすることを検討してください。
-  あなたのレポジトリに置いておくこともできますし、[OpenTelemetryに追加](https://github.com/open-telemetry/oteps/blob/main/text/0155-external-modules.md#contrib-components) して、他の計装パッケージと一緒にリリースすることもできます。
+  あなたのレポジトリに置いておくこともできますし、[OpenTelemetryに追加](https://github.com/open-telemetry/opentelemetry-specification/blob/main/oteps/0155-external-modules.md#contrib-components) して、他の計装パッケージと一緒にリリースすることもできます。
 - セマンティック規約は[安定していますが、徐々に発展しています][stable, but subject to evolution]。
   機能的な問題は発生しませんが、ときどき、計装をアップデートする必要があるかもしれません。
   プレビュープラグインか、OpenTelemetry contrib リポジトリにそれを置くことで、ユーザの変更を壊すことなく、規約を最新に保つことができるかもしれません。

diff --git a/content/ja/docs/concepts/signals/_index.md b/content/ja/docs/concepts/signals/_index.md
@@ -11,6 +11,6 @@ OpenTelemetryの目的は、**[シグナル][signals]** を収集、処理、エ
 異なるシグナルをグループ化して、同じテクノロジーの内部動作を異なる角度から観察することもできる。
 
 OpenTelemetry は現在、[トレース](/docs/concepts/signals/traces)、[メトリクス](/docs/concepts/signals/metrics)、[ログ](/docs/concepts/signals/logs)と[バゲッジ](/docs/concepts/signals/baggage)をサポートしています。
-_イベント_ は特定の種類のログで、_プロファイル_ はProfiling Working Groupによって[現在策定中](https://github.com/open-telemetry/oteps/blob/main/text/profiles/0212-profiling-vision.md)です。
+_イベント_ は特定の種類のログで、_プロファイル_ はProfiling Working Groupによって[現在策定中](https://github.com/open-telemetry/opentelemetry-specification/blob/main/oteps/profiles/0212-profiling-vision.md)です。
 
 [signals]: /docs/specs/otel/glossary/#signals
diff --git a/content/pt/docs/concepts/instrumentation/libraries.md b/content/pt/docs/concepts/instrumentation/libraries.md
@@ -133,7 +133,7 @@ algumas considerações para ajudar a minimizar problemas com dependências:
 - Enquanto sua instrumentação se estabiliza, considere lançá-la como um pacote
   separado, para que isso não cause problemas para usuários que não a utilizam.
   Você pode mantê-la em seu repositório ou
-  [adicioná-la ao OpenTelemetry](https://github.com/open-telemetry/oteps/blob/main/text/0155-external-modules.md#contrib-components),
+  [adicioná-la ao OpenTelemetry](https://github.com/open-telemetry/opentelemetry-specification/blob/main/oteps/0155-external-modules.md#contrib-components),
   para que seja distribuída junto com outras bibliotecas de instrumentação.
 - As Convenções Semânticas são [estáveis, mas sujeitas à evolução][]: embora
   isso não cause problemas funcionais, pode ser necessário atualizar sua

diff --git a/content/pt/docs/concepts/signals/_index.md b/content/pt/docs/concepts/signals/_index.md
@@ -19,7 +19,7 @@ O OpenTelemetry atualmente suporta [rastros](/docs/concepts/signals/traces),
 [métricas](/docs/concepts/signals/metrics), [logs](/docs/concepts/signals/logs)
 e [bagagem](/docs/concepts/signals/baggage). Eventos são um tipo específico de
 log, e o
-[perfilamento está sendo trabalhado](https://github.com/open-telemetry/oteps/blob/main/text/profiles/0212-profiling-vision.md)
+[perfilamento está sendo trabalhado](https://github.com/open-telemetry/opentelemetry-specification/blob/main/oteps/profiles/0212-profiling-vision.md)
 pelo Grupo de Trabalho de Perfilamento _(Profiling Working Group)_.
 
 [sinais]: /docs/specs/otel/glossary/#signals
diff --git a/content/zh/docs/concepts/signals/_index.md b/content/zh/docs/concepts/signals/_index.md
@@ -22,6 +22,6 @@ OpenTelemetry 的目的是收集、处理和导出 **[信号][]** 。
 - [行李 (Baggage)](/docs/concepts/signals/baggage)
 
 **事件**是一种特定类型的日志，而
-[**profiles** 正在由 Profiling 工作组开发](https://github.com/open-telemetry/oteps/blob/main/text/profiles/0212-profiling-vision.md)。
+[**profiles** 正在由 Profiling 工作组开发](https://github.com/open-telemetry/opentelemetry-specification/blob/main/oteps/profiles/0212-profiling-vision.md)。
 
 [信号]: /docs/specs/otel/glossary/#signals
diff --git a/data/registry/instrumentation-java-http4k.yml b/data/registry/instrumentation-java-http4k.yml
@@ -19,4 +19,4 @@ isFirstParty: true
 package:
   registry: maven
   name: org.http4k/http4k-opentelemetry
-  version: 5.41.0.0
+  version: 5.43.0.0
diff --git a/data/registry/tools-dotnet-aspire-dashboard.yml b/data/registry/tools-dotnet-aspire-dashboard.yml
@@ -15,5 +15,5 @@ description:
   about your distributed application.
 authors:
   - name: Microsoft
-    url: https://github.com/microsft
+    url: https://github.com/microsoft
 createdAt: 2024-12-12
diff --git a/layouts/partials/docs/get-signal-status.html b/layouts/partials/docs/get-signal-status.html
@@ -20,7 +20,7 @@
     {{ $status = cond (in $statusWeCanLinkTo $status)
           (printf "[%s](/docs/specs/otel/versioning-and-stability/#%s)" $humanizedStatus $status)
           (cond (in "alpha beta" $status)
-            (printf "[%s](https://github.com/open-telemetry/oteps/blob/main/text/0232-maturity-of-otel.md#%s)" $humanizedStatus $status)
+            (printf "[%s](https://github.com/open-telemetry/opentelemetry-specification/blob/main/oteps/0232-maturity-of-otel.md#%s)" $humanizedStatus $status)
             $humanizedStatus)
     -}}
   {{ end -}}

diff --git a/static/refcache.json b/static/refcache.json
@@ -6063,6 +6063,10 @@
     "StatusCode": 206,
     "LastSeen": "2024-12-12T21:04:04.691776+01:00"
   },
+  "https://github.com/microsoft": {
+    "StatusCode": 200,
+    "LastSeen": "2024-12-26T01:30:01.335046861Z"
+  },
   "https://github.com/microsoft/ApplicationInsights-Java": {
     "StatusCode": 200,
     "LastSeen": "2024-04-19T17:43:49.897716918Z"