Skip to content

Commit dabc42f

Browse files
authored
Merge branch 'open-telemetry:main' into localize-content-languages-java-sdk
2 parents 2079cb1 + bc7a621 commit dabc42f

File tree

8 files changed

+61
-19
lines changed

8 files changed

+61
-19
lines changed

content/en/blog/2025/ottl-contexts-just-got-easier.md

+1-6
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ benefits of context inference while providing granular control over statement
8383
configurations, such as `error_mode` and `conditions`. For example, consider the
8484
following configuration:
8585

86-
<!-- prettier-ignore-start -->
8786
```yaml
8887
metric_statements:
8988
- context: datapoint
@@ -92,35 +91,31 @@ metric_statements:
9291
statements:
9392
- set(metric.description, "counter") where attributes["my.attr"] == "some"
9493
```
95-
<!-- prettier-ignore-end -->
9694

9795
The above can now be written as:
9896

99-
<!-- prettier-ignore-start -->
97+
<!-- prettier-ignore -->
10098
```yaml
10199
metric_statements:
102100
- conditions:
103101
- resource.attributes["service.name"] == "my.service"
104102
statements:
105103
- set(metric.description, "counter") where datapoint.attributes["my.attr"] == "some"
106104
```
107-
<!-- prettier-ignore-end -->
108105

109106
In this example, the `context` value is omitted and is automatically inferred to
110107
`datapoint`, as it is the only OTTL context present in the statements that
111108
supports parsing both `datapoint` and `metric` data.
112109

113110
If we update the above configuration removing the `datapoint` usage:
114111

115-
<!-- prettier-ignore-start -->
116112
```yaml
117113
metric_statements:
118114
- conditions:
119115
- resource.attributes["service.name"] == "my.service"
120116
statements:
121117
- set(metric.description, "counter")
122118
```
123-
<!-- prettier-ignore-end -->
124119

125120
The context inferrer would select the `metric` OTTL context instead, since no
126121
data points are accessed. Although it would be possible to run the statements

content/en/docs/collector/_index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Collector
33
description: Vendor-agnostic way to receive, process and export telemetry data.
44
aliases: [./about]
55
cascade:
6-
vers: 0.119.0
6+
vers: 0.120.0
77
weight: 270
88
---
99

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ touch tailtracer/factory.go
350350
```
351351

352352
Now let's follow the convention and add a function named `NewFactory()` that
353-
will be responsible to instantiate the `tailtracer` factory. Go ahead the add
353+
will be responsible to instantiate the `tailtracer` factory. Go ahead and add
354354
the following code to your `factory.go` file:
355355

356356
```go

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

+11-2
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,9 @@ There are currently no metrics specific to `normal` verbosity.
305305
{{% alert title="Note" color="info" %}} The `http_` and `rpc_` metrics come from
306306
instrumentation libraries. Their original names use dots (`.`), but when
307307
exposing internal metrics with Prometheus, they are translated to use
308-
underscores (`_`) to match Prometheus' naming constraints.
308+
underscores (`_`) to match Prometheus' naming constraints. These metrics are not
309+
covered by the maturity levels below since they are not under the Collector SIG
310+
control.
309311

310312
The `otelcol_processor_batch_` metrics are unique to the `batchprocessor`.
311313

@@ -329,6 +331,10 @@ The Collector logs the following internal events:
329331

330332
## Telemetry maturity levels
331333

334+
The Collector telemetry levels apply to all first-party telemetry produced by
335+
the Collector. Third-party libraries, including those of OpenTelemetry Go, are
336+
not covered by these maturity levels.
337+
332338
### Traces
333339

334340
Tracing instrumentation is still under active development, and changes might be
@@ -338,10 +344,13 @@ guarantees of backwards compatibility for tracing instrumentation.
338344

339345
### Metrics
340346

341-
The Collector's metrics follow a four-stage lifecycle:
347+
The Collector's first-party metrics follow a four-stage lifecycle:
342348

343349
> Alpha metric → Stable metric → Deprecated metric → Deleted metric
344350

351+
Third-party metrics, including those generated by OpenTelemetry Go
352+
instrumentation libraries, are not covered by these maturity levels.
353+
345354
#### Alpha
346355

347356
Alpha metrics have no stability guarantees. These metrics can be modified or

content/en/docs/languages/java/configuration.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,8 @@ exporters specified via `otel.traces.exporter`:
196196
| System property | Description | Default |
197197
| -------------------------------- | --------------------------------------------------------------- | ------- |
198198
| `otel.bsp.schedule.delay` | The interval, in milliseconds, between two consecutive exports. | `5000` |
199-
| `otel.bsp.max.queue.size` | The maximum queue size. | `2048` |
200-
| `otel.bsp.max.export.batch.size` | The maximum batch size. | `512` |
199+
| `otel.bsp.max.queue.size` | The maximum number of spans that can be queued before batching. | `2048` |
200+
| `otel.bsp.max.export.batch.size` | The maximum number of spans to export in a single batch. | `512` |
201201
| `otel.bsp.export.timeout` | The maximum allowed time, in milliseconds, to export data. | `30000` |
202202

203203
Properties for [sampler](../sdk/#sampler):
@@ -256,12 +256,12 @@ Properties for cardinality limits:
256256
Properties for [log record processor(s)](../sdk/#logrecordprocessor) pared with
257257
exporters via `otel.logs.exporter`:
258258

259-
| System property | Description | Default |
260-
| --------------------------------- | --------------------------------------------------------------- | ------- |
261-
| `otel.blrp.schedule.delay` | The interval, in milliseconds, between two consecutive exports. | `1000` |
262-
| `otel.blrp.max.queue.size` | The maximum queue size. | `2048` |
263-
| `otel.blrp.max.export.batch.size` | The maximum batch size. | `512` |
264-
| `otel.blrp.export.timeout` | The maximum allowed time, in milliseconds, to export data. | `30000` |
259+
| System property | Description | Default |
260+
| --------------------------------- | --------------------------------------------------------------------- | ------- |
261+
| `otel.blrp.schedule.delay` | The interval, in milliseconds, between two consecutive exports. | `1000` |
262+
| `otel.blrp.max.queue.size` | The maximum number of log records that can be queued before batching. | `2048` |
263+
| `otel.blrp.max.export.batch.size` | The maximum number of log records to export in a single batch. | `512` |
264+
| `otel.blrp.export.timeout` | The maximum allowed time, in milliseconds, to export data. | `30000` |
265265

266266
#### Properties: exporters
267267

content/en/docs/security/_index.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Security
33
cascade:
4-
collector_vers: 0.119.0
4+
collector_vers: 0.120.0
55
weight: 970
66
---
77

data/ecosystem/vendors.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,12 @@
306306
contact:
307307
oss: false
308308
commercial: true
309+
- name: Parseable
310+
nativeOTLP: true
311+
url: https://www.parseable.com/docs/server/opentelemetry
312+
313+
oss: true
314+
commercial: true
309315
- name: qryn
310316
nativeOTLP: true
311317
url: https://qryn.metrico.in/#/support?id=tempo-api

static/refcache.json

+32
Original file line numberDiff line numberDiff line change
@@ -6439,6 +6439,34 @@
64396439
"StatusCode": 206,
64406440
"LastSeen": "2025-02-10T19:32:07.109251077Z"
64416441
},
6442+
"https://github.com/open-telemetry/opentelemetry-collector/blob/v0.120.0/component/config.go": {
6443+
"StatusCode": 206,
6444+
"LastSeen": "2025-02-19T19:17:45.009325266Z"
6445+
},
6446+
"https://github.com/open-telemetry/opentelemetry-collector/blob/v0.120.0/component/config.go#L50": {
6447+
"StatusCode": 206,
6448+
"LastSeen": "2025-02-19T19:17:42.775563833Z"
6449+
},
6450+
"https://github.com/open-telemetry/opentelemetry-collector/blob/v0.120.0/pdata/internal/data/protogen/trace/v1/trace.pb.go": {
6451+
"StatusCode": 206,
6452+
"LastSeen": "2025-02-19T19:17:51.838725231Z"
6453+
},
6454+
"https://github.com/open-telemetry/opentelemetry-collector/blob/v0.120.0/pdata/pcommon/map.go": {
6455+
"StatusCode": 206,
6456+
"LastSeen": "2025-02-19T19:17:55.427696696Z"
6457+
},
6458+
"https://github.com/open-telemetry/opentelemetry-collector/blob/v0.120.0/receiver/receiver.go": {
6459+
"StatusCode": 206,
6460+
"LastSeen": "2025-02-19T19:17:50.788198899Z"
6461+
},
6462+
"https://github.com/open-telemetry/opentelemetry-collector/blob/v0.120.0/receiver/receiver.go#L58": {
6463+
"StatusCode": 206,
6464+
"LastSeen": "2025-02-19T19:17:50.094394779Z"
6465+
},
6466+
"https://github.com/open-telemetry/opentelemetry-collector/blob/v0.120.0/semconv/v1.9.0/generated_resource.go": {
6467+
"StatusCode": 206,
6468+
"LastSeen": "2025-02-19T19:17:58.227636872Z"
6469+
},
64426470
"https://github.com/open-telemetry/opentelemetry-collector/issues/10469": {
64436471
"StatusCode": 206,
64446472
"LastSeen": "2025-02-01T07:12:41.436253-05:00"
@@ -18091,6 +18119,10 @@
1809118119
"StatusCode": 200,
1809218120
"LastSeen": "2025-01-13T11:43:58.450234-05:00"
1809318121
},
18122+
"https://www.parseable.com/docs/server/opentelemetry": {
18123+
"StatusCode": 200,
18124+
"LastSeen": "2025-02-20T22:54:09.030696452Z"
18125+
},
1809418126
"https://www.phoenixframework.org/": {
1809518127
"StatusCode": 200,
1809618128
"LastSeen": "2025-01-13T11:43:26.18526-05:00"

0 commit comments

Comments
 (0)