Skip to content

Commit d1f0805

Browse files
mx-psimx-psi
authored
[receiverhelper] Split receiverhelper into a separate module (#12512)
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description Splits `receiverhelper` into a separate module. <!-- Issue number if applicable --> #### Link to tracking issue Fixes #12514
1 parent 8c99c52 commit d1f0805

File tree

15 files changed

+211
-19
lines changed

15 files changed

+211
-19
lines changed

‎.chloggen/mx-psi_split-the-helpers.yaml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: new_component
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
7+
component: receiverhelper
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Split `receiverhelper` into a separate module
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [28328]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# Optional: The change log or logs in which this entry should be included.
21+
# e.g. '[user]' or '[user, api]'
22+
# Include 'user' if the change is relevant to end users.
23+
# Include 'api' if there is a change to a library API.
24+
# Default: '[user]'
25+
change_logs: [api]

‎cmd/builder/internal/builder/main_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ var replaceModules = []string{
103103
"/receiver/nopreceiver",
104104
"/receiver/otlpreceiver",
105105
"/receiver/receivertest",
106+
"/receiver/receiverhelper",
106107
"/receiver/xreceiver",
107108
"/semconv",
108109
"/service",

‎cmd/otelcorecol/builder-config.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ replaces:
102102
- go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper => ../../processor/processorhelper/xprocessorhelper
103103
- go.opentelemetry.io/collector/receiver => ../../receiver
104104
- go.opentelemetry.io/collector/receiver/nopreceiver => ../../receiver/nopreceiver
105+
- go.opentelemetry.io/collector/receiver/receiverhelper => ../../receiver/receiverhelper
105106
- go.opentelemetry.io/collector/receiver/otlpreceiver => ../../receiver/otlpreceiver
106107
- go.opentelemetry.io/collector/receiver/receivertest => ../../receiver/receivertest
107108
- go.opentelemetry.io/collector/receiver/xreceiver => ../../receiver/xreceiver

‎cmd/otelcorecol/go.mod‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ require (
121121
go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper v0.121.0 // indirect
122122
go.opentelemetry.io/collector/processor/processortest v0.121.0 // indirect
123123
go.opentelemetry.io/collector/processor/xprocessor v0.121.0 // indirect
124+
go.opentelemetry.io/collector/receiver/receiverhelper v0.0.0-00010101000000-000000000000 // indirect
124125
go.opentelemetry.io/collector/receiver/receivertest v0.121.0 // indirect
125126
go.opentelemetry.io/collector/receiver/xreceiver v0.121.0 // indirect
126127
go.opentelemetry.io/collector/semconv v0.121.0 // indirect
@@ -294,6 +295,8 @@ replace go.opentelemetry.io/collector/receiver => ../../receiver
294295

295296
replace go.opentelemetry.io/collector/receiver/nopreceiver => ../../receiver/nopreceiver
296297

298+
replace go.opentelemetry.io/collector/receiver/receiverhelper => ../../receiver/receiverhelper
299+
297300
replace go.opentelemetry.io/collector/receiver/otlpreceiver => ../../receiver/otlpreceiver
298301

299302
replace go.opentelemetry.io/collector/receiver/receivertest => ../../receiver/receivertest

‎internal/e2e/go.mod‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ require (
100100
go.opentelemetry.io/collector/processor v0.121.0 // indirect
101101
go.opentelemetry.io/collector/processor/processortest v0.121.0 // indirect
102102
go.opentelemetry.io/collector/processor/xprocessor v0.121.0 // indirect
103+
go.opentelemetry.io/collector/receiver/receiverhelper v0.0.0-00010101000000-000000000000 // indirect
103104
go.opentelemetry.io/collector/receiver/xreceiver v0.121.0 // indirect
104105
go.opentelemetry.io/collector/semconv v0.121.0 // indirect
105106
go.opentelemetry.io/collector/service/hostcapabilities v0.121.0 // indirect
@@ -175,6 +176,8 @@ replace go.opentelemetry.io/collector/receiver/otlpreceiver => ../../receiver/ot
175176

176177
replace go.opentelemetry.io/collector/receiver => ../../receiver
177178

179+
replace go.opentelemetry.io/collector/receiver/receiverhelper => ../../receiver/receiverhelper
180+
178181
replace go.opentelemetry.io/collector/extension => ../../extension
179182

180183
replace go.opentelemetry.io/collector/confmap => ../../confmap

‎receiver/go.mod‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,27 @@ go 1.23.0
55
require (
66
github.com/stretchr/testify v1.10.0
77
go.opentelemetry.io/collector/component v1.27.0
8-
go.opentelemetry.io/collector/component/componenttest v0.121.0
98
go.opentelemetry.io/collector/consumer v1.27.0
109
go.opentelemetry.io/collector/consumer/consumertest v0.121.0
1110
go.opentelemetry.io/collector/pipeline v0.121.0
12-
go.opentelemetry.io/otel v1.34.0
13-
go.opentelemetry.io/otel/metric v1.34.0
14-
go.opentelemetry.io/otel/sdk/metric v1.34.0
15-
go.opentelemetry.io/otel/trace v1.34.0
1611
go.uber.org/goleak v1.3.0
1712
)
1813

1914
require (
2015
github.com/davecgh/go-spew v1.1.1 // indirect
21-
github.com/go-logr/logr v1.4.2 // indirect
22-
github.com/go-logr/stdr v1.2.2 // indirect
2316
github.com/gogo/protobuf v1.3.2 // indirect
24-
github.com/google/uuid v1.6.0 // indirect
2517
github.com/json-iterator/go v1.1.12 // indirect
2618
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
2719
github.com/modern-go/reflect2 v1.0.2 // indirect
2820
github.com/pmezard/go-difflib v1.0.0 // indirect
29-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
21+
github.com/rogpeppe/go-internal v1.13.1 // indirect
3022
go.opentelemetry.io/collector/consumer/xconsumer v0.121.0 // indirect
3123
go.opentelemetry.io/collector/pdata v1.27.0 // indirect
3224
go.opentelemetry.io/collector/pdata/pprofile v0.121.0 // indirect
33-
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
25+
go.opentelemetry.io/otel v1.34.0 // indirect
26+
go.opentelemetry.io/otel/metric v1.34.0 // indirect
27+
go.opentelemetry.io/otel/sdk/metric v1.34.0 // indirect
28+
go.opentelemetry.io/otel/trace v1.34.0 // indirect
3429
go.uber.org/multierr v1.11.0 // indirect
3530
go.uber.org/zap v1.27.0 // indirect
3631
golang.org/x/net v0.33.0 // indirect
@@ -44,8 +39,6 @@ require (
4439

4540
replace go.opentelemetry.io/collector/component => ../component
4641

47-
replace go.opentelemetry.io/collector/component/componenttest => ../component/componenttest
48-
4942
replace go.opentelemetry.io/collector/consumer => ../consumer
5043

5144
replace go.opentelemetry.io/collector/pdata => ../pdata

‎receiver/go.sum‎

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎receiver/otlpreceiver/go.mod‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ require (
2828
go.opentelemetry.io/collector/pdata/pprofile v0.121.0
2929
go.opentelemetry.io/collector/pdata/testdata v0.121.0
3030
go.opentelemetry.io/collector/receiver v0.121.0
31+
go.opentelemetry.io/collector/receiver/receiverhelper v0.0.0-00010101000000-000000000000
3132
go.opentelemetry.io/collector/receiver/receivertest v0.121.0
3233
go.opentelemetry.io/collector/receiver/xreceiver v0.121.0
3334
go.opentelemetry.io/otel v1.34.0
@@ -114,6 +115,8 @@ replace go.opentelemetry.io/collector/pdata/testdata => ../../pdata/testdata
114115

115116
replace go.opentelemetry.io/collector/receiver => ../
116117

118+
replace go.opentelemetry.io/collector/receiver/receiverhelper => ../receiverhelper
119+
117120
replace go.opentelemetry.io/collector/consumer => ../../consumer
118121

119122
replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile

‎receiver/receiverhelper/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
include ../../Makefile.Common

‎receiver/receiverhelper/go.mod‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
module go.opentelemetry.io/collector/receiver/receiverhelper
2+
3+
go 1.23.0
4+
5+
require (
6+
github.com/stretchr/testify v1.10.0
7+
go.opentelemetry.io/collector/component v1.27.0
8+
go.opentelemetry.io/collector/component/componenttest v0.120.0
9+
go.opentelemetry.io/collector/pipeline v0.121.0
10+
go.opentelemetry.io/collector/receiver v0.120.0
11+
go.opentelemetry.io/otel v1.34.0
12+
go.opentelemetry.io/otel/metric v1.34.0
13+
go.opentelemetry.io/otel/sdk/metric v1.34.0
14+
go.opentelemetry.io/otel/trace v1.34.0
15+
go.uber.org/goleak v1.3.0
16+
)
17+
18+
require (
19+
github.com/davecgh/go-spew v1.1.1 // indirect
20+
github.com/go-logr/logr v1.4.2 // indirect
21+
github.com/go-logr/stdr v1.2.2 // indirect
22+
github.com/gogo/protobuf v1.3.2 // indirect
23+
github.com/google/uuid v1.6.0 // indirect
24+
github.com/json-iterator/go v1.1.12 // indirect
25+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
26+
github.com/modern-go/reflect2 v1.0.2 // indirect
27+
github.com/pmezard/go-difflib v1.0.0 // indirect
28+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
29+
go.opentelemetry.io/collector/consumer v1.27.0 // indirect
30+
go.opentelemetry.io/collector/pdata v1.27.0 // indirect
31+
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
32+
go.uber.org/multierr v1.11.0 // indirect
33+
go.uber.org/zap v1.27.0 // indirect
34+
golang.org/x/net v0.33.0 // indirect
35+
golang.org/x/sys v0.29.0 // indirect
36+
golang.org/x/text v0.21.0 // indirect
37+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241202173237-19429a94021a // indirect
38+
google.golang.org/grpc v1.70.0 // indirect
39+
google.golang.org/protobuf v1.36.5 // indirect
40+
gopkg.in/yaml.v3 v3.0.1 // indirect
41+
)
42+
43+
replace go.opentelemetry.io/collector/receiver => ../
44+
45+
replace go.opentelemetry.io/collector/component => ../../component
46+
47+
replace go.opentelemetry.io/collector/component/componenttest => ../../component/componenttest
48+
49+
replace go.opentelemetry.io/collector/consumer => ../../consumer
50+
51+
replace go.opentelemetry.io/collector/pdata => ../../pdata
52+
53+
replace go.opentelemetry.io/collector/pdata/testdata => ../../pdata/testdata
54+
55+
replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile
56+
57+
replace go.opentelemetry.io/collector/consumer/xconsumer => ../../consumer/xconsumer
58+
59+
replace go.opentelemetry.io/collector/consumer/consumertest => ../../consumer/consumertest
60+
61+
replace go.opentelemetry.io/collector/pipeline => ../../pipeline

0 commit comments

Comments
 (0)