Skip to content

Commit

Permalink
Merge branch 'main' into opentelemetrybot/auto-update-opentelemetry-j…
Browse files Browse the repository at this point in the history
…ava-instrumentation-v2.11.0
  • Loading branch information
tiffany76 authored Dec 26, 2024
2 parents 20cd29b + 4a2a83c commit b4d54fb
Show file tree
Hide file tree
Showing 10 changed files with 135 additions and 9 deletions.
18 changes: 18 additions & 0 deletions content/en/docs/languages/php/sdk.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,14 @@ $meter = OpenTelemetry\API\Globals::meterProvider()->getMeter('name', 'version',

SDK autoloading happens as part of the composer autoloader.

### Configuration from php.ini

When providing configuration through `php.ini`, be sure to protect boolean
values by double-quoting them, eg `"true"`, `"false"` so that PHP doesn't
convert them to numbers.

`php.ini`:

### Excluded URLs

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

Configurations can be provided as environment variables, or via `php.ini` (or a
file included by `php.ini`)

{{% alert title="Boolean values in php.ini" %}} Boolean values in `php.ini`
should be protected by double-quoting them, for example `"true"` or `"false"`,
so that PHP doesn't convert them to numbers {{% /alert %}}

```ini
OTEL_PHP_AUTOLOAD_ENABLED="true"
OTEL_EXPORTER_OTLP_PROTOCOL=grpc
OTEL_EXPORTER_OTLP_ENDPOINT=http://collector:4317
```
6 changes: 6 additions & 0 deletions data/ecosystem/vendors.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,12 @@
contact:
oss: true
commercial: true
- name: Odigos
nativeOTLP: true
url: https://docs.odigos.io
contact: [email protected]
oss: true
commercial: true
- name: OneUptime
nativeOTLP: true
url: https://oneuptime.com/product/apm
Expand Down
2 changes: 1 addition & 1 deletion data/registry/instrumentation-java-finatra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ isFirstParty: false
package:
registry: maven
name: io.opentelemetry.javaagent.instrumentation/opentelemetry-javaagent-finatra-2.9
version: 2.10.0-alpha
version: 2.11.0-alpha
2 changes: 1 addition & 1 deletion data/registry/instrumentation-java-okhttp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ createdAt: 2020-11-05
package:
registry: maven
name: io.opentelemetry.instrumentation/opentelemetry-okhttp-3.0
version: 2.10.0-alpha
version: 2.11.0-alpha
isFirstParty: false
19 changes: 19 additions & 0 deletions data/registry/tools-dotnet-aspire-dashboard.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
title: Standalone .NET Aspire dashboard
registryType: utilities
language: dotnet
tags:
- dashboard
- aspire
- viewer
- browser-based
urls:
repo: https://github.com/dotnet/aspire/tree/main/src/Aspire.Dashboard
docs: https://learn.microsoft.com/en-us/dotnet/aspire/fundamentals/dashboard/standalone?tabs=bash
license: MIT
description:
The .NET Aspire Dashboard is a browser-based app to view run-time information
about your distributed application.
authors:
- name: Microsoft
url: https://github.com/microsft
createdAt: 2024-12-12
18 changes: 18 additions & 0 deletions data/registry/tools-elixir-tails.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# cSpell:ignore Aronoff
title: tails
registryType: utilities
language: elixir
tags:
- otel
- webserver
- tailing
urls:
repo: https://github.com/jaronoff97/tails
license: Apache 2.0
description:
Tails is a small webserver written in Elixir that listens on a socket and
streams live messages from a collector.
authors:
- name: Jacob Aronoff
url: https://github.com/jaronoff97
createdAt: 2024-12-12
18 changes: 18 additions & 0 deletions data/registry/tools-go-otel-desktop-viewer.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
title: otel-desktop-viewer
registryType: utilities
language: go
tags:
- otel
- desktop
- viewer
urls:
repo: https://github.com/CtrlSpice/otel-desktop-viewer
license: Apache 2.0
description:
otel-desktop-viewer is a CLI tool for receiving OpenTelemetry traces while
working on your local machine that helps you visualize and explore your trace
data without needing to send it on to a telemetry vendor.
authors:
- name: CtrlSpice
url: https://github.com/CtrlSpice
createdAt: 2024-12-12
19 changes: 19 additions & 0 deletions data/registry/tools-go-otel-tui.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# cSpell:ignore ymtdzzz
title: otel-tui
registryType: utilities
language: go
tags:
- otel
- terminal
- viewer
- tui
urls:
repo: https://github.com/ymtdzzz/otel-tui
license: Apache 2.0
description:
A terminal OpenTelemetry viewer. This tool currently supports OpenTelemetry,
Zipkin (Traces) and Prometheus (Metrics) formats.
authors:
- name: ymtdzzz
url: https://github.com/ymtdzzz
createdAt: 2024-12-12
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,11 @@
},
"dependencies": {
"@opentelemetry/api": "^1.9.0",
"@opentelemetry/auto-instrumentations-web": "^0.44.0",
"@opentelemetry/auto-instrumentations-web": "^0.45.0",
"@opentelemetry/context-zone": "^1.29.0",
"@opentelemetry/core": "^1.29.0",
"@opentelemetry/exporter-trace-otlp-http": "^0.56.0",
"@opentelemetry/instrumentation": "^0.56.0",
"@opentelemetry/exporter-trace-otlp-http": "^0.57.0",
"@opentelemetry/instrumentation": "^0.57.0",
"@opentelemetry/resources": "^1.29.0",
"@opentelemetry/sdk-trace-base": "^1.29.0",
"@opentelemetry/sdk-trace-web": "^1.29.0",
Expand Down
36 changes: 32 additions & 4 deletions static/refcache.json
Original file line number Diff line number Diff line change
Expand Up @@ -3019,6 +3019,10 @@
"StatusCode": 200,
"LastSeen": "2024-01-30T05:18:02.263475-05:00"
},
"https://docs.odigos.io": {
"StatusCode": 206,
"LastSeen": "2024-12-23T14:51:42.30807+02:00"
},
"https://docs.openfaas.com/architecture/metrics/": {
"StatusCode": 206,
"LastSeen": "2024-12-18T05:52:18.080718-05:00"
Expand Down Expand Up @@ -3975,6 +3979,14 @@
"StatusCode": 200,
"LastSeen": "2024-08-06T15:11:42.413458+02:00"
},
"https://github.com/CtrlSpice": {
"StatusCode": 206,
"LastSeen": "2024-12-12T21:04:03.332366+01:00"
},
"https://github.com/CtrlSpice/otel-desktop-viewer": {
"StatusCode": 206,
"LastSeen": "2024-12-12T21:04:02.649222+01:00"
},
"https://github.com/Cyprinus12138": {
"StatusCode": 200,
"LastSeen": "2024-03-28T22:25:37.072281206+08:00"
Expand Down Expand Up @@ -5551,6 +5563,10 @@
"StatusCode": 200,
"LastSeen": "2024-01-30T16:05:03.376611-05:00"
},
"https://github.com/jaronoff97/tails": {
"StatusCode": 206,
"LastSeen": "2024-12-12T21:09:59.474765+01:00"
},
"https://github.com/jaydeluca": {
"StatusCode": 200,
"LastSeen": "2024-08-06T15:22:00.700062+02:00"
Expand Down Expand Up @@ -6043,6 +6059,10 @@
"StatusCode": 200,
"LastSeen": "2024-08-07T15:44:51.574765+02:00"
},
"https://github.com/microsft": {
"StatusCode": 206,
"LastSeen": "2024-12-12T21:04:04.691776+01:00"
},
"https://github.com/microsoft/ApplicationInsights-Java": {
"StatusCode": 200,
"LastSeen": "2024-04-19T17:43:49.897716918Z"
Expand Down Expand Up @@ -6351,10 +6371,6 @@
"StatusCode": 200,
"LastSeen": "2024-12-16T14:23:06.692223-05:00"
},
"https://github.com/open-telemetry/community/pull/2427/": {
"StatusCode": 206,
"LastSeen": "2024-12-12T12:41:23.581154+01:00"
},
"https://github.com/open-telemetry/opamp-go": {
"StatusCode": 200,
"LastSeen": "2024-01-18T19:37:11.484137-05:00"
Expand Down Expand Up @@ -8599,6 +8615,14 @@
"StatusCode": 200,
"LastSeen": "2024-08-09T11:17:02.743197+02:00"
},
"https://github.com/ymtdzzz": {
"StatusCode": 206,
"LastSeen": "2024-12-12T21:04:04.407598+01:00"
},
"https://github.com/ymtdzzz/otel-tui": {
"StatusCode": 206,
"LastSeen": "2024-12-12T21:04:03.94903+01:00"
},
"https://github.com/yonch": {
"StatusCode": 200,
"LastSeen": "2024-08-09T11:16:31.382961+02:00"
Expand Down Expand Up @@ -9559,6 +9583,10 @@
"StatusCode": 200,
"LastSeen": "2024-01-30T15:24:54.805878-05:00"
},
"https://learn.microsoft.com/en-us/dotnet/aspire/fundamentals/dashboard/standalone": {
"StatusCode": 200,
"LastSeen": "2024-12-12T21:04:05.120038+01:00"
},
"https://learn.microsoft.com/en-us/dotnet/core/deploying/": {
"StatusCode": 200,
"LastSeen": "2024-01-30T15:25:16.669441-05:00"
Expand Down

0 comments on commit b4d54fb

Please sign in to comment.