Skip to content

Commit d8b6422

Browse files
authored
Merge branch 'main' into main
2 parents e66cc87 + cd90ab7 commit d8b6422

File tree

73 files changed

+227
-87
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+227
-87
lines changed

.github/workflows/check-i18n.yml

+7-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,12 @@ jobs:
1313
with:
1414
fetch-depth: 0 # all
1515
- name: Any files missing hash key?
16-
run: scripts/check-i18n.sh -n -x -v
16+
run: |
17+
scripts/check-i18n.sh -n -x -v
18+
.github/workflows/scripts/check-i18n-helper.sh
1719
- name: Any files with invalid hash keys?
1820
run: scripts/check-i18n.sh -v
19-
- run: .github/workflows/scripts/check-i18n-helper.sh
21+
- name: Drifted status needs updating?
22+
run: |
23+
scripts/check-i18n.sh -D
24+
# npm run _diff:fail

content/en/docs/collector/configuration.md

+15
Original file line numberDiff line numberDiff line change
@@ -639,6 +639,21 @@ service:
639639
exporters: [opencensus, zipkin]
640640
```
641641

642+
As with components, use the `type[/name]` syntax to create additional pipelines
643+
for a given type. Here is an example extending the previous configuration:
644+
645+
```yaml
646+
service:
647+
pipelines:
648+
# ...
649+
traces:
650+
# ...
651+
traces/2:
652+
receivers: [opencensus]
653+
processors: [batch]
654+
exporters: [zipkin]
655+
```
656+
642657
### Telemetry
643658

644659
The `telemetry` config section is where you can set up observability for the

content/en/docs/contributing/localization.md

+7
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,13 @@ if you want HEAD to correspond to `main` in GitHub.
225225

226226
{{% /alert %}}
227227

228+
### Drift status
229+
230+
Run `npm run fix:i18n:status` to add a front-matter field `drifted_from_default`
231+
to those target localization pages that have drifted. This field will soon be
232+
used to display a banner at the top of pages that have drifted relative to their
233+
English counterparts.
234+
228235
### Script help
229236

230237
For more details about the script, run `npm run check:i18n -- -h`.

content/en/docs/demo/services/frontend.md

+53-54
Original file line numberDiff line numberDiff line change
@@ -22,62 +22,61 @@ initialize the SDK and auto-instrumentation based on standard
2222
for OTLP export, resource attributes, and service name.
2323

2424
```javascript
25-
const opentelemetry = require('@opentelemetry/sdk-node');
26-
const {
27-
getNodeAutoInstrumentations,
28-
} = require('@opentelemetry/auto-instrumentations-node');
29-
const {
30-
OTLPTraceExporter,
31-
} = require('@opentelemetry/exporter-trace-otlp-grpc');
32-
const {
33-
OTLPMetricExporter,
34-
} = require('@opentelemetry/exporter-metrics-otlp-grpc');
35-
const { PeriodicExportingMetricReader } = require('@opentelemetry/sdk-metrics');
36-
const {
37-
alibabaCloudEcsDetector,
38-
} = require('@opentelemetry/resource-detector-alibaba-cloud');
39-
const {
40-
awsEc2Detector,
41-
awsEksDetector,
42-
} = require('@opentelemetry/resource-detector-aws');
43-
const {
44-
containerDetector,
45-
} = require('@opentelemetry/resource-detector-container');
46-
const { gcpDetector } = require('@opentelemetry/resource-detector-gcp');
47-
const {
48-
envDetector,
49-
hostDetector,
50-
osDetector,
51-
processDetector,
52-
} = require('@opentelemetry/resources');
53-
54-
const sdk = new opentelemetry.NodeSDK({
55-
traceExporter: new OTLPTraceExporter(),
56-
instrumentations: [
57-
getNodeAutoInstrumentations({
58-
// only instrument fs if it is part of another trace
59-
'@opentelemetry/instrumentation-fs': {
60-
requireParentSpan: true,
61-
},
25+
const FrontendTracer = async () => {
26+
const { ZoneContextManager } = await import('@opentelemetry/context-zone');
27+
28+
let resource = new Resource({
29+
[SEMRESATTRS_SERVICE_NAME]: NEXT_PUBLIC_OTEL_SERVICE_NAME,
30+
});
31+
const detectedResources = detectResourcesSync({
32+
detectors: [browserDetector],
33+
});
34+
resource = resource.merge(detectedResources);
35+
36+
const provider = new WebTracerProvider({
37+
resource,
38+
spanProcessors: [
39+
new SessionIdProcessor(),
40+
new BatchSpanProcessor(
41+
new OTLPTraceExporter({
42+
url:
43+
NEXT_PUBLIC_OTEL_EXPORTER_OTLP_TRACES_ENDPOINT ||
44+
'http://localhost:4318/v1/traces',
45+
}),
46+
{
47+
scheduledDelayMillis: 500,
48+
},
49+
),
50+
],
51+
});
52+
53+
const contextManager = new ZoneContextManager();
54+
55+
provider.register({
56+
contextManager,
57+
propagator: new CompositePropagator({
58+
propagators: [
59+
new W3CBaggagePropagator(),
60+
new W3CTraceContextPropagator(),
61+
],
6262
}),
63-
],
64-
metricReader: new PeriodicExportingMetricReader({
65-
exporter: new OTLPMetricExporter(),
66-
}),
67-
resourceDetectors: [
68-
containerDetector,
69-
envDetector,
70-
hostDetector,
71-
osDetector,
72-
processDetector,
73-
alibabaCloudEcsDetector,
74-
awsEksDetector,
75-
awsEc2Detector,
76-
gcpDetector,
77-
],
78-
});
63+
});
7964

80-
sdk.start();
65+
registerInstrumentations({
66+
tracerProvider: provider,
67+
instrumentations: [
68+
getWebAutoInstrumentations({
69+
'@opentelemetry/instrumentation-fetch': {
70+
propagateTraceHeaderCorsUrls: /.*/,
71+
clearTimingResources: true,
72+
applyCustomAttributesOnSpan(span) {
73+
span.setAttribute('app.synthetic_request', IS_SYNTHETIC_REQUEST);
74+
},
75+
},
76+
}),
77+
],
78+
});
79+
};
8180
```
8281

8382
Node required modules are loaded using the `--require` command line argument.

content/en/docs/languages/java/_index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ description: >-
66
aliases: [/java, /java/metrics, /java/tracing]
77
cascade:
88
vers:
9-
instrumentation: 2.13.2
9+
instrumentation: 2.13.3
1010
otel: 1.47.0
1111
contrib: 1.44.0
1212
semconv: 1.30.0

content/en/docs/zero-code/java/_index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ aliases:
66
- /docs/languages/java/automatic_instrumentation
77
cascade:
88
vers:
9-
instrumentation: 2.13.2
9+
instrumentation: 2.13.3
1010
otel: 1.47.0
1111
---
1212

content/es/_index.md

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ developer_note:
77
de imagen que contenga la palabra "background" en su nombre.
88
show_banner: true
99
default_lang_commit: 7ac35d6b429165bbe6c28bdd91feeae83fd35142
10+
drifted_from_default: true
1011
---
1112

1213
<div class="d-none"><a rel="me" href="https://fosstodon.org/@opentelemetry"></a></div>

content/es/docs/concepts/components.md

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ description: Componentes que forman OpenTelemetry
44
aliases: [data-collection]
55
weight: 20
66
default_lang_commit: 9b7da35fd7abd77d867177902b36d95e5f322182
7+
drifted_from_default: true
78
---
89

910
OpenTelemetry está compuesto por varios componentes principales:

content/es/docs/concepts/context-propagation.md

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ title: Propagación de contexto
33
weight: 10
44
description: Aprende sobre el concepto que habilita el trazado distribuido.
55
default_lang_commit: 4966f752eb35f97c095ed1c813972c2ab38f0b1a
6+
drifted_from_default: true
67
---
78

89
Con la propagación de contexto, [Señales](/docs/concepts/signals) pueden

content/es/docs/contributing/_index.md

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ title: Contribuir
33
description: Aprende cómo contribuir a la documentación de OpenTelemetry.
44
weight: 980
55
default_lang_commit: 30783526402b69a3ac44eeb0f6cf066732f0bdca
6+
drifted_from_default: true
67
---
78

89
Quienes colaboran para documentar OpenTelemetry:

content/es/docs/contributing/issues.md

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ weight: 10
77
_issues: https://github.com/open-telemetry/opentelemetry.io/issues
88
_issue: https://github.com/open-telemetry/opentelemetry.io/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc+label%3A
99
default_lang_commit: 99f0ae5760038d51f9e9eb376bb428a2caca8167 # patched
10+
drifted_from_default: true
1011
---
1112

1213
## Solucionando una propuesta existente

content/es/docs/contributing/pull-requests.md

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ description:
55
editor de código.
66
weight: 2
77
default_lang_commit: f724c15be360e5059fb89e696d9a5cc8d00496f6 # patched
8+
drifted_from_default: true
89
cSpell:ignore: aplícala solucionándolas vincúlalos
910
---
1011

content/es/docs/demo/_index.md

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ cascade:
55
repo: https://github.com/open-telemetry/opentelemetry-demo
66
weight: 180
77
default_lang_commit: 9b5e318036fb92e4a1896259cc3bbdad2843e1de
8+
drifted_from_default: true
89
cSpell:ignore: diagnostícala OLJCESPC preconfigurados
910
---
1011

content/es/docs/getting-started/ops.md

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
title: Introducción para Operaciones
33
linkTitle: Ops
44
default_lang_commit: ede5b715791550eccf1c0dc3d57e2713ca6350ab
5+
drifted_from_default: true
56
---
67

78
Esta es tu página de [introducción](..) si:

content/es/docs/kubernetes/_index.md

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ linkTitle: Kubernetes
44
weight: 350
55
description: Usando OpenTelemetry con Kubernetes
66
default_lang_commit: d638c386ae327328ff35604df54fa6ddd8b51b65
7+
drifted_from_default: file not found
78
---
89

910
## Introducción

content/es/docs/kubernetes/collector/_index.md

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
title: OpenTelemetry Collector y Kubernetes
33
linkTitle: Colector
44
default_lang_commit: f7cb8b65a478450d80d703b34c8473c579702108
5+
drifted_from_default: file not found
56
---
67

78
El [OpenTelemetry Collector](/docs/collector/) es una forma de recibir, procesar

content/es/docs/kubernetes/collector/components.md

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
title: Componentes clave para Kubernetes
33
linkTitle: Componentes
44
default_lang_commit: 3815d1481fe753df10ea3dc26cbe64dba0230579 # with patched links
5+
drifted_from_default: file not found
56
# prettier-ignore
67
cSpell:ignore: alertmanagers asignador containerd crio filelog gotime horizontalpodautoscalers hostfs hostmetrics iostream k8sattributes kubelet kubeletstats logtag paginación replicasets replicationcontrollers resourcequotas statefulsets varlibdockercontainers varlogpods
78
---

content/es/docs/languages/_includes/_index.md

+1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ title: # bogus for markdownlint
33
cascade:
44
build: { list: never, render: never }
55
default_lang_commit: 7811e854ba3b31c56ce681f1d60cf19e8a5c4358
6+
drifted_from_default: file not found
67
---

content/es/docs/languages/_includes/instrumentation-intro.md

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
title: # bogus for markdownlint
33
default_lang_commit: 7811e854ba3b31c56ce681f1d60cf19e8a5c4358
4+
drifted_from_default: true
45
---
56

67
[Instrumentar](/docs/concepts/instrumentation/) consiste en añadir el código de

content/es/docs/languages/_index.md

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ description:
55
lenguajes de programación populares.
66
weight: 250
77
default_lang_commit: 3815d1481fe753df10ea3dc26cbe64dba0230579
8+
drifted_from_default: true
89
---
910

1011
La [instrumentación][] de código de OpenTelemetry es compatible con los

content/es/docs/languages/python/instrumentation.md

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ aliases: [manual]
44
weight: 20
55
description: Instrumentación manual para OpenTelemetry Python
66
default_lang_commit: 9b53527853049b249f60f12a000c0d85b9e5f5dc
7+
drifted_from_default: true
78
cSpell:ignore: millis ottrace textmap
89
---
910

content/es/docs/what-is-opentelemetry.md

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ title: ¿Qué es OpenTelemetry?
33
description: Qué es y qué no es OpenTelemetry, una breve explicación
44
weight: 150
55
default_lang_commit: 13c2d415e935fac3014344e67c6c61556779fd6f
6+
drifted_from_default: true
67
cSpell:ignore: extensibilidad microservicios
78
---
89

content/fr/docs/concepts/context-propagation.md

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ title: Propagation du contexte
33
weight: 10
44
description: Présentation du concept permettant le traçage distribué.
55
default_lang_commit: 71833a5f8b84110dadf1e98604b87a900724ac33
6+
drifted_from_default: true
67
---
78

89
La propagation du contexte permet de mettre en corrélation les

content/fr/docs/concepts/signals/_index.md

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ title: Les signaux
33
description: Catégories de télémétrie supportées par OpenTelemetry
44
weight: 11
55
default_lang_commit: 71833a5f8b84110dadf1e98604b87a900724ac33
6+
drifted_from_default: true
67
---
78

89
L'objectif d'OpenTelemetry est de collecter, traiter et exporter des

content/fr/docs/what-is-opentelemetry.md

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ description:
44
Une brève explication de ce qu'est OpenTelemetry, et de ce qu'il n'est pas.
55
weight: 150
66
default_lang_commit: 71833a5f8b84110dadf1e98604b87a900724ac33
7+
drifted_from_default: true
78
---
89

910
OpenTelemetry, c'est :

content/ja/docs/collector/_index.md

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ cascade:
55
vers: 0.119.0
66
weight: 270
77
default_lang_commit: fd7da211d5bc37ca93112a494aaf6a94445e2e28
8+
drifted_from_default: true
89
---
910

1011
![Jaeger、OTLP、Prometheusを統合したOpenTelemetryコレクターのダイアグラム](img/otel-collector.svg)

content/ja/docs/concepts/glossary.md

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ title: 用語集
33
description: OpenTelemetryプロジェクトで使用されている用語に馴染みがあるものもないものもあるでしょう。
44
weight: 200
55
default_lang_commit: 21d6bf0
6+
drifted_from_default: true
67
---
78

89
OpenTelemetryプロジェクトは、あなたが馴染みのない用語を使っているかもしれません。

content/ja/docs/concepts/resources/index.md

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
title: リソース
33
weight: 70
44
default_lang_commit: 8d115a9df96c52dbbb3f96c05a843390d90a9800
5+
drifted_from_default: true
56
---
67

78
## はじめに

content/ja/docs/contributing/issues.md

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ weight: 10
55
_issues: https://github.com/open-telemetry/opentelemetry.io/issues
66
_issue: https://github.com/open-telemetry/opentelemetry.io/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc+label%3A
77
default_lang_commit: 24146bd1368e4c6082c7d6077efd29dba0d51055 # patched
8+
drifted_from_default: true
89
---
910

1011
## 既存のイシューの修正 {#fixing-an-existing-issue}

content/ja/docs/contributing/localization.md

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ description: 非英語ローカリゼーションのサイトページの作成
44
linkTitle: ローカリゼーション
55
weight: 25
66
default_lang_commit: b7e40731390448f604897ded62cff8abd3505430
7+
drifted_from_default: true
78
cSpell:ignore: shortcodes
89
---
910

content/ja/docs/contributing/pull-requests.md

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ description: GitHub UI またはローカルのフォークを利用して、新
44
aliases: [new-content]
55
weight: 15
66
default_lang_commit: 99f0ae5760038d51f9e9eb376bb428a2caca8167 # patched
7+
drifted_from_default: true
78
---
89

910
新しいドキュメントの内容を追加したり、既存のコンテンツの改善をするには、[プルリクエスト][PR] (PR)を提出してください。

content/ja/docs/demo/_index.md

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ cascade:
55
repo: https://github.com/open-telemetry/opentelemetry-demo
66
weight: 180
77
default_lang_commit: fd7da211d5bc37ca93112a494aaf6a94445e2e28
8+
drifted_from_default: true
89
cSpell:ignore: OLJCESPC
910
---
1011

content/ja/docs/demo/development.md

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
title: 開発環境
33
default_lang_commit: fd7da211d5bc37ca93112a494aaf6a94445e2e28
4+
drifted_from_default: true
45
cSpell:ignore: grpcio intellij libcurl libprotobuf nlohmann openssl protoc
56
---
67

0 commit comments

Comments
 (0)