Skip to content

Commit 77e2fac

Browse files
authored
Merge branch 'main' into main
2 parents f098c0c + 7c9dfa1 commit 77e2fac

File tree

14 files changed

+232
-52
lines changed

14 files changed

+232
-52
lines changed

.textlintrc.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,9 @@ rules:
146146
# - Compound names: go.opentelemetry.io
147147
# - Paths: medium.com/opentelemetry
148148
# - Repo names: opentelemetry-cpp or ocaml-opentelemetry
149+
# - Repo names: open-telemetry/opentelemetry-cpp
149150
# - Slack or social media anchors: #opentelemetry or @opentelemetry
150-
- '(?<![-#@./])\bopen[- ]?telemetry\b(?![.-])'
151+
- '(?<![-#@./])\bopen[- ]?telemetry\b(?![-./])'
151152
- OpenTelemetry
152153
- [os x, macOS]
153154
- [postgres, PostgreSQL]
@@ -159,6 +160,8 @@ rules:
159160
- ['screen[- ]shot(s)?', screenshot$1]
160161
- ['time[- ]stamp(s)?', timestamp$1]
161162
- ["uid['’]?(s)?", UID$1]
163+
- ['(walk)-(throughs?)', $1$2] # cSpell:disable-line
164+
- ['(work)-(arounds?)', $1$2]
162165
# Enable the following to find and replace "instrumentation module/package" with "instrumentation library":
163166
# - ["(auto(matic)?[- ])?instrumentation (module|package)", "instrumentation library"]
164167
# - ["(auto(matic)?[- ])?instrumentation (modules|packages)", "instrumentation libraries"]

content/en/blog/2023/end-user-discussions-01.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ Please also check out
196196
**A:** Implementing correlation takes time and is a work in progress.
197197
Correlation work is more mature for some languages (e.g. Java, Go) than for
198198
others. The best approach is to raise this issue in one of the language-specific
199-
repositories that pertains to your situation. A possible work-around is to start
199+
repositories that pertains to your situation. A possible workaround is to start
200200
traces at the log level, whereby every log will have its own associated trace.
201201

202202
#### 3- Profiling

content/en/blog/2025/go-goals.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: >-
66
[Tyler Yahn](https://github.com/MrAlias) (Splunk)
77
sig: SIG Go
88
# prettier-ignore
9-
cSpell:ignore: Yahn dashpole pellared otelhttp dmathieu otelhttp codeboten otellogr otellogrus otelslog otelzap otelzerolog
9+
cSpell:ignore: codeboten dashpole dmathieu otelhttp otellogr otellogrus otelslog otelzap otelzerolog pellared Yahn
1010
---
1111

1212
As we kick off 2025, the

content/en/docs/collector/building/connector/index.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ data, it is necessary to convert the trace data from the processor in the traces
4343
pipeline and send it to the metrics pipeline. Historically, some processors
4444
transmitted data by making use of a workaround that follows a bad practice where
4545
a processor directly exports data after processing. The connector component
46-
solves the need for this work-around and the processors that used the work
47-
around have been deprecated. On the same line, above mentioned processors are
48-
also now deprecated in recent releases and are replaced by the connectors.
46+
solves the need for this workaround and the processors that used the workaround
47+
have been deprecated. On the same line, above mentioned processors are also now
48+
deprecated in recent releases and are replaced by the connectors.
4949

5050
Additional details about the connector's full capabilities can be found at the
5151
following links:

content/en/docs/languages/php/context.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ like asynchronous or concurrent execution with `fibers`.
2525

2626
## Context keys
2727

28-
Values as stored in context as key-value pairs. Context keys are used to store
28+
Values are stored in context as key-value pairs. Context keys are used to store
2929
and retrieve values from context.
3030

3131
Keys can be created by calling `OpenTelemetry\Context\Context::createKey()`, for

content/en/docs/languages/php/instrumentation.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ encouraged, attribute `service.version`, which holds the version of the service
262262
API or implementation.
263263

264264
Alternative methods exist for setting up resource attributes. For more
265-
information, see [Resources](/docs/languages/js/resources/).
265+
information, see [Resources](/docs/languages/php/resources/).
266266

267267
#### Global Providers
268268

content/en/docs/languages/php/sdk.md

-8
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,6 @@ $meter = OpenTelemetry\API\Globals::meterProvider()->getMeter('name', 'version',
9898

9999
SDK autoloading happens as part of the composer autoloader.
100100

101-
### Configuration from php.ini
102-
103-
When providing configuration through `php.ini`, be sure to protect boolean
104-
values by double-quoting them, eg `"true"`, `"false"` so that PHP doesn't
105-
convert them to numbers.
106-
107-
`php.ini`:
108-
109101
### Excluded URLs
110102

111103
You can disable SDK autoloading if the request URL matches a regular expression.

content/en/docs/zero-code/php.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ Append the following to `php.ini`, or another `ini` file that will be processed
164164
by PHP:
165165

166166
```ini
167-
OTEL_PHP_AUTOLOAD_ENABLED=true
167+
OTEL_PHP_AUTOLOAD_ENABLED="true"
168168
OTEL_SERVICE_NAME=your-service-name
169169
OTEL_TRACES_EXPORTER=otlp
170170
OTEL_EXPORTER_OTLP_PROTOCOL=grpc
@@ -208,7 +208,7 @@ trace the execution of that code.
208208
```php
209209
<?php
210210

211-
use OpenTelemetry\API\Common\Instrumentation\CachedInstrumentation;
211+
use OpenTelemetry\API\Instrumentation\CachedInstrumentation;
212212
use OpenTelemetry\API\Trace\Span;
213213
use OpenTelemetry\API\Trace\StatusCode;
214214
use OpenTelemetry\Context\Context;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
---
2+
title: Propagation du contexte
3+
weight: 10
4+
description: Présentation du concept permettant le traçage distribué.
5+
default_lang_commit: 71833a5f8b84110dadf1e98604b87a900724ac33
6+
---
7+
8+
La propagation du contexte permet de mettre en corrélation les
9+
[signaux](../signals), quelle que soit leur origine. Bien qu'elle ne soit pas
10+
limitée au traçage, la propagation du contexte permet aux
11+
[traces](../signals/traces) de créer des informations de causalité sur un
12+
système, même lorsque les services sont distribués de façon arbitraire à travers
13+
des limites de processus et de réseau.
14+
15+
Pour comprendre la propagation du contexte, vous devez maîtriser deux concepts
16+
distincts : le contexte et la propagation.
17+
18+
## Contexte {#context}
19+
20+
Le contexte est un objet contenant les informations nécessaires pour que le
21+
service émetteur et le service récepteur, ou
22+
[unité d'exécution](/docs/specs/otel/glossary/#execution-unit), puissent mettre
23+
en corrélation un signal avec un autre.
24+
25+
Prenons l'exemple d'un service A qui appelle un service B. Un span du service A,
26+
dont l'ID est inclus dans le contexte, sera utilisé comme span parent pour le
27+
prochain span créé par le service B. De plus, l'ID de trace inclus dans le
28+
contexte sera également utilisé pour le prochain span créé dans le service B, ce
29+
qui signifie que ce span fera partie de la même trace que le span du service A.
30+
31+
## Propagation {#propagation}
32+
33+
La propagation est le mécanisme permettant de transmettre le contexte entre
34+
services et processus. Elle sérialise et désérialise le contexte et fournit les
35+
informations nécessaires d'un service à l'autre.
36+
37+
La propagation étant généralement gérée automatiquement par les librairies
38+
d'instrumentation, le mécanisme est transparent pour l'utilisateur. Si pour une
39+
raison ou une autre, vous souhaitez propager le contexte manuellement, vous
40+
pouvez utiliser
41+
l'[API des propagateurs](/docs/specs/otel/context/api-propagators/).
42+
43+
Plusieurs propagateurs officiels sont maintenus par OpenTelemetry. Le
44+
propagateur par défaut utilise les en-têtes définies par la spécification
45+
[W3C TraceContext](https://www.w3.org/TR/trace-context/).
46+
47+
## Spécification {#specification}
48+
49+
Pour plus d'informations, consultez la page
50+
[Spécification du contexte](/docs/specs/otel/context/).

data/community/members.yaml

+66-6
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ technical-committee:
100100
maintainers:
101101
- name: aabmass
102102
teams:
103+
- javascript-contrib-triagers
103104
- opentelemetry-python-contrib-approvers
104105
- opentelemetry-python-contrib-maintainers
105106
- python-approvers
@@ -749,6 +750,7 @@ maintainers:
749750
- name: martinkuba
750751
teams:
751752
- javascript-approvers
753+
- javascript-contrib-triagers
752754
- javascript-triagers
753755
- sandbox-web-js-maintainers
754756
- semconv-event-approvers
@@ -758,6 +760,7 @@ maintainers:
758760
teams:
759761
- docs-pt-approvers
760762
- javascript-approvers
763+
- javascript-contrib-triagers
761764
- javascript-triagers
762765
- semconv-db-approvers
763766
- sig-contributor-experience-approvers
@@ -766,6 +769,7 @@ maintainers:
766769
avatar_url: https://avatars.githubusercontent.com/u/1017486?v=4
767770
- name: MikeGoldsmith
768771
teams:
772+
- javascript-contrib-triagers
769773
- proto-go-approvers
770774
- proto-go-maintainers
771775
html_url: https://github.com/MikeGoldsmith
@@ -1244,6 +1248,12 @@ maintainers:
12441248
html_url: https://github.com/zacharycmontoya
12451249
avatar_url: https://avatars.githubusercontent.com/u/13769665?v=4
12461250
approvers:
1251+
- name: 123liuziming
1252+
teams:
1253+
- go-compile-instrumentation-approvers
1254+
- go-compile-instrumentation-triagers
1255+
html_url: https://github.com/123liuziming
1256+
avatar_url: https://avatars.githubusercontent.com/u/32130965?v=4
12471257
- name: adrielp
12481258
teams:
12491259
- semconv-cicd-approvers
@@ -1374,6 +1384,7 @@ approvers:
13741384
- name: david-luna
13751385
teams:
13761386
- javascript-approvers
1387+
- javascript-contrib-triagers
13771388
- javascript-triagers
13781389
html_url: https://github.com/david-luna
13791390
avatar_url: https://avatars.githubusercontent.com/u/999029?v=4
@@ -1448,6 +1459,7 @@ approvers:
14481459
- name: hectorhdzg
14491460
teams:
14501461
- javascript-approvers
1462+
- javascript-contrib-triagers
14511463
- javascript-triagers
14521464
html_url: https://github.com/hectorhdzg
14531465
avatar_url: https://avatars.githubusercontent.com/u/39923391?v=4
@@ -1602,6 +1614,7 @@ approvers:
16021614
- name: naseemkullah
16031615
teams:
16041616
- javascript-approvers
1617+
- javascript-contrib-triagers
16051618
- javascript-triagers
16061619
html_url: https://github.com/naseemkullah
16071620
avatar_url: https://avatars.githubusercontent.com/u/24660299?v=4
@@ -1632,6 +1645,7 @@ approvers:
16321645
- name: pkanal
16331646
teams:
16341647
- javascript-approvers
1648+
- javascript-contrib-triagers
16351649
- javascript-triagers
16361650
html_url: https://github.com/pkanal
16371651
avatar_url: https://avatars.githubusercontent.com/u/8810222?v=4
@@ -1664,6 +1678,12 @@ approvers:
16641678
- semconv-system-approvers
16651679
html_url: https://github.com/rogercoll
16661680
avatar_url: https://avatars.githubusercontent.com/u/33873530?v=4
1681+
- name: RomainMuller
1682+
teams:
1683+
- go-compile-instrumentation-approvers
1684+
- go-compile-instrumentation-triagers
1685+
html_url: https://github.com/RomainMuller
1686+
avatar_url: https://avatars.githubusercontent.com/u/411689?v=4
16671687
- name: samiura
16681688
teams:
16691689
- network-approvers
@@ -1683,6 +1703,7 @@ approvers:
16831703
- name: seemk
16841704
teams:
16851705
- cpp-contrib-approvers
1706+
- javascript-contrib-triagers
16861707
html_url: https://github.com/seemk
16871708
avatar_url: https://avatars.githubusercontent.com/u/5329631?v=4
16881709
- name: SergeyKanzhelev
@@ -1846,6 +1867,11 @@ triagers:
18461867
- collector-contrib-triagers
18471868
html_url: https://github.com/jamesmoessis
18481869
avatar_url: https://avatars.githubusercontent.com/u/33504860?v=4
1870+
- name: jj22ee
1871+
teams:
1872+
- javascript-contrib-triagers
1873+
html_url: https://github.com/jj22ee
1874+
avatar_url: https://avatars.githubusercontent.com/u/107072447?v=4
18491875
- name: jodeev
18501876
teams:
18511877
- php-triagers
@@ -1861,6 +1887,11 @@ triagers:
18611887
- java-contrib-triagers
18621888
html_url: https://github.com/kenfinnigan
18631889
avatar_url: https://avatars.githubusercontent.com/u/441240?v=4
1890+
- name: kirrg001
1891+
teams:
1892+
- javascript-contrib-triagers
1893+
html_url: https://github.com/kirrg001
1894+
avatar_url: https://avatars.githubusercontent.com/u/1160712?v=4
18641895
- name: kittylyst
18651896
teams:
18661897
- java-contrib-triagers
@@ -1872,11 +1903,26 @@ triagers:
18721903
- dotnet-triagers
18731904
html_url: https://github.com/martinjt
18741905
avatar_url: https://avatars.githubusercontent.com/u/1699587?v=4
1906+
- name: mhennoch
1907+
teams:
1908+
- javascript-contrib-triagers
1909+
html_url: https://github.com/mhennoch
1910+
avatar_url: https://avatars.githubusercontent.com/u/72463136?v=4
1911+
- name: mottibec
1912+
teams:
1913+
- javascript-contrib-triagers
1914+
html_url: https://github.com/mottibec
1915+
avatar_url: https://avatars.githubusercontent.com/u/25174561?v=4
18751916
- name: Mrod1598
18761917
teams:
18771918
- java-contrib-triagers
18781919
html_url: https://github.com/Mrod1598
18791920
avatar_url: https://avatars.githubusercontent.com/u/14144136?v=4
1921+
- name: obecny
1922+
teams:
1923+
- javascript-contrib-triagers
1924+
html_url: https://github.com/obecny
1925+
avatar_url: https://avatars.githubusercontent.com/u/1250998?v=4
18801926
- name: oertl
18811927
teams:
18821928
- java-contrib-triagers
@@ -1887,6 +1933,11 @@ triagers:
18871933
- java-contrib-triagers
18881934
html_url: https://github.com/PeterF778
18891935
avatar_url: https://avatars.githubusercontent.com/u/91101705?v=4
1936+
- name: punya
1937+
teams:
1938+
- javascript-contrib-triagers
1939+
html_url: https://github.com/punya
1940+
avatar_url: https://avatars.githubusercontent.com/u/277514?v=4
18901941
- name: robsunday
18911942
teams:
18921943
- java-contrib-triagers
@@ -1902,12 +1953,27 @@ triagers:
19021953
- java-instrumentation-triagers
19031954
html_url: https://github.com/SylvainJuge
19041955
avatar_url: https://avatars.githubusercontent.com/u/763082?v=4
1956+
- name: t2t2
1957+
teams:
1958+
- javascript-contrib-triagers
1959+
html_url: https://github.com/t2t2
1960+
avatar_url: https://avatars.githubusercontent.com/u/1122555?v=4
19051961
- name: TimothyMothra
19061962
teams:
19071963
- dotnet-contrib-triagers
19081964
- dotnet-triagers
19091965
html_url: https://github.com/TimothyMothra
19101966
avatar_url: https://avatars.githubusercontent.com/u/28785781?v=4
1967+
- name: trivikr
1968+
teams:
1969+
- javascript-contrib-triagers
1970+
html_url: https://github.com/trivikr
1971+
avatar_url: https://avatars.githubusercontent.com/u/16024985?v=4
1972+
- name: Ugzuzg
1973+
teams:
1974+
- javascript-contrib-triagers
1975+
html_url: https://github.com/Ugzuzg
1976+
avatar_url: https://avatars.githubusercontent.com/u/1078004?v=4
19111977
- name: VihasMakwana
19121978
teams:
19131979
- collector-contrib-triagers
@@ -2215,9 +2281,6 @@ members:
22152281
- name: nilebox
22162282
html_url: https://github.com/nilebox
22172283
avatar_url: https://avatars.githubusercontent.com/u/6176360?v=4
2218-
- name: obecny
2219-
html_url: https://github.com/obecny
2220-
avatar_url: https://avatars.githubusercontent.com/u/1250998?v=4
22212284
- name: odeke-em
22222285
html_url: https://github.com/odeke-em
22232286
avatar_url: https://avatars.githubusercontent.com/u/4898263?v=4
@@ -2251,9 +2314,6 @@ members:
22512314
- name: ppittle
22522315
html_url: https://github.com/ppittle
22532316
avatar_url: https://avatars.githubusercontent.com/u/1190907?v=4
2254-
- name: punya
2255-
html_url: https://github.com/punya
2256-
avatar_url: https://avatars.githubusercontent.com/u/277514?v=4
22572317
- name: rauno56
22582318
html_url: https://github.com/rauno56
22592319
avatar_url: https://avatars.githubusercontent.com/u/1334536?v=4

data/registry/exporter-dotnet-inmemory.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ createdAt: 2022-11-07
1717
package:
1818
registry: nuget
1919
name: OpenTelemetry.Exporter.InMemory
20-
version: 1.11.0
20+
version: 1.11.1

data/registry/instrumentation-go-cloudwego.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ isFirstParty: true
2222
package:
2323
registry: go
2424
name: github.com/hertz-contrib/obs-opentelemetry
25-
version: v0.3.0
25+
version: v0.3.1

0 commit comments

Comments
 (0)