Skip to content

Commit 32abecb

Browse files
jackgopack4mx-psi
andauthored
[chore] move receiver/scrapererror to scraper/scrapererror (#11733)
<!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> #### Description Migrates existing scrapererror code to new scraper package. Sets aliases for receiver/scrapererror so that dependent code in contrib and elsewhere can be updated <!-- Issue number if applicable --> #### Link to tracking issue Relates to #11003 <!--Describe what testing was performed and which tests were added.--> #### Testing included unit/integration tests should suffice <!--Describe the documentation added.--> #### Documentation changelog yaml <!--Please delete paragraphs that you did not use before submitting.--> --------- Co-authored-by: Pablo Baeyens <[email protected]> Co-authored-by: Pablo Baeyens <[email protected]>
1 parent 97929ac commit 32abecb

13 files changed

+57
-8
lines changed
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: receiver/scraper
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Move receiver/scrapererror package to scraper/scrapererror and deprecate original receiver/scrapererror package.
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]

receiver/scrapererror/aliases.go

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
// Copyright The OpenTelemetry Authors
2+
// SPDX-License-Identifier: Apache-2.0
3+
4+
// Package scrapererror provides aliases for package scraper/scrapererror.
5+
// Deprecated: [v0.115.0] Use `scraper/scrapererror` instead.
6+
package scrapererror // import "go.opentelemetry.io/collector/receiver/scrapererror"
7+
8+
import "go.opentelemetry.io/collector/scraper/scrapererror"
9+
10+
type (
11+
ScrapeErrors = scrapererror.ScrapeErrors
12+
PartialScrapeError = scrapererror.PartialScrapeError
13+
)
14+
15+
var (
16+
AddPartial = (*ScrapeErrors).AddPartial
17+
Add = (*ScrapeErrors).Add
18+
Combine = (*ScrapeErrors).Combine
19+
)
20+
21+
var (
22+
NewPartialScrapeError = scrapererror.NewPartialScrapeError
23+
IsPartialScrapeError = scrapererror.IsPartialScrapeError
24+
)

receiver/scraperhelper/obs_metrics.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ import (
1616
"go.opentelemetry.io/collector/pdata/pmetric"
1717
"go.opentelemetry.io/collector/pipeline"
1818
"go.opentelemetry.io/collector/receiver/internal"
19-
"go.opentelemetry.io/collector/receiver/scrapererror"
2019
"go.opentelemetry.io/collector/receiver/scraperhelper/internal/metadata"
2120
"go.opentelemetry.io/collector/scraper"
21+
"go.opentelemetry.io/collector/scraper/scrapererror"
2222
)
2323

2424
const (

receiver/scraperhelper/obs_metrics_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import (
1717
"go.opentelemetry.io/collector/component/componenttest"
1818
"go.opentelemetry.io/collector/pdata/pmetric"
1919
"go.opentelemetry.io/collector/pdata/testdata"
20-
"go.opentelemetry.io/collector/receiver/scrapererror"
2120
"go.opentelemetry.io/collector/scraper"
21+
"go.opentelemetry.io/collector/scraper/scrapererror"
2222
)
2323

2424
var (

receiver/scraperhelper/scrapercontroller.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import (
1616
"go.opentelemetry.io/collector/pdata/pmetric"
1717
"go.opentelemetry.io/collector/receiver"
1818
"go.opentelemetry.io/collector/receiver/receiverhelper"
19-
"go.opentelemetry.io/collector/receiver/scrapererror"
2019
"go.opentelemetry.io/collector/scraper"
20+
"go.opentelemetry.io/collector/scraper/scrapererror"
2121
)
2222

2323
// ScraperControllerOption apply changes to internal options.

receiver/scraperhelper/scrapercontroller_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"go.opentelemetry.io/collector/pdata/pmetric"
2222
"go.opentelemetry.io/collector/receiver"
2323
"go.opentelemetry.io/collector/receiver/receivertest"
24-
"go.opentelemetry.io/collector/receiver/scrapererror"
2524
"go.opentelemetry.io/collector/scraper"
25+
"go.opentelemetry.io/collector/scraper/scrapererror"
2626
)
2727

2828
type testInitialize struct {

scraper/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ require (
99
go.opentelemetry.io/collector/pdata v1.20.0
1010
go.opentelemetry.io/collector/pipeline v0.114.0
1111
go.uber.org/goleak v1.3.0
12+
go.uber.org/multierr v1.11.0
1213
)
1314

1415
require (
@@ -27,7 +28,6 @@ require (
2728
go.opentelemetry.io/otel/sdk v1.32.0 // indirect
2829
go.opentelemetry.io/otel/sdk/metric v1.32.0 // indirect
2930
go.opentelemetry.io/otel/trace v1.32.0 // indirect
30-
go.uber.org/multierr v1.11.0 // indirect
3131
go.uber.org/zap v1.27.0 // indirect
3232
golang.org/x/net v0.28.0 // indirect
3333
golang.org/x/sys v0.27.0 // indirect

receiver/scrapererror/doc.go renamed to scraper/scrapererror/doc.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
// SPDX-License-Identifier: Apache-2.0
33

44
// Package scrapererror provides custom error types for scrapers.
5-
package scrapererror // import "go.opentelemetry.io/collector/receiver/scrapererror"
5+
package scrapererror // import "go.opentelemetry.io/collector/scraper/scrapererror"

receiver/scrapererror/partialscrapeerror.go renamed to scraper/scrapererror/partialscrapeerror.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright The OpenTelemetry Authors
22
// SPDX-License-Identifier: Apache-2.0
33

4-
package scrapererror // import "go.opentelemetry.io/collector/receiver/scrapererror"
4+
package scrapererror // import "go.opentelemetry.io/collector/scraper/scrapererror"
55

66
import "errors"
77

receiver/scrapererror/scrapeerror.go renamed to scraper/scrapererror/scrapeerror.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright The OpenTelemetry Authors
22
// SPDX-License-Identifier: Apache-2.0
33

4-
package scrapererror // import "go.opentelemetry.io/collector/receiver/scrapererror"
4+
package scrapererror // import "go.opentelemetry.io/collector/scraper/scrapererror"
55

66
import (
77
"go.uber.org/multierr"

0 commit comments

Comments
 (0)