Skip to content

Commit 529eed0

Browse files
mar4ukdehaansathampiotr
authored
Update otel deps from v0.125.0 to v0.126.0 (#3781)
* update otel deps from v0.125.0 to v0.126.0 * fix datadogexporter: instrumentation_scope_metadata_as_tags = true by default * Add TLS tpm config * Fix find-replace error * Update docs and components to match otel 126 updates * Fix tests * another test fix * Apply suggestions from code review Co-authored-by: Piotr <[email protected]> * Update docs from PR feedback --------- Co-authored-by: Sam DeHaan <[email protected]> Co-authored-by: Sam DeHaan <[email protected]> Co-authored-by: Piotr <[email protected]>
1 parent 501a307 commit 529eed0

Some content is hidden

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

47 files changed

+952
-545
lines changed

‎CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,17 @@ v1.9.1
4747

4848
- Fix elevated CPU usage when using some `otelcol` components due to debug logging. (@thampiotr)
4949

50+
### Other changes
51+
52+
- Upgrade `otelcol` components from OpenTelemetry v0.125.0 to v0.126.0 (@dehaansa):
53+
- [`pkg/ottl`] Add support for `HasPrefix` and `HasSuffix` functions.
54+
- [`pkg/configtls`] Add trusted platform module (TPM) support to TLS authentication for all `otelcol` components supporting TLS.
55+
- [`otelcol.connector.spanmetrics`] Add `calls_dimension` and `histogram:dimension` blocks for configuring additional dimensions for `traces.span.metrics.calls` and `traces.span.metrics.duration` metrics.
56+
- [`otelcol.exporter.datadog`] Enable `instrumentation_scope_metadata_as_tags` by default.
57+
- [`otelcol.exporter.kafka`] support configuration of `compression` `level` in producer configuration.
58+
- [`otelcol.processor.tailsampling`] `invert sample` and `inverted not sample` decisions deprecated, use the `drop` policy instead to explicitly not sample traces.
59+
- [`otelcol.receiver.filelog`] support `compression` value of `auto` to automatically detect file compression type.
60+
5061
v1.9.0
5162
-----------------
5263

‎docs/sources/reference/components/otelcol/otelcol.auth.oauth2.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,10 @@ You can use the following blocks with `otelcol.auth.oauth2`:
7070
| -------------------------------- | -------------------------------------------------------------------------- | -------- |
7171
| [`debug_metrics`][debug_metrics] | Configures the metrics that this component generates to monitor its state. | no |
7272
| [`tls`][tls] | TLS settings for the token client. | no |
73+
| `tls` > [`tpm`][tpm] | TPM settings for the TLS key_file. | no |
7374

7475
[tls]: #tls
76+
[tpm]: #tpm
7577
[debug_metrics]: #debug_metrics
7678

7779
### `debug_metrics`
@@ -85,6 +87,12 @@ If the `tls` block isn't provided, TLS won't be used for communication.
8587

8688
{{< docs/shared lookup="reference/components/otelcol-tls-client-block.md" source="alloy" version="<ALLOY_VERSION>" >}}
8789

90+
### `tpm`
91+
92+
The `tpm` block configures retrieving the TLS `key_file` from a trusted device.
93+
94+
{{< docs/shared lookup="reference/components/otelcol-tls-tpm-block.md" source="alloy" version="<ALLOY_VERSION>" >}}
95+
8896
## Exported fields
8997

9098
The following fields are exported and can be referenced by other components:

‎docs/sources/reference/components/otelcol/otelcol.connector.spanmetrics.md

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -107,21 +107,24 @@ A value of `0` means no limit is applied.
107107

108108
You can use the following blocks with `otelcol.connector.spanmetrics`:
109109

110-
| Block | Description | Required |
111-
| ------------------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------- | -------- |
112-
| [`histogram`][histogram] | Configures the histogram derived from spans durations. | yes |
113-
| [`output`][output] | Configures where to send telemetry data. | yes |
114-
| [`debug_metrics`][debug_metrics] | Configures the metrics that this component generates to monitor its state. | no |
115-
| [`dimension`][dimension] | Dimensions to be added in addition to the default ones. | no |
116-
| [`events`][events] | Configures the events metric. | no |
117-
| `events` > [`dimension`][dimension] | Span event attributes to add as dimensions to the events metric, _on top of_ the default ones and the ones configured in the top-level `dimension` block. | no |
118-
| [`exemplars`][exemplars] | Configures how to attach exemplars to histograms. | no |
119-
| `histogram` > [`explicit`][explicit] | Configuration for a histogram with explicit buckets. | no |
120-
| `histogram` > [`exponential`][exponential] | Configuration for a histogram with exponential buckets. | no |
110+
| Block | Description | Required |
111+
|--------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------|----------|
112+
| [`histogram`][histogram] | Configures the histogram derived from spans durations. | yes |
113+
| `histogram` > [`dimension`][dimension] | Span event attributes to add as dimensions to the duration metric, _on top of_ the default ones and the ones configured in the top-level `dimension` block | no |
114+
| `histogram` > [`explicit`][explicit] | Configuration for a histogram with explicit buckets. | no |
115+
| `histogram` > [`exponential`][exponential] | Configuration for a histogram with exponential buckets. | no |
116+
| [`output`][output] | Configures where to send telemetry data. | yes |
117+
| [`calls_dimension`][calls_dimension] | Span event attributes to add as dimensions to the calls metric, _on top of_ the default ones and the ones configured in the top-level `dimension` block | no |
118+
| [`debug_metrics`][debug_metrics] | Configures the metrics that this component generates to monitor its state. | no |
119+
| [`dimension`][dimension] | Dimensions to be added in addition to the default ones. | no |
120+
| [`events`][events] | Configures the events metric. | no |
121+
| `events` > [`dimension`][dimension] | Span event attributes to add as dimensions to the events metric, _on top of_ the default ones and the ones configured in the top-level `dimension` block. | no |
122+
| [`exemplars`][exemplars] | Configures how to attach exemplars to histograms. | no |
121123

122124
You must specify either an [`exponential`][exponential] or an [`explicit`][explicit] block.
123125
You can't specify both blocks in the same configuration.
124126

127+
[calls_dimension]: #calls_dimension
125128
[dimension]: #dimension
126129
[histogram]: #histogram
127130
[exponential]: #exponential
@@ -170,7 +173,7 @@ The default dimensions are:
170173
* `span.kind`
171174
* `status.code`
172175

173-
The default dimensions are always added. If no additional dimensions are specified, only the default ones will be added.
176+
The default dimensions are always added if not listed in `exclude_dimensions`. If no additional dimensions are specified, only the default ones will be added.
174177

175178
The following attributes are supported:
176179

@@ -187,6 +190,10 @@ If the attribute is missing in both the span and resource attributes:
187190
* If `default` isn't set, the dimension will be omitted.
188191
* If `default` is set, the dimension will be added and its value will be set to the value of `default`.
189192

193+
### `calls_dimension`
194+
195+
The attributes and behavior of the `calls_dimension` block match the [`dimension`][dimension] block.
196+
190197
### `events`
191198

192199
The `events` block configures the `events` metric, which tracks [span events][span-events].
@@ -197,7 +204,7 @@ The following attributes are supported:
197204
| --------- | ------ | -------------------------- | ------- | -------- |
198205
| `enabled` | `bool` | Enables all events metric. | `false` | no |
199206

200-
At least one `dimension` block is required if `enabled` is set to `true`.
207+
At least one nested `dimension` block is required if `enabled` is set to `true`.
201208

202209
[span-events]: https://opentelemetry.io/docs/concepts/signals/traces/#span-events
203210

‎docs/sources/reference/components/otelcol/otelcol.exporter.datadog.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,10 +184,10 @@ The `exporter` block configures the metric exporter settings.
184184

185185
The following arguments are supported:
186186

187-
| Name | Type | Description | Default | Required |
188-
| ---------------------------------------- | ------ | ------------------------------------------------------------------------------------ | ------- | -------- |
189-
| `instrumentation_scope_metadata_as_tags` | `bool` | Set to `true` to add metadata about the instrumentation scope that created a metric. | `false` | no |
190-
| `resource_attributes_as_tags` | `bool` | Set to `true` to add resource attributes of a metric to its metric tags. | `false` | no |
187+
| Name | Type | Description | Default | Required |
188+
| ---------------------------------------- | ------ |-------------------------------------------------------------------------------------------|---------| -------- |
189+
| `instrumentation_scope_metadata_as_tags` | `bool` | Set to `false` to not add metadata about the instrumentation scope that created a metric. | `true` | no |
190+
| `resource_attributes_as_tags` | `bool` | Set to `true` to add resource attributes of a metric to its metric tags. | `false` | no |
191191

192192
### `histograms`
193193

‎docs/sources/reference/components/otelcol/otelcol.exporter.kafka.md

Lines changed: 54 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -63,24 +63,27 @@ When `topic_from_attribute` is set, it will take precedence over the `topic` arg
6363

6464
You can use the following blocks with `otelcol.exporter.kafka`:
6565

66-
| Block | Description | Required |
67-
| ------------------------------------------------ | --------------------------------------------------------------------------- | -------- |
68-
| [`authentication`][authentication] | Configures authentication for connecting to Kafka brokers. | no |
69-
| `authentication` > [`kerberos`][kerberos] | Authenticates against Kafka brokers with Kerberos. | no |
70-
| `authentication` > [`plaintext`][plaintext] | Authenticates against Kafka brokers with plaintext. | no |
71-
| `authentication` > [`sasl`][sasl] | Authenticates against Kafka brokers with SASL. | no |
72-
| `authentication` > `sasl` > [`aws_msk`][aws_msk] | Additional SASL parameters when using AWS_MSK_IAM. | no |
73-
| `authentication` > [`tls`][tls] | Configures TLS for connecting to the Kafka brokers. | no |
74-
| [`debug_metrics`][debug_metrics] | Configures the metrics which this component generates to monitor its state. | no |
75-
| [`logs`][logs] | Configures how to send logs to Kafka brokers. | no |
76-
| [`metadata`][metadata] | Configures how to retrieve metadata from Kafka brokers. | no |
77-
| `metadata` > [`retry`][retry] | Configures how to retry metadata retrieval. | no |
78-
| [`metrics`][metrics] | Configures how to send metrics to Kafka brokers. | no |
79-
| [`producer`][producer] | Kafka producer configuration, | no |
80-
| [`retry_on_failure`][retry_on_failure] | Configures retry mechanism for failed requests. | no |
81-
| [`sending_queue`][sending_queue] | Configures batching of data before sending. | no |
82-
| [`tls`][tls] | Configures TLS for connecting to the Kafka brokers. | no |
83-
| [`traces`][traces] | Configures how to send traces to Kafka brokers. | no |
66+
| Block | Description | Required |
67+
|---------------------------------------------------------|-----------------------------------------------------------------------------|----------|
68+
| [`authentication`][authentication] | Configures authentication for connecting to Kafka brokers. | no |
69+
| `authentication` > [`kerberos`][kerberos] | Authenticates against Kafka brokers with Kerberos. | no |
70+
| `authentication` > [`plaintext`][plaintext] | Authenticates against Kafka brokers with plaintext. | no |
71+
| `authentication` > [`sasl`][sasl] | Authenticates against Kafka brokers with SASL. | no |
72+
| `authentication` > `sasl` > [`aws_msk`][aws_msk] | Additional SASL parameters when using AWS_MSK_IAM. | no |
73+
| `authentication` > [`tls`][tls] | Configures TLS for connecting to the Kafka brokers. | no |
74+
| `authentication` > `tls` > [`tpm`][tpm] | Configures TPM for the TLS `key_file. | no |
75+
| [`debug_metrics`][debug_metrics] | Configures the metrics which this component generates to monitor its state. | no |
76+
| [`logs`][logs] | Configures how to send logs to Kafka brokers. | no |
77+
| [`metadata`][metadata] | Configures how to retrieve metadata from Kafka brokers. | no |
78+
| `metadata` > [`retry`][retry] | Configures how to retry metadata retrieval. | no |
79+
| [`metrics`][metrics] | Configures how to send metrics to Kafka brokers. | no |
80+
| [`producer`][producer] | Kafka producer configuration, | no |
81+
| `producer` > [`compression_params`][compression_params] | Configures the compression parameters for the kafka producer. | no |
82+
| [`retry_on_failure`][retry_on_failure] | Configures retry mechanism for failed requests. | no |
83+
| [`sending_queue`][sending_queue] | Configures batching of data before sending. | no |
84+
| [`tls`][tls] | Configures TLS for connecting to the Kafka brokers. | no |
85+
| `tls` > [`tpm`][tpm] | Configures TPM settings for the TLS key_file. | no |
86+
| [`traces`][traces] | Configures how to send traces to Kafka brokers. | no |
8487

8588
The > symbol indicates deeper levels of nesting.
8689
For example, `authentication` > `tls` refers to a `tls` block defined inside an `authentication` block.
@@ -93,12 +96,14 @@ For example, `authentication` > `tls` refers to a `tls` block defined inside an
9396
[sasl]: #sasl
9497
[aws_msk]: #aws_msk
9598
[tls]: #tls
99+
[tpm]: #tpm
96100
[kerberos]: #kerberos
97101
[metadata]: #metadata
98102
[retry]: #retry
99103
[retry_on_failure]: #retry_on_failure
100104
[sending_queue]: #sending_queue
101105
[producer]: #producer
106+
[compression_params]: #compression_params
102107
[debug_metrics]: #debug_metrics
103108

104109
### `logs`
@@ -155,6 +160,12 @@ If the `tls` block isn't provided, TLS won't be used for communication.
155160

156161
{{< docs/shared lookup="reference/components/otelcol-tls-client-block.md" source="alloy" version="<ALLOY_VERSION>" >}}
157162

163+
### `tpm`
164+
165+
The `tpm` block configures retrieving the TLS `key_file` from a trusted device.
166+
167+
{{< docs/shared lookup="reference/components/otelcol-tls-tpm-block.md" source="alloy" version="<ALLOY_VERSION>" >}}
168+
158169
### `debug_metrics`
159170

160171
{{< docs/shared lookup="reference/components/otelcol-debug-metrics-block.md" source="alloy" version="<ALLOY_VERSION>" >}}
@@ -188,6 +199,31 @@ Refer to the [Go sarama documentation][CompressionCodec] for more information.
188199
[RequiredAcks]: https://pkg.go.dev/github.com/IBM/[email protected]#RequiredAcks
189200
[CompressionCodec]: https://pkg.go.dev/github.com/IBM/[email protected]#CompressionCodec
190201

202+
### `compression_params`
203+
204+
The `compression_params` block configures the producer compression parameters.
205+
206+
The following argument is supported:
207+
208+
| Name | Type | Description | Default | Required |
209+
| -------------------- | -------- | --------------------------------------------------- | --------- | -------- |
210+
| `level` | `int` | The level of compression to use on messages. | `-1` | no |
211+
212+
The following levels are valid combinations of `compression` and `level`:
213+
214+
| Compression | Value | Description |
215+
|-------------|-------|------------------------|
216+
| `gzip` | `1` | BestSpeed |
217+
| `gzip` | `9` | BestCompression |
218+
| `gzip` | `-1` | DefaultCompression |
219+
| `zstd` | `1` | SpeedFastest |
220+
| `zstd` | `3` | SpeedDefault |
221+
| `zstd` | `6` | SpeedBetterCompression |
222+
| `zstd` | `11` | SpeedBestCompression |
223+
224+
225+
`lz4` and `snappy` do not currently support compression levels in this component.
226+
191227
### `retry_on_failure`
192228

193229
The `retry_on_failure` block configures how failed requests to Kafka are retried.

0 commit comments

Comments
 (0)