Skip to content

Commit 2331c4f

Browse files
authored
Merge branch 'main' into otelcol-ebpf-profiler
2 parents ca632d1 + 6a3144d commit 2331c4f

File tree

7 files changed

+300
-294
lines changed

7 files changed

+300
-294
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
<!-- next version -->
66

7+
## v0.124.1
8+
79
## v0.124.0
810

911
### 🚀 New components 🚀
@@ -50,6 +52,10 @@
5052

5153
## v0.121.0
5254

55+
### 🛑 Breaking changes 🛑
56+
57+
- container group ID: Set user's primary group (USER_GID) to prevent container user 10001 being root group. (#738)
58+
5359
### 🚀 New components 🚀
5460

5561
- `aesprovider`: Add the AES provider to the contrib distribution (#843)

distributions/otelcol-contrib/manifest.yaml

Lines changed: 212 additions & 212 deletions
Large diffs are not rendered by default.

distributions/otelcol-k8s/manifest.yaml

Lines changed: 58 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -2,84 +2,84 @@ dist:
22
module: github.com/open-telemetry/opentelemetry-collector-releases/k8s
33
name: otelcol-k8s
44
description: OpenTelemetry Collector for Kubernetes
5-
version: 0.124.0
5+
version: 0.124.1
66
output_path: ./_build
77

88
extensions:
99
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.124.0
10-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension v0.124.0
11-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.124.0
12-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.124.0
13-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.124.0
14-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.124.0
15-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/httpforwarderextension v0.124.0
16-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension v0.124.0
17-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/hostobserver v0.124.0
18-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver v0.124.0
19-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/oidcauthextension v0.124.0
20-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/opampextension v0.124.0
21-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.124.0
22-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.124.0
10+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension v0.124.1
11+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension v0.124.1
12+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.124.1
13+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.124.1
14+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.124.1
15+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/httpforwarderextension v0.124.1
16+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension v0.124.1
17+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/hostobserver v0.124.1
18+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver v0.124.1
19+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/oidcauthextension v0.124.1
20+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/opampextension v0.124.1
21+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.124.1
22+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.124.1
2323

2424
exporters:
2525
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.124.0
2626
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.124.0
2727
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.124.0
2828
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.124.0
29-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.124.0
30-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.124.0
31-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/otelarrowexporter v0.124.0
29+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.124.1
30+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter v0.124.1
31+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/otelarrowexporter v0.124.1
3232

3333
processors:
3434
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.124.0
3535
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.124.0
36-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.124.0
37-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.124.0
38-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor v0.124.0
39-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor v0.124.0
40-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.124.0
41-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.124.0
42-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor v0.124.0
43-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/intervalprocessor v0.124.0
44-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.124.0
45-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/logdedupprocessor v0.124.0
46-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.124.0
47-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.124.0
48-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/redactionprocessor v0.124.0
49-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/remotetapprocessor v0.124.0
50-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.124.0
51-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.124.0
52-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.124.0
53-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.124.0
36+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.124.1
37+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor v0.124.1
38+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatocumulativeprocessor v0.124.1
39+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/deltatorateprocessor v0.124.1
40+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.124.1
41+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor v0.124.1
42+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbytraceprocessor v0.124.1
43+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/intervalprocessor v0.124.1
44+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor v0.124.1
45+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/logdedupprocessor v0.124.1
46+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor v0.124.1
47+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.124.1
48+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/redactionprocessor v0.124.1
49+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/remotetapprocessor v0.124.1
50+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.124.1
51+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.124.1
52+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor v0.124.1
53+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor v0.124.1
5454

5555
receivers:
5656
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.124.0
57-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.124.0
58-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.124.0
59-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.124.0
60-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver v0.124.0
61-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.124.0
62-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.124.0
63-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.124.0
64-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8seventsreceiver v0.124.0
65-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sobjectsreceiver v0.124.0
66-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.124.0
67-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.124.0
68-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/otelarrowreceiver v0.124.0
69-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.124.0
70-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.124.0
71-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.124.0
57+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver v0.124.1
58+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver v0.124.1
59+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.124.1
60+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver v0.124.1
61+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.124.1
62+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.124.1
63+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver v0.124.1
64+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8seventsreceiver v0.124.1
65+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sobjectsreceiver v0.124.1
66+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.124.1
67+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.124.1
68+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/otelarrowreceiver v0.124.1
69+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.124.1
70+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator v0.124.1
71+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.124.1
7272

7373
connectors:
7474
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.124.0
75-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.124.0
76-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.124.0
77-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/failoverconnector v0.124.0
78-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/otlpjsonconnector v0.124.0
79-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/roundrobinconnector v0.124.0
80-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.124.0
81-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.124.0
82-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.124.0
75+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.124.1
76+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.124.1
77+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/failoverconnector v0.124.1
78+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/otlpjsonconnector v0.124.1
79+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/roundrobinconnector v0.124.1
80+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.124.1
81+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.124.1
82+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.124.1
8383

8484
providers:
8585
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.30.0

distributions/otelcol-otlp/manifest.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ dist:
22
module: github.com/open-telemetry/opentelemetry-collector-releases/otlp
33
name: otelcol-otlp
44
description: OpenTelemetry Collector OTLP
5-
version: 0.124.0
5+
version: 0.124.1
66
output_path: ./_build
77

88
exporters:

distributions/otelcol/manifest.yaml

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,44 +2,44 @@ dist:
22
module: github.com/open-telemetry/opentelemetry-collector-releases/core
33
name: otelcol
44
description: OpenTelemetry Collector
5-
version: 0.124.0
5+
version: 0.124.1
66
output_path: ./_build
77

88
receivers:
99
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.124.0
1010
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.124.0
11-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.124.0
12-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.124.0
13-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.124.0
14-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.124.0
15-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.124.0
16-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.124.0
11+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver v0.124.1
12+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver v0.124.1
13+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.124.1
14+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver v0.124.1
15+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.124.1
16+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.124.1
1717

1818
exporters:
1919
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.124.0
2020
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.124.0
2121
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.124.0
2222
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.124.0
23-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.124.0
24-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.124.0
25-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter v0.124.0
26-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.124.0
27-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.124.0
28-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.124.0
23+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter v0.124.1
24+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter v0.124.1
25+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/opencensusexporter v0.124.1
26+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter v0.124.1
27+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.124.1
28+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter v0.124.1
2929

3030
extensions:
3131
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.124.0
32-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.124.0
33-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.124.0
32+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.124.1
33+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.124.1
3434

3535
processors:
3636
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.124.0
3737
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.124.0
38-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.124.0
39-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.124.0
40-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.124.0
41-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.124.0
42-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.124.0
38+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.124.1
39+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor v0.124.1
40+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor v0.124.1
41+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.124.1
42+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.124.1
4343

4444
connectors:
4545
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.124.0

internal/tools/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.23.0
44

55
toolchain go1.23.6
66

7-
require go.opentelemetry.io/build-tools/chloggen v0.21.0
7+
require go.opentelemetry.io/build-tools/chloggen v0.22.0
88

99
require (
1010
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect

0 commit comments

Comments
 (0)