Skip to content

Commit 0654ae5

Browse files
mx-psimx-psi
authored
[processor/processorhelper] Split into separate module (open-telemetry#12695)
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description Split processorhelper into a separate module. Similar to open-telemetry#12512 in motivation and shape <!-- Issue number if applicable --> #### Link to tracking issue Fixes open-telemetry#12678
1 parent 76af795 commit 0654ae5

File tree

14 files changed

+222
-34
lines changed

14 files changed

+222
-34
lines changed

‎.chloggen/mx-psi_split-into-modules.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: enhancement
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
7+
component: processorhelper
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Split processorhelper into a separate module.
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [12678]
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
@@ -97,6 +97,7 @@ var replaceModules = []string{
9797
"/processor/processortest",
9898
"/processor/batchprocessor",
9999
"/processor/memorylimiterprocessor",
100+
"/processor/processorhelper",
100101
"/processor/processorhelper/xprocessorhelper",
101102
"/processor/xprocessor",
102103
"/receiver",

‎cmd/otelcorecol/builder-config.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ replaces:
100100
- go.opentelemetry.io/collector/processor/memorylimiterprocessor => ../../processor/memorylimiterprocessor
101101
- go.opentelemetry.io/collector/processor/xprocessor => ../../processor/xprocessor
102102
- go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper => ../../processor/processorhelper/xprocessorhelper
103+
- go.opentelemetry.io/collector/processor/processorhelper => ../../processor/processorhelper
103104
- go.opentelemetry.io/collector/receiver => ../../receiver
104105
- go.opentelemetry.io/collector/receiver/nopreceiver => ../../receiver/nopreceiver
105106
- go.opentelemetry.io/collector/receiver/receiverhelper => ../../receiver/receiverhelper

‎cmd/otelcorecol/go.mod‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ require (
119119
go.opentelemetry.io/collector/pdata/testdata v0.122.1 // indirect
120120
go.opentelemetry.io/collector/pipeline v0.122.1 // indirect
121121
go.opentelemetry.io/collector/pipeline/xpipeline v0.122.1 // indirect
122+
go.opentelemetry.io/collector/processor/processorhelper v0.0.0-00010101000000-000000000000 // indirect
122123
go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper v0.122.1 // indirect
123124
go.opentelemetry.io/collector/processor/processortest v0.122.1 // indirect
124125
go.opentelemetry.io/collector/processor/xprocessor v0.122.1 // indirect
@@ -292,6 +293,8 @@ replace go.opentelemetry.io/collector/processor/xprocessor => ../../processor/xp
292293

293294
replace go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper => ../../processor/processorhelper/xprocessorhelper
294295

296+
replace go.opentelemetry.io/collector/processor/processorhelper => ../../processor/processorhelper
297+
295298
replace go.opentelemetry.io/collector/receiver => ../../receiver
296299

297300
replace go.opentelemetry.io/collector/receiver/nopreceiver => ../../receiver/nopreceiver

‎processor/go.mod‎

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,36 +5,27 @@ go 1.23.0
55
require (
66
github.com/stretchr/testify v1.10.0
77
go.opentelemetry.io/collector/component v1.28.1
8-
go.opentelemetry.io/collector/component/componenttest v0.122.1
98
go.opentelemetry.io/collector/consumer v1.28.1
109
go.opentelemetry.io/collector/consumer/consumertest v0.122.1
11-
go.opentelemetry.io/collector/pdata v1.28.1
1210
go.opentelemetry.io/collector/pipeline v0.122.1
13-
go.opentelemetry.io/collector/processor/processortest v0.122.1
14-
go.opentelemetry.io/otel v1.35.0
15-
go.opentelemetry.io/otel/metric v1.35.0
16-
go.opentelemetry.io/otel/sdk/metric v1.35.0
17-
go.opentelemetry.io/otel/trace v1.35.0
1811
go.uber.org/goleak v1.3.0
1912
)
2013

2114
require (
2215
github.com/davecgh/go-spew v1.1.1 // indirect
23-
github.com/go-logr/logr v1.4.2 // indirect
24-
github.com/go-logr/stdr v1.2.2 // indirect
2516
github.com/gogo/protobuf v1.3.2 // indirect
26-
github.com/google/uuid v1.6.0 // indirect
2717
github.com/json-iterator/go v1.1.12 // indirect
2818
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
2919
github.com/modern-go/reflect2 v1.0.2 // indirect
3020
github.com/pmezard/go-difflib v1.0.0 // indirect
31-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
32-
go.opentelemetry.io/collector/component/componentstatus v0.122.1 // indirect
21+
github.com/rogpeppe/go-internal v1.13.1 // indirect
3322
go.opentelemetry.io/collector/consumer/xconsumer v0.122.1 // indirect
23+
go.opentelemetry.io/collector/pdata v1.28.1 // indirect
3424
go.opentelemetry.io/collector/pdata/pprofile v0.122.1 // indirect
35-
go.opentelemetry.io/collector/pdata/testdata v0.122.1 // indirect
36-
go.opentelemetry.io/collector/processor/xprocessor v0.122.1 // indirect
37-
go.opentelemetry.io/otel/sdk v1.35.0 // indirect
25+
go.opentelemetry.io/otel v1.35.0 // indirect
26+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
27+
go.opentelemetry.io/otel/sdk/metric v1.35.0 // indirect
28+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
3829
go.uber.org/multierr v1.11.0 // indirect
3930
go.uber.org/zap v1.27.0 // indirect
4031
golang.org/x/net v0.37.0 // indirect
@@ -48,8 +39,6 @@ require (
4839

4940
replace go.opentelemetry.io/collector/component => ../component
5041

51-
replace go.opentelemetry.io/collector/component/componenttest => ../component/componenttest
52-
5342
replace go.opentelemetry.io/collector/consumer => ../consumer
5443

5544
replace go.opentelemetry.io/collector/pdata => ../pdata
@@ -62,10 +51,4 @@ replace go.opentelemetry.io/collector/consumer/xconsumer => ../consumer/xconsume
6251

6352
replace go.opentelemetry.io/collector/consumer/consumertest => ../consumer/consumertest
6453

65-
replace go.opentelemetry.io/collector/component/componentstatus => ../component/componentstatus
66-
67-
replace go.opentelemetry.io/collector/processor/xprocessor => ./xprocessor
68-
6954
replace go.opentelemetry.io/collector/pipeline => ../pipeline
70-
71-
replace go.opentelemetry.io/collector/processor/processortest => ./processortest

‎processor/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.

‎processor/memorylimiterprocessor/go.mod‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ require (
1818
go.opentelemetry.io/collector/pipeline v0.122.1
1919
go.opentelemetry.io/collector/pipeline/xpipeline v0.122.1
2020
go.opentelemetry.io/collector/processor v0.122.1
21+
go.opentelemetry.io/collector/processor/processorhelper v0.0.0-00010101000000-000000000000
2122
go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper v0.122.1
2223
go.opentelemetry.io/collector/processor/processortest v0.122.1
2324
go.opentelemetry.io/collector/processor/xprocessor v0.122.1
@@ -112,4 +113,6 @@ replace go.opentelemetry.io/collector/consumer/consumererror => ../../consumer/c
112113

113114
replace go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper => ../processorhelper/xprocessorhelper
114115

116+
replace go.opentelemetry.io/collector/processor/processorhelper => ../processorhelper
117+
115118
replace go.opentelemetry.io/collector/pipeline/xpipeline => ../../pipeline/xpipeline

‎processor/processorhelper/Makefile‎

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

‎processor/processorhelper/go.mod‎

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

‎processor/processorhelper/go.sum‎

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

0 commit comments

Comments
 (0)