Skip to content

Commit b4d54fb

Browse files
tiffany76tiffany76
authored
Merge branch 'main' into opentelemetrybot/auto-update-opentelemetry-java-instrumentation-v2.11.0
2 parents 20cd29b + 4a2a83c commit b4d54fb

10 files changed

+135
-9
lines changed

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

+18
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,14 @@ $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+
101109
### Excluded URLs
102110

103111
You can disable SDK autoloading if the request URL matches a regular expression.
@@ -134,3 +142,13 @@ There are also a number of PHP-specific configurations:
134142

135143
Configurations can be provided as environment variables, or via `php.ini` (or a
136144
file included by `php.ini`)
145+
146+
{{% alert title="Boolean values in php.ini" %}} Boolean values in `php.ini`
147+
should be protected by double-quoting them, for example `"true"` or `"false"`,
148+
so that PHP doesn't convert them to numbers {{% /alert %}}
149+
150+
```ini
151+
OTEL_PHP_AUTOLOAD_ENABLED="true"
152+
OTEL_EXPORTER_OTLP_PROTOCOL=grpc
153+
OTEL_EXPORTER_OTLP_ENDPOINT=http://collector:4317
154+
```

‎data/ecosystem/vendors.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,12 @@
264264
contact:
265265
oss: true
266266
commercial: true
267+
- name: Odigos
268+
nativeOTLP: true
269+
url: https://docs.odigos.io
270+
contact: [email protected]
271+
oss: true
272+
commercial: true
267273
- name: OneUptime
268274
nativeOTLP: true
269275
url: https://oneuptime.com/product/apm

‎data/registry/instrumentation-java-finatra.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ isFirstParty: false
1818
package:
1919
registry: maven
2020
name: io.opentelemetry.javaagent.instrumentation/opentelemetry-javaagent-finatra-2.9
21-
version: 2.10.0-alpha
21+
version: 2.11.0-alpha

‎data/registry/instrumentation-java-okhttp.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ createdAt: 2020-11-05
1717
package:
1818
registry: maven
1919
name: io.opentelemetry.instrumentation/opentelemetry-okhttp-3.0
20-
version: 2.10.0-alpha
20+
version: 2.11.0-alpha
2121
isFirstParty: false

‎data/registry/tools-dotnet-aspire-dashboard.yml

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
title: Standalone .NET Aspire dashboard
2+
registryType: utilities
3+
language: dotnet
4+
tags:
5+
- dashboard
6+
- aspire
7+
- viewer
8+
- browser-based
9+
urls:
10+
repo: https://github.com/dotnet/aspire/tree/main/src/Aspire.Dashboard
11+
docs: https://learn.microsoft.com/en-us/dotnet/aspire/fundamentals/dashboard/standalone?tabs=bash
12+
license: MIT
13+
description:
14+
The .NET Aspire Dashboard is a browser-based app to view run-time information
15+
about your distributed application.
16+
authors:
17+
- name: Microsoft
18+
url: https://github.com/microsft
19+
createdAt: 2024-12-12

‎data/registry/tools-elixir-tails.yml

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# cSpell:ignore Aronoff
2+
title: tails
3+
registryType: utilities
4+
language: elixir
5+
tags:
6+
- otel
7+
- webserver
8+
- tailing
9+
urls:
10+
repo: https://github.com/jaronoff97/tails
11+
license: Apache 2.0
12+
description:
13+
Tails is a small webserver written in Elixir that listens on a socket and
14+
streams live messages from a collector.
15+
authors:
16+
- name: Jacob Aronoff
17+
url: https://github.com/jaronoff97
18+
createdAt: 2024-12-12

‎data/registry/tools-go-otel-desktop-viewer.yml

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
title: otel-desktop-viewer
2+
registryType: utilities
3+
language: go
4+
tags:
5+
- otel
6+
- desktop
7+
- viewer
8+
urls:
9+
repo: https://github.com/CtrlSpice/otel-desktop-viewer
10+
license: Apache 2.0
11+
description:
12+
otel-desktop-viewer is a CLI tool for receiving OpenTelemetry traces while
13+
working on your local machine that helps you visualize and explore your trace
14+
data without needing to send it on to a telemetry vendor.
15+
authors:
16+
- name: CtrlSpice
17+
url: https://github.com/CtrlSpice
18+
createdAt: 2024-12-12

‎data/registry/tools-go-otel-tui.yml

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# cSpell:ignore ymtdzzz
2+
title: otel-tui
3+
registryType: utilities
4+
language: go
5+
tags:
6+
- otel
7+
- terminal
8+
- viewer
9+
- tui
10+
urls:
11+
repo: https://github.com/ymtdzzz/otel-tui
12+
license: Apache 2.0
13+
description:
14+
A terminal OpenTelemetry viewer. This tool currently supports OpenTelemetry,
15+
Zipkin (Traces) and Prometheus (Metrics) formats.
16+
authors:
17+
- name: ymtdzzz
18+
url: https://github.com/ymtdzzz
19+
createdAt: 2024-12-12

‎package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,11 @@
134134
},
135135
"dependencies": {
136136
"@opentelemetry/api": "^1.9.0",
137-
"@opentelemetry/auto-instrumentations-web": "^0.44.0",
137+
"@opentelemetry/auto-instrumentations-web": "^0.45.0",
138138
"@opentelemetry/context-zone": "^1.29.0",
139139
"@opentelemetry/core": "^1.29.0",
140-
"@opentelemetry/exporter-trace-otlp-http": "^0.56.0",
141-
"@opentelemetry/instrumentation": "^0.56.0",
140+
"@opentelemetry/exporter-trace-otlp-http": "^0.57.0",
141+
"@opentelemetry/instrumentation": "^0.57.0",
142142
"@opentelemetry/resources": "^1.29.0",
143143
"@opentelemetry/sdk-trace-base": "^1.29.0",
144144
"@opentelemetry/sdk-trace-web": "^1.29.0",

‎static/refcache.json

+32-4
Original file line numberDiff line numberDiff line change
@@ -3019,6 +3019,10 @@
30193019
"StatusCode": 200,
30203020
"LastSeen": "2024-01-30T05:18:02.263475-05:00"
30213021
},
3022+
"https://docs.odigos.io": {
3023+
"StatusCode": 206,
3024+
"LastSeen": "2024-12-23T14:51:42.30807+02:00"
3025+
},
30223026
"https://docs.openfaas.com/architecture/metrics/": {
30233027
"StatusCode": 206,
30243028
"LastSeen": "2024-12-18T05:52:18.080718-05:00"
@@ -3975,6 +3979,14 @@
39753979
"StatusCode": 200,
39763980
"LastSeen": "2024-08-06T15:11:42.413458+02:00"
39773981
},
3982+
"https://github.com/CtrlSpice": {
3983+
"StatusCode": 206,
3984+
"LastSeen": "2024-12-12T21:04:03.332366+01:00"
3985+
},
3986+
"https://github.com/CtrlSpice/otel-desktop-viewer": {
3987+
"StatusCode": 206,
3988+
"LastSeen": "2024-12-12T21:04:02.649222+01:00"
3989+
},
39783990
"https://github.com/Cyprinus12138": {
39793991
"StatusCode": 200,
39803992
"LastSeen": "2024-03-28T22:25:37.072281206+08:00"
@@ -5551,6 +5563,10 @@
55515563
"StatusCode": 200,
55525564
"LastSeen": "2024-01-30T16:05:03.376611-05:00"
55535565
},
5566+
"https://github.com/jaronoff97/tails": {
5567+
"StatusCode": 206,
5568+
"LastSeen": "2024-12-12T21:09:59.474765+01:00"
5569+
},
55545570
"https://github.com/jaydeluca": {
55555571
"StatusCode": 200,
55565572
"LastSeen": "2024-08-06T15:22:00.700062+02:00"
@@ -6043,6 +6059,10 @@
60436059
"StatusCode": 200,
60446060
"LastSeen": "2024-08-07T15:44:51.574765+02:00"
60456061
},
6062+
"https://github.com/microsft": {
6063+
"StatusCode": 206,
6064+
"LastSeen": "2024-12-12T21:04:04.691776+01:00"
6065+
},
60466066
"https://github.com/microsoft/ApplicationInsights-Java": {
60476067
"StatusCode": 200,
60486068
"LastSeen": "2024-04-19T17:43:49.897716918Z"
@@ -6351,10 +6371,6 @@
63516371
"StatusCode": 200,
63526372
"LastSeen": "2024-12-16T14:23:06.692223-05:00"
63536373
},
6354-
"https://github.com/open-telemetry/community/pull/2427/": {
6355-
"StatusCode": 206,
6356-
"LastSeen": "2024-12-12T12:41:23.581154+01:00"
6357-
},
63586374
"https://github.com/open-telemetry/opamp-go": {
63596375
"StatusCode": 200,
63606376
"LastSeen": "2024-01-18T19:37:11.484137-05:00"
@@ -8599,6 +8615,14 @@
85998615
"StatusCode": 200,
86008616
"LastSeen": "2024-08-09T11:17:02.743197+02:00"
86018617
},
8618+
"https://github.com/ymtdzzz": {
8619+
"StatusCode": 206,
8620+
"LastSeen": "2024-12-12T21:04:04.407598+01:00"
8621+
},
8622+
"https://github.com/ymtdzzz/otel-tui": {
8623+
"StatusCode": 206,
8624+
"LastSeen": "2024-12-12T21:04:03.94903+01:00"
8625+
},
86028626
"https://github.com/yonch": {
86038627
"StatusCode": 200,
86048628
"LastSeen": "2024-08-09T11:16:31.382961+02:00"
@@ -9559,6 +9583,10 @@
95599583
"StatusCode": 200,
95609584
"LastSeen": "2024-01-30T15:24:54.805878-05:00"
95619585
},
9586+
"https://learn.microsoft.com/en-us/dotnet/aspire/fundamentals/dashboard/standalone": {
9587+
"StatusCode": 200,
9588+
"LastSeen": "2024-12-12T21:04:05.120038+01:00"
9589+
},
95629590
"https://learn.microsoft.com/en-us/dotnet/core/deploying/": {
95639591
"StatusCode": 200,
95649592
"LastSeen": "2024-01-30T15:25:16.669441-05:00"

0 commit comments

Comments
 (0)