Skip to content

Commit af09df1

Browse files
bogdandrutubogdandrutu
authored
Move scraperhelper under scraper in a separate module (#11985)
Fixes #11003 Signed-off-by: Bogdan Drutu <[email protected]>
1 parent 20d9955 commit af09df1

File tree

58 files changed

+380
-66
lines changed

Some content is hidden

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

58 files changed

+380
-66
lines changed

‎.chloggen/mv-scraper-helper.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: deprecation
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
7+
component: scraperhelper
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Move scraperhelper under scraper and in a separate module.
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [11003]
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: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,9 @@ var replaceModules = []string{
8686
"/internal/fanoutconsumer",
8787
"/internal/sharedcomponent",
8888
"/otelcol",
89+
"/pdata",
90+
"/pdata/testdata",
91+
"/pdata/pprofile",
8992
"/pipeline",
9093
"/pipeline/xpipeline",
9194
"/processor",
@@ -98,9 +101,7 @@ var replaceModules = []string{
98101
"/receiver/otlpreceiver",
99102
"/receiver/receivertest",
100103
"/receiver/xreceiver",
101-
"/pdata",
102-
"/pdata/testdata",
103-
"/pdata/pprofile",
104+
"/scraper/scraperhelper",
104105
"/scraper",
105106
"/semconv",
106107
"/service",

‎cmd/builder/test/core.builder.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,6 @@ replaces:
7272
- go.opentelemetry.io/collector/receiver/xreceiver => ${WORKSPACE_DIR}/receiver/xreceiver
7373
- go.opentelemetry.io/collector/receiver/receivertest => ${WORKSPACE_DIR}/receiver/receivertest
7474
- go.opentelemetry.io/collector/scraper => ${WORKSPACE_DIR}/scraper
75+
- go.opentelemetry.io/collector/scraper/scraperhelper => ${WORKSPACE_DIR}/scraper/scraperhelper
7576
- go.opentelemetry.io/collector/semconv => ${WORKSPACE_DIR}/semconv
7677
- go.opentelemetry.io/collector/service => ${WORKSPACE_DIR}/service

‎cmd/mdatagen/go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ require (
5959
go.uber.org/multierr v1.11.0 // indirect
6060
golang.org/x/net v0.33.0 // indirect
6161
golang.org/x/sys v0.28.0 // indirect
62-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
62+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
6363
google.golang.org/grpc v1.69.2 // indirect
6464
google.golang.org/protobuf v1.36.1 // indirect
6565
gopkg.in/yaml.v3 v3.0.1 // indirect
@@ -116,3 +116,5 @@ replace go.opentelemetry.io/collector/processor => ../../processor
116116
replace go.opentelemetry.io/collector/consumer/consumererror => ../../consumer/consumererror
117117

118118
replace go.opentelemetry.io/collector/scraper => ../../scraper
119+
120+
replace go.opentelemetry.io/collector/scraper/scraperhelper => ../../scraper/scraperhelper

‎cmd/mdatagen/go.sum

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

‎cmd/otelcorecol/builder-config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,5 +103,6 @@ replaces:
103103
- go.opentelemetry.io/collector/receiver/receivertest => ../../receiver/receivertest
104104
- go.opentelemetry.io/collector/receiver/xreceiver => ../../receiver/xreceiver
105105
- go.opentelemetry.io/collector/scraper => ../../scraper
106+
- go.opentelemetry.io/collector/scraper/scraperhelper => ../../scraper/scraperhelper
106107
- go.opentelemetry.io/collector/semconv => ../../semconv
107108
- go.opentelemetry.io/collector/service => ../../service

‎cmd/otelcorecol/go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,8 @@ replace go.opentelemetry.io/collector/receiver/xreceiver => ../../receiver/xrece
290290

291291
replace go.opentelemetry.io/collector/scraper => ../../scraper
292292

293+
replace go.opentelemetry.io/collector/scraper/scraperhelper => ../../scraper/scraperhelper
294+
293295
replace go.opentelemetry.io/collector/semconv => ../../semconv
294296

295297
replace go.opentelemetry.io/collector/service => ../../service

‎exporter/debugexporter/go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ require (
6060
go.uber.org/multierr v1.11.0 // indirect
6161
golang.org/x/net v0.33.0 // indirect
6262
golang.org/x/text v0.21.0 // indirect
63-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
63+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
6464
google.golang.org/grpc v1.69.2 // indirect
6565
google.golang.org/protobuf v1.36.1 // indirect
6666
gopkg.in/yaml.v3 v3.0.1 // indirect
@@ -119,3 +119,5 @@ replace go.opentelemetry.io/collector/extension/extensiontest => ../../extension
119119
replace go.opentelemetry.io/collector/scraper => ../../scraper
120120

121121
replace go.opentelemetry.io/collector/featuregate => ../../featuregate
122+
123+
replace go.opentelemetry.io/collector/scraper/scraperhelper => ../../scraper/scraperhelper

‎exporter/debugexporter/go.sum

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

‎exporter/exporterhelper/xexporterhelper/go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ require (
5151
golang.org/x/net v0.33.0 // indirect
5252
golang.org/x/sys v0.28.0 // indirect
5353
golang.org/x/text v0.21.0 // indirect
54-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
54+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
5555
google.golang.org/grpc v1.69.2 // indirect
5656
google.golang.org/protobuf v1.36.1 // indirect
5757
gopkg.in/yaml.v3 v3.0.1 // indirect
@@ -106,3 +106,5 @@ replace go.opentelemetry.io/collector/extension/extensiontest => ../../../extens
106106
replace go.opentelemetry.io/collector/scraper => ../../../scraper
107107

108108
replace go.opentelemetry.io/collector/featuregate => ../../../featuregate
109+
110+
replace go.opentelemetry.io/collector/scraper/scraperhelper => ../../../scraper/scraperhelper

‎exporter/exporterhelper/xexporterhelper/go.sum

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

‎exporter/exportertest/go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ require (
4848
golang.org/x/net v0.33.0 // indirect
4949
golang.org/x/sys v0.28.0 // indirect
5050
golang.org/x/text v0.21.0 // indirect
51-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
51+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
5252
google.golang.org/protobuf v1.36.1 // indirect
5353
gopkg.in/yaml.v3 v3.0.1 // indirect
5454
)
@@ -96,3 +96,5 @@ replace go.opentelemetry.io/collector/extension/extensiontest => ../../extension
9696
replace go.opentelemetry.io/collector/scraper => ../../scraper
9797

9898
replace go.opentelemetry.io/collector/featuregate => ../../featuregate
99+
100+
replace go.opentelemetry.io/collector/scraper/scraperhelper => ../../scraper/scraperhelper

‎exporter/exportertest/go.sum

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

‎exporter/go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ require (
5050
golang.org/x/net v0.33.0 // indirect
5151
golang.org/x/sys v0.28.0 // indirect
5252
golang.org/x/text v0.21.0 // indirect
53-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
53+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
5454
google.golang.org/grpc v1.69.2 // indirect
5555
google.golang.org/protobuf v1.36.1 // indirect
5656
gopkg.in/yaml.v3 v3.0.1 // indirect
@@ -101,3 +101,5 @@ replace go.opentelemetry.io/collector/extension/extensiontest => ../extension/ex
101101
replace go.opentelemetry.io/collector/scraper => ../scraper
102102

103103
replace go.opentelemetry.io/collector/featuregate => ../featuregate
104+
105+
replace go.opentelemetry.io/collector/scraper/scraperhelper => ../scraper/scraperhelper

‎exporter/go.sum

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

‎exporter/nopexporter/go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ require (
5050
golang.org/x/net v0.33.0 // indirect
5151
golang.org/x/sys v0.28.0 // indirect
5252
golang.org/x/text v0.21.0 // indirect
53-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
53+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
5454
google.golang.org/grpc v1.69.2 // indirect
5555
google.golang.org/protobuf v1.36.1 // indirect
5656
gopkg.in/yaml.v3 v3.0.1 // indirect
@@ -103,3 +103,5 @@ replace go.opentelemetry.io/collector/extension/extensiontest => ../../extension
103103
replace go.opentelemetry.io/collector/scraper => ../../scraper
104104

105105
replace go.opentelemetry.io/collector/featuregate => ../../featuregate
106+
107+
replace go.opentelemetry.io/collector/scraper/scraperhelper => ../../scraper/scraperhelper

‎exporter/nopexporter/go.sum

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

‎exporter/otlpexporter/go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ require (
2525
go.opentelemetry.io/collector/pdata/testdata v0.116.0
2626
go.uber.org/goleak v1.3.0
2727
go.uber.org/zap v1.27.0
28-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53
28+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28
2929
google.golang.org/grpc v1.69.2
3030
google.golang.org/protobuf v1.36.1
3131
)
@@ -158,3 +158,5 @@ replace go.opentelemetry.io/collector/extension/auth/authtest => ../../extension
158158
replace go.opentelemetry.io/collector/scraper => ../../scraper
159159

160160
replace go.opentelemetry.io/collector/featuregate => ../../featuregate
161+
162+
replace go.opentelemetry.io/collector/scraper/scraperhelper => ../../scraper/scraperhelper

‎exporter/otlpexporter/go.sum

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

‎exporter/otlphttpexporter/go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ require (
2323
go.opentelemetry.io/collector/pdata/pprofile v0.116.0
2424
go.uber.org/goleak v1.3.0
2525
go.uber.org/zap v1.27.0
26-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53
26+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28
2727
google.golang.org/grpc v1.69.2
2828
google.golang.org/protobuf v1.36.1
2929
)
@@ -156,3 +156,5 @@ replace go.opentelemetry.io/collector/extension/auth/authtest => ../../extension
156156
replace go.opentelemetry.io/collector/scraper => ../../scraper
157157

158158
replace go.opentelemetry.io/collector/featuregate => ../../featuregate
159+
160+
replace go.opentelemetry.io/collector/scraper/scraperhelper => ../../scraper/scraperhelper

‎exporter/otlphttpexporter/go.sum

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

‎exporter/xexporter/go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ require (
3030
golang.org/x/net v0.33.0 // indirect
3131
golang.org/x/sys v0.28.0 // indirect
3232
golang.org/x/text v0.21.0 // indirect
33-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
33+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
3434
google.golang.org/grpc v1.69.2 // indirect
3535
google.golang.org/protobuf v1.36.1 // indirect
3636
gopkg.in/yaml.v3 v3.0.1 // indirect
@@ -79,3 +79,5 @@ replace go.opentelemetry.io/collector/extension/extensiontest => ../../extension
7979
replace go.opentelemetry.io/collector/scraper => ../../scraper
8080

8181
replace go.opentelemetry.io/collector/featuregate => ../../featuregate
82+
83+
replace go.opentelemetry.io/collector/scraper/scraperhelper => ../../scraper/scraperhelper

0 commit comments

Comments
 (0)