Skip to content

Commit 3132112

Browse files
sincejunecodeboten
andauthored
Remove the deprecated receiver/scraperhelper package (#12054)
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description Removing the deprecated receiver/scraperhelper package <!-- Issue number if applicable --> #### Link to tracking issue blocked by #12055 <!--Describe what testing was performed and which tests were added.--> #### Testing n/a <!--Describe the documentation added.--> #### Documentation Added <!--Please delete paragraphs that you did not use before submitting.--> --------- Co-authored-by: Alex Boten <[email protected]>
1 parent 0ece678 commit 3132112

File tree

23 files changed

+25
-109
lines changed

23 files changed

+25
-109
lines changed
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: breaking
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
7+
component: receiver/scraperhelper
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Removing the deprecated receiver/scraperhelper package
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [12054]
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: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,6 @@ var replaceModules = []string{
101101
"/receiver/otlpreceiver",
102102
"/receiver/receivertest",
103103
"/receiver/xreceiver",
104-
"/scraper/scraperhelper",
105-
"/scraper",
106104
"/semconv",
107105
"/service",
108106
}

cmd/mdatagen/go.mod

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,3 @@ replace go.opentelemetry.io/collector/component/componentstatus => ../../compone
114114
replace go.opentelemetry.io/collector/processor => ../../processor
115115

116116
replace go.opentelemetry.io/collector/consumer/consumererror => ../../consumer/consumererror
117-
118-
replace go.opentelemetry.io/collector/scraper => ../../scraper
119-
120-
replace go.opentelemetry.io/collector/scraper/scraperhelper => ../../scraper/scraperhelper

cmd/otelcorecol/builder-config.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,5 @@ replaces:
102102
- go.opentelemetry.io/collector/receiver/otlpreceiver => ../../receiver/otlpreceiver
103103
- go.opentelemetry.io/collector/receiver/receivertest => ../../receiver/receivertest
104104
- go.opentelemetry.io/collector/receiver/xreceiver => ../../receiver/xreceiver
105-
- go.opentelemetry.io/collector/scraper => ../../scraper
106-
- go.opentelemetry.io/collector/scraper/scraperhelper => ../../scraper/scraperhelper
107105
- go.opentelemetry.io/collector/semconv => ../../semconv
108106
- go.opentelemetry.io/collector/service => ../../service

cmd/otelcorecol/go.mod

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -288,10 +288,6 @@ replace go.opentelemetry.io/collector/receiver/receivertest => ../../receiver/re
288288

289289
replace go.opentelemetry.io/collector/receiver/xreceiver => ../../receiver/xreceiver
290290

291-
replace go.opentelemetry.io/collector/scraper => ../../scraper
292-
293-
replace go.opentelemetry.io/collector/scraper/scraperhelper => ../../scraper/scraperhelper
294-
295291
replace go.opentelemetry.io/collector/semconv => ../../semconv
296292

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

exporter/debugexporter/go.mod

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,6 @@ replace go.opentelemetry.io/collector/consumer/consumererror => ../../consumer/c
114114

115115
replace go.opentelemetry.io/collector/extension/extensiontest => ../../extension/extensiontest
116116

117-
replace go.opentelemetry.io/collector/scraper => ../../scraper
118-
119117
replace go.opentelemetry.io/collector/featuregate => ../../featuregate
120118

121-
replace go.opentelemetry.io/collector/scraper/scraperhelper => ../../scraper/scraperhelper
122-
123119
replace go.opentelemetry.io/collector/extension/xextension => ../../extension/xextension

exporter/exporterhelper/xexporterhelper/go.mod

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,6 @@ replace go.opentelemetry.io/collector/consumer/consumererror => ../../../consume
101101

102102
replace go.opentelemetry.io/collector/extension/extensiontest => ../../../extension/extensiontest
103103

104-
replace go.opentelemetry.io/collector/scraper => ../../../scraper
105-
106104
replace go.opentelemetry.io/collector/featuregate => ../../../featuregate
107105

108-
replace go.opentelemetry.io/collector/scraper/scraperhelper => ../../../scraper/scraperhelper
109-
110106
replace go.opentelemetry.io/collector/extension/xextension => ../../../extension/xextension

exporter/exportertest/go.mod

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,6 @@ replace go.opentelemetry.io/collector/consumer/consumererror => ../../consumer/c
9191

9292
replace go.opentelemetry.io/collector/extension/extensiontest => ../../extension/extensiontest
9393

94-
replace go.opentelemetry.io/collector/scraper => ../../scraper
95-
9694
replace go.opentelemetry.io/collector/featuregate => ../../featuregate
9795

98-
replace go.opentelemetry.io/collector/scraper/scraperhelper => ../../scraper/scraperhelper
99-
10096
replace go.opentelemetry.io/collector/extension/xextension => ../../extension/xextension

exporter/go.mod

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,6 @@ replace go.opentelemetry.io/collector/consumer/consumererror => ../consumer/cons
9696

9797
replace go.opentelemetry.io/collector/extension/extensiontest => ../extension/extensiontest
9898

99-
replace go.opentelemetry.io/collector/scraper => ../scraper
100-
10199
replace go.opentelemetry.io/collector/featuregate => ../featuregate
102100

103-
replace go.opentelemetry.io/collector/scraper/scraperhelper => ../scraper/scraperhelper
104-
105101
replace go.opentelemetry.io/collector/extension/xextension => ../extension/xextension

exporter/nopexporter/go.mod

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,6 @@ replace go.opentelemetry.io/collector/consumer/consumererror => ../../consumer/c
9898

9999
replace go.opentelemetry.io/collector/extension/extensiontest => ../../extension/extensiontest
100100

101-
replace go.opentelemetry.io/collector/scraper => ../../scraper
102-
103101
replace go.opentelemetry.io/collector/featuregate => ../../featuregate
104102

105-
replace go.opentelemetry.io/collector/scraper/scraperhelper => ../../scraper/scraperhelper
106-
107103
replace go.opentelemetry.io/collector/extension/xextension => ../../extension/xextension

exporter/otlpexporter/go.mod

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,10 +153,6 @@ replace go.opentelemetry.io/collector/extension/extensiontest => ../../extension
153153

154154
replace go.opentelemetry.io/collector/extension/auth/authtest => ../../extension/auth/authtest
155155

156-
replace go.opentelemetry.io/collector/scraper => ../../scraper
157-
158156
replace go.opentelemetry.io/collector/featuregate => ../../featuregate
159157

160-
replace go.opentelemetry.io/collector/scraper/scraperhelper => ../../scraper/scraperhelper
161-
162158
replace go.opentelemetry.io/collector/extension/xextension => ../../extension/xextension

exporter/otlphttpexporter/go.mod

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,6 @@ replace go.opentelemetry.io/collector/extension/extensiontest => ../../extension
151151

152152
replace go.opentelemetry.io/collector/extension/auth/authtest => ../../extension/auth/authtest
153153

154-
replace go.opentelemetry.io/collector/scraper => ../../scraper
155-
156154
replace go.opentelemetry.io/collector/featuregate => ../../featuregate
157155

158-
replace go.opentelemetry.io/collector/scraper/scraperhelper => ../../scraper/scraperhelper
159-
160156
replace go.opentelemetry.io/collector/extension/xextension => ../../extension/xextension

exporter/xexporter/go.mod

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,6 @@ replace go.opentelemetry.io/collector/receiver/receivertest => ../../receiver/re
7474

7575
replace go.opentelemetry.io/collector/extension/extensiontest => ../../extension/extensiontest
7676

77-
replace go.opentelemetry.io/collector/scraper => ../../scraper
78-
7977
replace go.opentelemetry.io/collector/featuregate => ../../featuregate
8078

81-
replace go.opentelemetry.io/collector/scraper/scraperhelper => ../../scraper/scraperhelper
82-
8379
replace go.opentelemetry.io/collector/extension/xextension => ../../extension/xextension

internal/e2e/go.mod

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,4 @@ replace go.opentelemetry.io/collector/extension/extensiontest => ../../extension
239239

240240
replace go.opentelemetry.io/collector/extension/auth/authtest => ../../extension/auth/authtest
241241

242-
replace go.opentelemetry.io/collector/scraper => ../../scraper
243-
244-
replace go.opentelemetry.io/collector/scraper/scraperhelper => ../../scraper/scraperhelper
245-
246242
replace go.opentelemetry.io/collector/extension/xextension => ../../extension/xextension

otelcol/go.mod

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,4 @@ replace go.opentelemetry.io/collector/extension/extensiontest => ../extension/ex
201201

202202
replace go.opentelemetry.io/collector/extension/auth/authtest => ../extension/auth/authtest
203203

204-
replace go.opentelemetry.io/collector/scraper => ../scraper
205-
206-
replace go.opentelemetry.io/collector/scraper/scraperhelper => ../scraper/scraperhelper
207-
208204
replace go.opentelemetry.io/collector/extension/xextension => ../extension/xextension

otelcol/otelcoltest/go.mod

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -216,8 +216,4 @@ replace go.opentelemetry.io/collector/extension/extensiontest => ../../extension
216216

217217
replace go.opentelemetry.io/collector/extension/auth/authtest => ../../extension/auth/authtest
218218

219-
replace go.opentelemetry.io/collector/scraper => ../../scraper
220-
221-
replace go.opentelemetry.io/collector/scraper/scraperhelper => ../../scraper/scraperhelper
222-
223219
replace go.opentelemetry.io/collector/extension/xextension => ../../extension/xextension

receiver/go.mod

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ require (
1111
go.opentelemetry.io/collector/consumer/consumertest v0.117.0
1212
go.opentelemetry.io/collector/pipeline v0.117.0
1313
go.opentelemetry.io/collector/receiver/receivertest v0.117.0
14-
go.opentelemetry.io/collector/scraper/scraperhelper v0.117.0
1514
go.opentelemetry.io/otel v1.32.0
1615
go.opentelemetry.io/otel/metric v1.32.0
1716
go.opentelemetry.io/otel/sdk/metric v1.32.0
@@ -34,7 +33,6 @@ require (
3433
go.opentelemetry.io/collector/pdata v1.23.0 // indirect
3534
go.opentelemetry.io/collector/pdata/pprofile v0.117.0 // indirect
3635
go.opentelemetry.io/collector/receiver/xreceiver v0.117.0 // indirect
37-
go.opentelemetry.io/collector/scraper v0.117.0 // indirect
3836
go.opentelemetry.io/otel/sdk v1.32.0 // indirect
3937
go.uber.org/multierr v1.11.0 // indirect
4038
go.uber.org/zap v1.27.0 // indirect
@@ -74,7 +72,3 @@ retract v0.76.0 // Depends on retracted pdata v1.0.0-rc10 module
7472
replace go.opentelemetry.io/collector/pipeline => ../pipeline
7573

7674
replace go.opentelemetry.io/collector/consumer/consumererror => ../consumer/consumererror
77-
78-
replace go.opentelemetry.io/collector/scraper => ../scraper
79-
80-
replace go.opentelemetry.io/collector/scraper/scraperhelper => ../scraper/scraperhelper

receiver/nopreceiver/go.mod

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,3 @@ replace go.opentelemetry.io/collector/receiver/receivertest => ../receivertest
8282
replace go.opentelemetry.io/collector/pipeline => ../../pipeline
8383

8484
replace go.opentelemetry.io/collector/consumer/consumererror => ../../consumer/consumererror
85-
86-
replace go.opentelemetry.io/collector/scraper => ../../scraper
87-
88-
replace go.opentelemetry.io/collector/scraper/scraperhelper => ../../scraper/scraperhelper

receiver/otlpreceiver/go.mod

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,3 @@ retract (
138138
)
139139

140140
replace go.opentelemetry.io/collector/extension/auth/authtest => ../../extension/auth/authtest
141-
142-
replace go.opentelemetry.io/collector/scraper => ../../scraper
143-
144-
replace go.opentelemetry.io/collector/scraper/scraperhelper => ../../scraper/scraperhelper

receiver/receivertest/go.mod

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,3 @@ replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile
7070
replace go.opentelemetry.io/collector/pdata => ../../pdata
7171

7272
replace go.opentelemetry.io/collector/consumer/consumertest => ../../consumer/consumertest
73-
74-
replace go.opentelemetry.io/collector/scraper => ../../scraper
75-
76-
replace go.opentelemetry.io/collector/scraper/scraperhelper => ../../scraper/scraperhelper

receiver/scraperhelper/alias.go

Lines changed: 0 additions & 27 deletions
This file was deleted.

receiver/xreceiver/go.mod

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,3 @@ replace go.opentelemetry.io/collector/pipeline => ../../pipeline
6161
replace go.opentelemetry.io/collector/consumer/consumererror => ../../consumer/consumererror
6262

6363
replace go.opentelemetry.io/collector/receiver/receivertest => ../receivertest
64-
65-
replace go.opentelemetry.io/collector/scraper => ../../scraper
66-
67-
replace go.opentelemetry.io/collector/scraper/scraperhelper => ../../scraper/scraperhelper

service/go.mod

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,4 @@ replace go.opentelemetry.io/collector/extension/extensiontest => ../extension/ex
210210

211211
replace go.opentelemetry.io/collector/extension/auth/authtest => ../extension/auth/authtest
212212

213-
replace go.opentelemetry.io/collector/scraper => ../scraper
214-
215-
replace go.opentelemetry.io/collector/scraper/scraperhelper => ../scraper/scraperhelper
216-
217213
replace go.opentelemetry.io/collector/extension/xextension => ../extension/xextension

0 commit comments

Comments
 (0)