Skip to content

Commit 8ef49a1

Browse files
committed
Merge remote-tracking branch 'origin/main' into otelbot/spec-integration-v1.55.0-dev
2 parents ee96b68 + da51d8e commit 8ef49a1

File tree

8 files changed

+1027
-2084
lines changed

8 files changed

+1027
-2084
lines changed

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,8 @@ PHP supports OpenTelemetry's experimental
108108
[Declarative Configuration](/docs/specs/otel/configuration/#declarative-configuration),
109109
where the SDK can be configured through a YAML file.
110110

111-
To enable this, set `OTEL_EXPERIMENTAL_CONFIG_FILE=/path/to/config.yaml` where
112-
`config.yaml` is a file which conforms to the declarative configuration schema,
113-
for example:
111+
To enable this, set `OTEL_CONFIG_FILE=/path/to/config.yaml` where `config.yaml`
112+
is a file which conforms to the declarative configuration schema, for example:
114113

115114
`config.yaml`:
116115

@@ -132,13 +131,13 @@ resource:
132131
133132
```shell
134133
OTEL_PHP_AUTOLOAD_ENABLED=true \
135-
OTEL_EXPERIMENTAL_CONFIG_FILE=/path/to/config.yaml
134+
OTEL_CONFIG_FILE=/path/to/config.yaml
136135
php example.php
137136
```
138137

139-
The existence of `OTEL_EXPERIMENTAL_CONFIG_FILE` will cause the autoloader to
140-
attempt to configure with the provided config file, and other environment
141-
variables will be ignored.
138+
The existence of `OTEL_CONFIG_FILE` will cause the autoloader to attempt to
139+
configure with the provided config file, and other environment variables will be
140+
ignored.
142141

143142
### Excluded URLs
144143

content/en/docs/languages/sdk-configuration/declarative-configuration.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ This approach is useful when:
1414

1515
> [!WARNING]
1616
>
17-
> Declarative configuration is experimental.
17+
> The declarative configuration schema is stable. The parts of it that are still
18+
> experimental are suffixed with `/development`. Support for declarative
19+
> configuration in various implementations is still experimental.
1820
1921
## Supported languages
2022

@@ -28,13 +30,12 @@ For details, refer to the
2830
## Getting started
2931

3032
1. Save the following configuration file as `otel-config.yaml`.
31-
2. Set the environment variable
32-
`OTEL_EXPERIMENTAL_CONFIG_FILE=/path/to/otel-config.yaml`
33+
2. Set the environment variable `OTEL_CONFIG_FILE=/path/to/otel-config.yaml`
3334

3435
Recommended configuration file:
3536

3637
```yaml
37-
file_format: '1.0-rc.1'
38+
file_format: '1.0'
3839

3940
resource:
4041
attributes_list: ${OTEL_RESOURCE_ATTRIBUTES}

content/en/docs/zero-code/java/agent/declarative-configuration.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ configuration, including the OpenTelemetry Java agent.
2020

2121
> [!WARNING]
2222
>
23-
> Declarative configuration is experimental.
23+
> The declarative configuration schema is stable. The parts of it that are still
24+
> experimental are suffixed with `/development`. Java agent support for
25+
> declarative configuration is still experimental.
2426
2527
## Supported versions
2628

data/community/members.yaml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2392,6 +2392,12 @@ approvers:
23922392
- python-approvers
23932393
html_url: https://github.com/tammy-baylis-swi
23942394
avatar_url: https://avatars.githubusercontent.com/u/96076570?v=4
2395+
- name: thompson-tomo
2396+
teams:
2397+
- ruby-contrib-approvers
2398+
- ruby-contrib-triagers
2399+
html_url: https://github.com/thompson-tomo
2400+
avatar_url: https://avatars.githubusercontent.com/u/19771933?v=4
23952401
- name: TimothyMothra
23962402
teams:
23972403
- dotnet-contrib-approvers
@@ -2689,11 +2695,6 @@ triagers:
26892695
- javascript-contrib-triagers
26902696
html_url: https://github.com/t2t2
26912697
avatar_url: https://avatars.githubusercontent.com/u/1122555?v=4
2692-
- name: thompson-tomo
2693-
teams:
2694-
- ruby-contrib-triagers
2695-
html_url: https://github.com/thompson-tomo
2696-
avatar_url: https://avatars.githubusercontent.com/u/19771933?v=4
26972698
- name: tidal
26982699
teams:
26992700
- php-triagers

data/registry/exporter-js-instana.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ createdAt: 2022-04-18
1616
package:
1717
registry: npm
1818
name: '@instana/opentelemetry-exporter'
19-
version: 5.4.1
19+
version: 5.4.2

data/registry/instrumentation-php-symfony-traceway.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ createdAt: 2026-03-13
2828
package:
2929
registry: packagist
3030
name: traceway/opentelemetry-symfony
31-
version: v1.6.0
31+
version: v1.6.1
3232
isNative: false
3333
isFirstParty: false

data/registry/tools-dotnet-purview-telemetry-sourcegenerator.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,4 @@ createdAt: 2024-04-26
5454
package:
5555
registry: nuget
5656
name: Purview.Telemetry.SourceGenerator
57-
version: 4.0.0
57+
version: 4.1.0

0 commit comments

Comments
 (0)