Skip to content

Commit 5bd1356

Browse files
authored
Merge branch 'main' into java-otel-endpoint
2 parents b66af21 + 830397b commit 5bd1356

File tree

51 files changed

+138
-65
lines changed

Some content is hidden

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

51 files changed

+138
-65
lines changed

.github/workflows/scripts/update-registry-versions.sh

+20-10
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,11 @@ for yaml_file in ${FILES}; do
8282
echo "${yaml_file}: Package name and/or registry are missing in the YAML file."
8383
else
8484
# Get latest version
85-
latest_version=$(get_latest_version "$name" "$registry")
85+
latest_version=$(get_latest_version "$name" "$registry" || echo "Could not fetch version.")
8686

87-
if [ "$latest_version" == "Registry not supported." ]; then
87+
if [ "$latest_version" == "Could not fetch version." ]; then
88+
echo "${yaml_file} ($registry): Registry not supported.";
89+
elif [ "$latest_version" == "Registry not supported." ]; then
8890
echo "${yaml_file} ($registry): Registry not supported.";
8991
elif [ -z "$latest_version" ]; then
9092
echo "${yaml_file} ($registry): Could not get latest version from registry."
@@ -118,14 +120,22 @@ if [ "$existing_pr_count" -gt 0 ]; then
118120
exit 0
119121
fi
120122

121-
$NPM run fix:format
123+
if [[ -n $(git status --porcelain) ]]; then
124+
echo "Versions have been updated, formatting and pushing changes."
125+
126+
$NPM run fix:format
127+
128+
$GIT checkout -b "$branch"
129+
$GIT commit -a -m "$message"
130+
$GIT push --set-upstream origin "$branch"
122131

123-
$GIT checkout -b "$branch"
124-
$GIT commit -a -m "$message"
125-
$GIT push --set-upstream origin "$branch"
132+
body_file=$(mktemp)
133+
echo -en "${body}" >> "${body_file}"
126134

127-
body_file=$(mktemp)
128-
echo -en "${body}" >> "${body_file}"
135+
echo "Submitting auto-update PR '$message'."
136+
$GH pr create --title "$message" --body-file "${body_file}"
129137

130-
echo "Submitting auto-update PR '$message'."
131-
$GH pr create --title "$message" --body-file "${body_file}"
138+
else
139+
echo "No changes detected."
140+
exit 0
141+
fi

content/en/blog/2024/scaling-collectors.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ Create a file named `deploy-opentelemetry.yml` in the same directory as your
8989
tasks:
9090
- name: Install OpenTelemetry Collector
9191
ansible.builtin.include_role:
92-
name: opentelemetry_collectorr
92+
name: opentelemetry_collector
9393
vars:
9494
otel_collector_receivers:
9595
hostmetrics:

content/en/docs/collector/building/receiver.md

+7-8
Original file line numberDiff line numberDiff line change
@@ -500,8 +500,8 @@ and it requires the following parameters:
500500
`receiver.Traces` instance and it requires the following parameters:
501501
- `context.Context`: the reference to the Collector's `context.Context` so your
502502
trace receiver can properly manage its execution context.
503-
- `receiver.CreateSettings`: the reference to some of the Collector's settings
504-
under which your receiver is created.
503+
- `receiver.Settings`: the reference to some of the Collector's settings under
504+
which your receiver is created.
505505
- `component.Config`: the reference for the receiver config settings passed by
506506
the Collector to the factory so it can properly read its settings from the
507507
Collector config.
@@ -514,7 +514,7 @@ Start by adding the bootstrap code to properly implement the
514514
code to your `factory.go` file:
515515

516516
```go
517-
func createTracesReceiver(_ context.Context, params receiver.CreateSettings, baseCfg component.Config, consumer consumer.Traces) (receiver.Traces, error) {
517+
func createTracesReceiver(_ context.Context, params receiver.Settings, baseCfg component.Config, consumer consumer.Traces) (receiver.Traces, error) {
518518
return nil, nil
519519
}
520520
```
@@ -564,7 +564,7 @@ func createDefaultConfig() component.Config {
564564
}
565565
}
566566

567-
func createTracesReceiver(_ context.Context, params receiver.CreateSettings, baseCfg component.Config, consumer consumer.Traces) (receiver.Traces, error) {
567+
func createTracesReceiver(_ context.Context, params receiver.Settings, baseCfg component.Config, consumer consumer.Traces) (receiver.Traces, error) {
568568
return nil, nil
569569
}
570570

@@ -775,8 +775,7 @@ as part of the `createTracesReceiver()` function parameters that your receiver
775775
actually requires to work properly like its configuration settings
776776
(`component.Config`), the next `Consumer` in the pipeline that will consume the
777777
generated traces (`consumer.Traces`) and the Collector's logger so the
778-
`tailtracer` receiver can add meaningful events to it
779-
(`receiver.CreateSettings`).
778+
`tailtracer` receiver can add meaningful events to it (`receiver.Settings`).
780779

781780
Given that all this information will only be made available to the receiver at
782781
the moment it's instantiated by the factory, the `tailtracerReceiver` type will
@@ -910,7 +909,7 @@ func createDefaultConfig() component.Config {
910909
}
911910
}
912911

913-
func createTracesReceiver(_ context.Context, params receiver.CreateSettings, baseCfg component.Config, consumer consumer.Traces) (receiver.Traces, error) {
912+
func createTracesReceiver(_ context.Context, params receiver.Settings, baseCfg component.Config, consumer consumer.Traces) (receiver.Traces, error) {
914913

915914
logger := params.Logger
916915
tailtracerCfg := baseCfg.(*Config)
@@ -937,7 +936,7 @@ func NewFactory() receiver.Factory {
937936

938937
- Added a variable called `logger` and initialized it with the Collector's
939938
logger that is available as a field named `Logger` within the
940-
`receiver.CreateSettings` reference.
939+
`receiver.Settings` reference.
941940
- Added a variable called `tailtracerCfg` and initialized it by casting the
942941
`component.Config` reference to the `tailtracer` receiver `Config`.
943942
- Added a variable called `traceRcvr` and initialized it with the

content/en/docs/collector/internal-telemetry.md

+24-2
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,21 @@ journalctl | grep otelcol | grep Error
104104

105105
{{% /tab %}} {{< /tabpane >}}
106106

107+
The following configuration can be used to emit internal logs from the Collector
108+
to an OTLP/gRPC backend:
109+
110+
```yaml
111+
service:
112+
telemetry:
113+
logs:
114+
processors:
115+
- batch:
116+
exporter:
117+
otlp:
118+
protocol: grpc/protobuf
119+
endpoint: https://backend:4317
120+
```
121+
107122
### Configure internal traces
108123

109124
The Collector does not expose traces by default, but it can be configured to.
@@ -141,8 +156,8 @@ Note that the `tracer_provider` section there corresponds to `traces` here.
141156
The Collector can be configured to push its own telemetry to an
142157
[OTLP receiver](https://github.com/open-telemetry/opentelemetry-collector/tree/main/receiver/otlpreceiver)
143158
and send the data through configured pipelines. In the following example, the
144-
Collector is configured to push metrics and traces every 10s using OTLP gRPC to
145-
`localhost:14317`:
159+
Collector is configured to push metrics, traces, and logs every 10s using OTLP
160+
gRPC to `localhost:14317`:
146161

147162
```yaml
148163
receivers:
@@ -176,6 +191,13 @@ service:
176191
otlp:
177192
protocol: grpc/protobuf
178193
endpoint: http://localhost:14317
194+
logs:
195+
processors:
196+
- batch:
197+
exporter:
198+
otlp:
199+
protocol: grpc/protobuf
200+
endpoint: http://localhost:14317
179201
```
180202

181203
{{% alert title="Caution" color="warning" %}}

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

+7-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,13 @@ cSpell:ignore: mbstring opcache
1717

1818
## Requirements
1919

20-
OpenTelemetry for PHP requires a minimum PHP version of 7.4, and
21-
auto-instrumentation requires version 8.0+.
20+
OpenTelemetry SDK for PHP aims to support all officially supported PHP versions
21+
according to
22+
[www.php.net/supported-versions](https://www.php.net/supported-versions.php),
23+
and support will be dropped for PHP versions within 12 months of that version
24+
going End of Life.
25+
26+
Auto-instrumentation requires PHP version 8.0+.
2227

2328
### Dependencies
2429

content/ja/docs/concepts/signals/metrics.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: メトリクス
33
weight: 2
44
description: 実行時に取得された測定値
5-
default_lang_commit: 9b5e318
5+
default_lang_commit: eb19d1dd5ab2f66343ec76adbfb31f81024da3a1
66
---
77

88
**メトリクス**とは、実行時に取得されるサービスの**測定値**のことです。
@@ -53,6 +53,8 @@ OpenTelemetryでは、計測は **メトリクス計装** によって行われ
5353
- **Asynchronous UpDownCounter(非同期アップダウンカウンター)**: **アップダウンカウンター**と同じですが、各エクスポートに対して一度だけ収集されます。
5454
連続的な変更にアクセスできず、集約された値(たとえば、現在のキューのサイズ)のみにアクセスできる場合に使用できます。
5555
- **Gauge(ゲージ)**: 読み取った時点での現在の値を測定します。たとえば、自動車の燃料計など。ゲージは非同期です。
56+
- **Asynchronous Gauge(非同期ゲージ)**: **ゲージ**と同じですが、各エクスポートに対して一度だけ収集されます。
57+
連続的な変更にアクセスできず、集約された値 のみにアクセスできる場合に使用できます。
5658
- **Histogram(ヒストグラム)**: リクエストのレイテンシーなどの値をクライアント側で集約したもの。
5759
値の統計に興味がある場合は、ヒストグラムが良いでしょう。
5860
たとえば、どれくらいのリクエストが1秒未満か、といった疑問に答えてくれます。

content/pt/docs/concepts/signals/metrics.md

+4-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Métricas
33
weight: 2
44
description: Uma medição capturada em tempo de execução.
5-
default_lang_commit: 3446c7ce49a17975b012c302bdd1c89d4902267c
5+
default_lang_commit: eb19d1dd5ab2f66343ec76adbfb31f81024da3a1
66
---
77

88
Uma métrica é uma medição de um serviço capturada em tempo de execução. O
@@ -72,6 +72,9 @@ O tipo de instrumento deve ser um dos seguintes:
7272
tamanho da fila).
7373
- **Gauge**: Mede o valor atual no momento da leitura. Um exemplo seria um
7474
medidor de tanque de combustível de um veículo. Gauges são assíncronos.
75+
- **Asynchronous Gauge**: Assim como o **Gauge**, porém é coletado uma vez a
76+
cada exportação. Pode ser usado em casos onde você não tenha acesso às
77+
mudanças contínuas, mas apenas ao valor agregado.
7578
- **Histogram**: Uma agregação de valores, tal como latências de requisições. Um
7679
histograma é uma boa escolha se você está interessado em valores de
7780
estatísticas. Por exemplo: Quantas requisições estão levando menos de 1s?

data/instrumentation.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ rust:
6161
name: Rust
6262
status:
6363
traces: beta
64-
metrics: alpha
65-
logs: alpha
64+
metrics: beta
65+
logs: beta
6666
swift:
6767
name: Swift
6868
status:

data/registry/collector-exporter-doris.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ createdAt: 2024-11-18
1818
package:
1919
registry: go-collector
2020
name: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/dorisexporter
21-
version: v0.113.0
21+
version: v0.114.0

data/registry/collector-extension-healthcheckv2.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ createdAt: 2024-11-18
1818
package:
1919
registry: go-collector
2020
name: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckv2extension
21-
version: v0.113.0
21+
version: v0.114.0

data/registry/collector-processor-coralogix.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ createdAt: 2024-11-18
1818
package:
1919
registry: go-collector
2020
name: github.com/open-telemetry/opentelemetry-collector-contrib/processor/coralogixprocessor
21-
version: v0.113.0
21+
version: v0.114.0

data/registry/collector-processor-logdedup.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ createdAt: 2024-11-18
1919
package:
2020
registry: go-collector
2121
name: github.com/open-telemetry/opentelemetry-collector-contrib/processor/logdedupprocessor
22-
version: v0.113.0
22+
version: v0.114.0

data/registry/collector-receiver-github.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ createdAt: 2024-11-18
1919
package:
2020
registry: go-collector
2121
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/githubreceiver
22-
version: v0.108.0
22+
version: v0.114.0

data/registry/collector-receiver-googlecloudmonitoring.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ createdAt: 2024-11-18
1919
package:
2020
registry: go-collector
2121
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudmonitoringreceiver
22-
version: v0.113.0
22+
version: v0.114.0

data/registry/collector-receiver-ntp.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ createdAt: 2024-11-18
1717
package:
1818
registry: go-collector
1919
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/ntpreceiver
20-
version: v0.113.0
20+
version: v0.114.0

data/registry/collector-receiver-prometheusremotewrite.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ createdAt: 2024-11-18
1616
package:
1717
registry: go-collector
1818
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusremotewritereceiver
19-
version: v0.113.0
19+
version: v0.114.0

data/registry/collector-receiver-systemd.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ createdAt: 2024-11-18
1616
package:
1717
registry: go-collector
1818
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/systemdreceiver
19-
version: v0.113.0
19+
version: v0.114.0

data/registry/collector-receiver-tlscheck.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ createdAt: 2024-11-18
1616
package:
1717
registry: go-collector
1818
name: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/tlscheckreceiver
19-
version: v0.113.0
19+
version: v0.114.0

data/registry/exporter-js-instana.yml

+1-1
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: 4.0.1
19+
version: 4.2.0

data/registry/instrumentation-dotnet-aws.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ isFirstParty: false
2020
package:
2121
registry: nuget
2222
name: OpenTelemetry.Instrumentation.AWS
23-
version: 1.1.0-beta.6
23+
version: 1.10.0-beta.1

data/registry/instrumentation-dotnet-awslambda.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ isFirstParty: false
1919
package:
2020
registry: nuget
2121
name: OpenTelemetry.Instrumentation.AWSLambda
22-
version: 1.3.0-beta.1
22+
version: 1.10.0-beta.1

data/registry/instrumentation-dotnet-http.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ isFirstParty: false
1919
package:
2020
registry: nuget
2121
name: OpenTelemetry.Instrumentation.Http
22-
version: 1.9.0
22+
version: 1.10.0

data/registry/instrumentation-dotnet-instrumentation-aws.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ isFirstParty: false
1616
package:
1717
registry: nuget
1818
name: OpenTelemetry.Instrumentation.AWS
19-
version: 1.1.0-beta.6
19+
version: 1.10.0-beta.1

data/registry/instrumentation-erlang-bandit.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ isFirstParty: false
1818
package:
1919
registry: hex
2020
name: opentelemetry_bandit
21-
version: 0.2.0-rc.2
21+
version: 0.2.0

data/registry/instrumentation-erlang-broadway.yml

+1
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ createdAt: 2024-11-18
1717
package:
1818
registry: hex
1919
name: opentelemetry_broadway
20+
version: 0.2.0

data/registry/instrumentation-erlang-xandra.yml

+1
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,4 @@ createdAt: 2024-11-18
1919
package:
2020
registry: hex
2121
name: opentelemetry_xandra
22+
version: 0.2.0

data/registry/instrumentation-go-gorm.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ isFirstParty: true
1818
package:
1919
registry: go
2020
name: gorm.io/plugin/opentelemetry
21-
version: v0.1.8
21+
version: v0.1.10

data/registry/instrumentation-java-http4k.yml

+1
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,4 @@ isFirstParty: true
1919
package:
2020
registry: maven
2121
name: org.http4k/http4k-opentelemetry
22+
version: 5.37.1.1

data/registry/instrumentation-js-cerbos.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ createdAt: 2023-09-13
2121
package:
2222
name: '@cerbos/opentelemetry'
2323
registry: npm
24-
version: 0.5.4
24+
version: 0.5.5
2525
isFirstParty: true

data/registry/instrumentation-js-langchain.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ createdAt: 2024-06-05
1818
package:
1919
registry: npm
2020
name: '@arizeai/openinference-instrumentation-langchain'
21-
version: 1.0.1
21+
version: 1.0.2
2222
isFirstParty: false

data/registry/instrumentation-js-openai.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ createdAt: 2024-06-05
1818
package:
1919
registry: npm
2020
name: '@arizeai/openinference-instrumentation-openai'
21-
version: 1.1.0
21+
version: 1.1.1
2222
isFirstParty: false

data/registry/instrumentation-js-prisma.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ createdAt: 2022-08-25
1717
package:
1818
registry: npm
1919
name: '@prisma/instrumentation'
20-
version: 5.22.0
20+
version: 6.0.1
2121
isFirstParty: true

data/registry/instrumentation-php-cakephp.yml

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# cSpell:ignore cakephp
12
title: OpenTelemetry CakePHP instrumentation library
23
registryType: instrumentation
34
language: php
@@ -14,4 +15,8 @@ description:
1415
authors:
1516
- name: OpenTelemetry Authors
1617
createdAt: 2024-07-08
18+
package:
19+
registry: packagist
20+
name: open-telemetry/opentelemetry-auto-cakephp
21+
version: 0.0.3
1722
isFirstParty: false

data/registry/instrumentation-php-curl.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ authors:
1818
createdAt: 2024-11-18
1919
package:
2020
registry: packagist
21-
name: opentelemetry-auto-curl
22-
version: 0.0.1
21+
name: open-telemetry/opentelemetry-auto-curl
22+
version: 0.0.2
2323
isFirstParty: false

data/registry/instrumentation-php-extrdkafka.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ authors:
1919
createdAt: 2024-11-18
2020
package:
2121
registry: packagist
22-
name: opentelemetry-auto-ext-rdkafka
22+
name: open-telemetry/opentelemetry-auto-ext-rdkafka
2323
version: 0.0.1
2424
isFirstParty: false

0 commit comments

Comments
 (0)