Skip to content

Commit

Permalink
Remove the deprecated receiver/scraperhelper package (#12054)
Browse files Browse the repository at this point in the history
<!--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]>
  • Loading branch information
sincejune and codeboten authored Jan 9, 2025
1 parent 0ece678 commit 3132112
Show file tree
Hide file tree
Showing 23 changed files with 25 additions and 109 deletions.
25 changes: 25 additions & 0 deletions .chloggen/remove-receiver-scraperhelper.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: breaking

# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
component: receiver/scraperhelper

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Removing the deprecated receiver/scraperhelper package

# One or more tracking issues or pull requests related to the change
issues: [12054]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:

# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: [api]
2 changes: 0 additions & 2 deletions cmd/builder/internal/builder/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,6 @@ var replaceModules = []string{
"/receiver/otlpreceiver",
"/receiver/receivertest",
"/receiver/xreceiver",
"/scraper/scraperhelper",
"/scraper",
"/semconv",
"/service",
}
Expand Down
4 changes: 0 additions & 4 deletions cmd/mdatagen/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,3 @@ replace go.opentelemetry.io/collector/component/componentstatus => ../../compone
replace go.opentelemetry.io/collector/processor => ../../processor

replace go.opentelemetry.io/collector/consumer/consumererror => ../../consumer/consumererror

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

replace go.opentelemetry.io/collector/scraper/scraperhelper => ../../scraper/scraperhelper
2 changes: 0 additions & 2 deletions cmd/otelcorecol/builder-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,5 @@ replaces:
- go.opentelemetry.io/collector/receiver/otlpreceiver => ../../receiver/otlpreceiver
- go.opentelemetry.io/collector/receiver/receivertest => ../../receiver/receivertest
- go.opentelemetry.io/collector/receiver/xreceiver => ../../receiver/xreceiver
- go.opentelemetry.io/collector/scraper => ../../scraper
- go.opentelemetry.io/collector/scraper/scraperhelper => ../../scraper/scraperhelper
- go.opentelemetry.io/collector/semconv => ../../semconv
- go.opentelemetry.io/collector/service => ../../service
4 changes: 0 additions & 4 deletions cmd/otelcorecol/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -288,10 +288,6 @@ replace go.opentelemetry.io/collector/receiver/receivertest => ../../receiver/re

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

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

replace go.opentelemetry.io/collector/scraper/scraperhelper => ../../scraper/scraperhelper

replace go.opentelemetry.io/collector/semconv => ../../semconv

replace go.opentelemetry.io/collector/service => ../../service
4 changes: 0 additions & 4 deletions exporter/debugexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,6 @@ replace go.opentelemetry.io/collector/consumer/consumererror => ../../consumer/c

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

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

replace go.opentelemetry.io/collector/featuregate => ../../featuregate

replace go.opentelemetry.io/collector/scraper/scraperhelper => ../../scraper/scraperhelper

replace go.opentelemetry.io/collector/extension/xextension => ../../extension/xextension
4 changes: 0 additions & 4 deletions exporter/exporterhelper/xexporterhelper/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,6 @@ replace go.opentelemetry.io/collector/consumer/consumererror => ../../../consume

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

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

replace go.opentelemetry.io/collector/featuregate => ../../../featuregate

replace go.opentelemetry.io/collector/scraper/scraperhelper => ../../../scraper/scraperhelper

replace go.opentelemetry.io/collector/extension/xextension => ../../../extension/xextension
4 changes: 0 additions & 4 deletions exporter/exportertest/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,6 @@ replace go.opentelemetry.io/collector/consumer/consumererror => ../../consumer/c

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

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

replace go.opentelemetry.io/collector/featuregate => ../../featuregate

replace go.opentelemetry.io/collector/scraper/scraperhelper => ../../scraper/scraperhelper

replace go.opentelemetry.io/collector/extension/xextension => ../../extension/xextension
4 changes: 0 additions & 4 deletions exporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,6 @@ replace go.opentelemetry.io/collector/consumer/consumererror => ../consumer/cons

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

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

replace go.opentelemetry.io/collector/featuregate => ../featuregate

replace go.opentelemetry.io/collector/scraper/scraperhelper => ../scraper/scraperhelper

replace go.opentelemetry.io/collector/extension/xextension => ../extension/xextension
4 changes: 0 additions & 4 deletions exporter/nopexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,6 @@ replace go.opentelemetry.io/collector/consumer/consumererror => ../../consumer/c

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

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

replace go.opentelemetry.io/collector/featuregate => ../../featuregate

replace go.opentelemetry.io/collector/scraper/scraperhelper => ../../scraper/scraperhelper

replace go.opentelemetry.io/collector/extension/xextension => ../../extension/xextension
4 changes: 0 additions & 4 deletions exporter/otlpexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -153,10 +153,6 @@ replace go.opentelemetry.io/collector/extension/extensiontest => ../../extension

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

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

replace go.opentelemetry.io/collector/featuregate => ../../featuregate

replace go.opentelemetry.io/collector/scraper/scraperhelper => ../../scraper/scraperhelper

replace go.opentelemetry.io/collector/extension/xextension => ../../extension/xextension
4 changes: 0 additions & 4 deletions exporter/otlphttpexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -151,10 +151,6 @@ replace go.opentelemetry.io/collector/extension/extensiontest => ../../extension

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

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

replace go.opentelemetry.io/collector/featuregate => ../../featuregate

replace go.opentelemetry.io/collector/scraper/scraperhelper => ../../scraper/scraperhelper

replace go.opentelemetry.io/collector/extension/xextension => ../../extension/xextension
4 changes: 0 additions & 4 deletions exporter/xexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,6 @@ replace go.opentelemetry.io/collector/receiver/receivertest => ../../receiver/re

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

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

replace go.opentelemetry.io/collector/featuregate => ../../featuregate

replace go.opentelemetry.io/collector/scraper/scraperhelper => ../../scraper/scraperhelper

replace go.opentelemetry.io/collector/extension/xextension => ../../extension/xextension
4 changes: 0 additions & 4 deletions internal/e2e/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -239,8 +239,4 @@ replace go.opentelemetry.io/collector/extension/extensiontest => ../../extension

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

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

replace go.opentelemetry.io/collector/scraper/scraperhelper => ../../scraper/scraperhelper

replace go.opentelemetry.io/collector/extension/xextension => ../../extension/xextension
4 changes: 0 additions & 4 deletions otelcol/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -201,8 +201,4 @@ replace go.opentelemetry.io/collector/extension/extensiontest => ../extension/ex

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

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

replace go.opentelemetry.io/collector/scraper/scraperhelper => ../scraper/scraperhelper

replace go.opentelemetry.io/collector/extension/xextension => ../extension/xextension
4 changes: 0 additions & 4 deletions otelcol/otelcoltest/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,4 @@ replace go.opentelemetry.io/collector/extension/extensiontest => ../../extension

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

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

replace go.opentelemetry.io/collector/scraper/scraperhelper => ../../scraper/scraperhelper

replace go.opentelemetry.io/collector/extension/xextension => ../../extension/xextension
6 changes: 0 additions & 6 deletions receiver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ require (
go.opentelemetry.io/collector/consumer/consumertest v0.117.0
go.opentelemetry.io/collector/pipeline v0.117.0
go.opentelemetry.io/collector/receiver/receivertest v0.117.0
go.opentelemetry.io/collector/scraper/scraperhelper v0.117.0
go.opentelemetry.io/otel v1.32.0
go.opentelemetry.io/otel/metric v1.32.0
go.opentelemetry.io/otel/sdk/metric v1.32.0
Expand All @@ -34,7 +33,6 @@ require (
go.opentelemetry.io/collector/pdata v1.23.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.117.0 // indirect
go.opentelemetry.io/collector/receiver/xreceiver v0.117.0 // indirect
go.opentelemetry.io/collector/scraper v0.117.0 // indirect
go.opentelemetry.io/otel/sdk v1.32.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
Expand Down Expand Up @@ -74,7 +72,3 @@ retract v0.76.0 // Depends on retracted pdata v1.0.0-rc10 module
replace go.opentelemetry.io/collector/pipeline => ../pipeline

replace go.opentelemetry.io/collector/consumer/consumererror => ../consumer/consumererror

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

replace go.opentelemetry.io/collector/scraper/scraperhelper => ../scraper/scraperhelper
4 changes: 0 additions & 4 deletions receiver/nopreceiver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,3 @@ replace go.opentelemetry.io/collector/receiver/receivertest => ../receivertest
replace go.opentelemetry.io/collector/pipeline => ../../pipeline

replace go.opentelemetry.io/collector/consumer/consumererror => ../../consumer/consumererror

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

replace go.opentelemetry.io/collector/scraper/scraperhelper => ../../scraper/scraperhelper
4 changes: 0 additions & 4 deletions receiver/otlpreceiver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,3 @@ retract (
)

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

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

replace go.opentelemetry.io/collector/scraper/scraperhelper => ../../scraper/scraperhelper
4 changes: 0 additions & 4 deletions receiver/receivertest/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,3 @@ replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile
replace go.opentelemetry.io/collector/pdata => ../../pdata

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

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

replace go.opentelemetry.io/collector/scraper/scraperhelper => ../../scraper/scraperhelper
27 changes: 0 additions & 27 deletions receiver/scraperhelper/alias.go

This file was deleted.

4 changes: 0 additions & 4 deletions receiver/xreceiver/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,3 @@ replace go.opentelemetry.io/collector/pipeline => ../../pipeline
replace go.opentelemetry.io/collector/consumer/consumererror => ../../consumer/consumererror

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

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

replace go.opentelemetry.io/collector/scraper/scraperhelper => ../../scraper/scraperhelper
4 changes: 0 additions & 4 deletions service/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,4 @@ replace go.opentelemetry.io/collector/extension/extensiontest => ../extension/ex

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

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

replace go.opentelemetry.io/collector/scraper/scraperhelper => ../scraper/scraperhelper

replace go.opentelemetry.io/collector/extension/xextension => ../extension/xextension

0 comments on commit 3132112

Please sign in to comment.