Skip to content

Commit

Permalink
[chore] Use pseudo-versions to require componenttest (#11668)
Browse files Browse the repository at this point in the history 
#### Description

My previous PR (#11615) which made `component/componenttest` into its
own module tagged it as `v0.113.0` in the requirements of other modules.
This works locally because of the `replace` statements, but since the
module was never _actually_ released as v0.113.0, this causes issues in
contrib (cf. #11509 and #11511).

This PR updates those requirements to use a pseudo-version pointing at a
recent commit on main, which should be properly externally resolvable.

#### Link to tracking issue
None.

#### Testing
I removed the `replace` statements for `componenttest`, ran `make
gotidy`, which allowed `make otelcorecol` to run successfully. Not sure
if this is a thorough enough test however. Once this PR is merged, I
will try `make update-otel [...]` on contrib with the appropriate commit
ID to check that the issue is resolved.
  • Loading branch information
@jade-guiton-dd
jade-guiton-dd authored Nov 13, 2024
1 parent 168a881 commit 115568a
Show file tree
Hide file tree
Showing 31 changed files with 31 additions and 31 deletions.
2 changes: 1 addition & 1 deletion cmd/mdatagen/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require (
github.com/spf13/cobra v1.8.1
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.0.0-20241112045949-9c4c007a12b4
go.opentelemetry.io/collector/config/configtelemetry v0.113.0
go.opentelemetry.io/collector/confmap v1.19.0
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.19.0
Expand Down
2 changes: 1 addition & 1 deletion cmd/otelcorecol/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ require (
go.opentelemetry.io/collector v0.113.0 // indirect
go.opentelemetry.io/collector/client v1.19.0 // indirect
go.opentelemetry.io/collector/component/componentstatus v0.113.0 // indirect
go.opentelemetry.io/collector/component/componenttest v0.113.0 // indirect
go.opentelemetry.io/collector/component/componenttest v0.0.0-20241112045949-9c4c007a12b4 // indirect
go.opentelemetry.io/collector/config/configauth v0.113.0 // indirect
go.opentelemetry.io/collector/config/configcompression v1.19.0 // indirect
go.opentelemetry.io/collector/config/configgrpc v0.113.0 // indirect
Expand Down
2 changes: 1 addition & 1 deletion config/configgrpc/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require (
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/client v1.19.0
go.opentelemetry.io/collector/component v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.0.0-20241112045949-9c4c007a12b4
go.opentelemetry.io/collector/config/configauth v0.113.0
go.opentelemetry.io/collector/config/configcompression v1.19.0
go.opentelemetry.io/collector/config/confignet v1.19.0
Expand Down
2 changes: 1 addition & 1 deletion config/confighttp/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/client v1.19.0
go.opentelemetry.io/collector/component v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.0.0-20241112045949-9c4c007a12b4
go.opentelemetry.io/collector/config/configauth v0.113.0
go.opentelemetry.io/collector/config/configcompression v1.19.0
go.opentelemetry.io/collector/config/configopaque v1.19.0
Expand Down
2 changes: 1 addition & 1 deletion connector/connectortest/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/google/uuid v1.6.0
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.0.0-20241112045949-9c4c007a12b4
go.opentelemetry.io/collector/connector v0.113.0
go.opentelemetry.io/collector/connector/connectorprofiles v0.113.0
go.opentelemetry.io/collector/consumer v0.113.0
Expand Down
2 changes: 1 addition & 1 deletion connector/forwardconnector/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.22.0
require (
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.0.0-20241112045949-9c4c007a12b4
go.opentelemetry.io/collector/confmap v1.19.0
go.opentelemetry.io/collector/connector v0.113.0
go.opentelemetry.io/collector/connector/connectortest v0.113.0
Expand Down
2 changes: 1 addition & 1 deletion exporter/debugexporter/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.22.0
require (
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.0.0-20241112045949-9c4c007a12b4
go.opentelemetry.io/collector/config/configtelemetry v0.113.0
go.opentelemetry.io/collector/confmap v1.19.0
go.opentelemetry.io/collector/consumer v0.113.0
Expand Down
2 changes: 1 addition & 1 deletion exporter/exporterhelper/exporterhelperprofiles/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.22.0
require (
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.0.0-20241112045949-9c4c007a12b4
go.opentelemetry.io/collector/config/configretry v1.19.0
go.opentelemetry.io/collector/consumer v0.113.0
go.opentelemetry.io/collector/consumer/consumererror v0.113.0
Expand Down
2 changes: 1 addition & 1 deletion exporter/exportertest/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/google/uuid v1.6.0
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.0.0-20241112045949-9c4c007a12b4
go.opentelemetry.io/collector/config/configretry v1.19.0
go.opentelemetry.io/collector/consumer v0.113.0
go.opentelemetry.io/collector/consumer/consumererror v0.113.0
Expand Down
2 changes: 1 addition & 1 deletion exporter/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/cenkalti/backoff/v4 v4.3.0
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.0.0-20241112045949-9c4c007a12b4
go.opentelemetry.io/collector/config/configretry v1.19.0
go.opentelemetry.io/collector/config/configtelemetry v0.113.0
go.opentelemetry.io/collector/consumer v0.113.0
Expand Down
2 changes: 1 addition & 1 deletion exporter/nopexporter/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.22.0
require (
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.0.0-20241112045949-9c4c007a12b4
go.opentelemetry.io/collector/confmap v1.19.0
go.opentelemetry.io/collector/consumer/consumertest v0.113.0
go.opentelemetry.io/collector/exporter v0.113.0
Expand Down
2 changes: 1 addition & 1 deletion exporter/otlpexporter/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector v0.113.0
go.opentelemetry.io/collector/component v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.0.0-20241112045949-9c4c007a12b4
go.opentelemetry.io/collector/config/configauth v0.113.0
go.opentelemetry.io/collector/config/configcompression v1.19.0
go.opentelemetry.io/collector/config/configgrpc v0.113.0
Expand Down
2 changes: 1 addition & 1 deletion exporter/otlphttpexporter/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector v0.113.0
go.opentelemetry.io/collector/component v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.0.0-20241112045949-9c4c007a12b4
go.opentelemetry.io/collector/config/configcompression v1.19.0
go.opentelemetry.io/collector/config/confighttp v0.113.0
go.opentelemetry.io/collector/config/configopaque v1.19.0
Expand Down
2 changes: 1 addition & 1 deletion extension/auth/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.22.0
require (
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.0.0-20241112045949-9c4c007a12b4
go.opentelemetry.io/collector/extension v0.113.0
go.uber.org/goleak v1.3.0
google.golang.org/grpc v1.67.1
Expand Down
2 changes: 1 addition & 1 deletion extension/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/google/uuid v1.6.0
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.0.0-20241112045949-9c4c007a12b4
go.uber.org/goleak v1.3.0
)

Expand Down
2 changes: 1 addition & 1 deletion extension/memorylimiterextension/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.22.0
require (
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.0.0-20241112045949-9c4c007a12b4
go.opentelemetry.io/collector/confmap v1.19.0
go.opentelemetry.io/collector/extension v0.113.0
go.opentelemetry.io/collector/internal/memorylimiter v0.113.0
Expand Down
2 changes: 1 addition & 1 deletion extension/zpagesextension/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require (
go.opentelemetry.io/collector v0.113.0
go.opentelemetry.io/collector/component v0.113.0
go.opentelemetry.io/collector/component/componentstatus v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.0.0-20241112045949-9c4c007a12b4
go.opentelemetry.io/collector/config/configauth v0.113.0
go.opentelemetry.io/collector/config/confighttp v0.113.0
go.opentelemetry.io/collector/confmap v1.19.0
Expand Down
2 changes: 1 addition & 1 deletion internal/e2e/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require (
go.opentelemetry.io/collector v0.113.0
go.opentelemetry.io/collector/component v0.113.0
go.opentelemetry.io/collector/component/componentstatus v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.0.0-20241112045949-9c4c007a12b4
go.opentelemetry.io/collector/config/configgrpc v0.113.0
go.opentelemetry.io/collector/config/confighttp v0.113.0
go.opentelemetry.io/collector/config/configopaque v1.19.0
Expand Down
2 changes: 1 addition & 1 deletion internal/sharedcomponent/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.113.0
go.opentelemetry.io/collector/component/componentstatus v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.0.0-20241112045949-9c4c007a12b4
go.uber.org/goleak v1.3.0
)

Expand Down
2 changes: 1 addition & 1 deletion otelcol/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ require (
github.com/tklauser/go-sysconf v0.3.12 // indirect
github.com/tklauser/numcpus v0.6.1 // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.opentelemetry.io/collector/component/componenttest v0.113.0 // indirect
go.opentelemetry.io/collector/component/componenttest v0.0.0-20241112045949-9c4c007a12b4 // indirect
go.opentelemetry.io/collector/connector/connectorprofiles v0.113.0 // indirect
go.opentelemetry.io/collector/consumer v0.113.0 // indirect
go.opentelemetry.io/collector/consumer/consumererror v0.113.0 // indirect
Expand Down
2 changes: 1 addition & 1 deletion otelcol/otelcoltest/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ require (
github.com/tklauser/numcpus v0.6.1 // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.opentelemetry.io/collector/component/componentstatus v0.113.0 // indirect
go.opentelemetry.io/collector/component/componenttest v0.113.0 // indirect
go.opentelemetry.io/collector/component/componenttest v0.0.0-20241112045949-9c4c007a12b4 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.113.0 // indirect
go.opentelemetry.io/collector/connector/connectorprofiles v0.113.0 // indirect
go.opentelemetry.io/collector/consumer v0.113.0 // indirect
Expand Down
2 changes: 1 addition & 1 deletion processor/batchprocessor/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/client v1.19.0
go.opentelemetry.io/collector/component v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.0.0-20241112045949-9c4c007a12b4
go.opentelemetry.io/collector/config/configtelemetry v0.113.0
go.opentelemetry.io/collector/confmap v1.19.0
go.opentelemetry.io/collector/consumer v0.113.0
Expand Down
2 changes: 1 addition & 1 deletion processor/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.22.0
require (
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.0.0-20241112045949-9c4c007a12b4
go.opentelemetry.io/collector/config/configtelemetry v0.113.0
go.opentelemetry.io/collector/consumer v0.113.0
go.opentelemetry.io/collector/consumer/consumertest v0.113.0
Expand Down
2 changes: 1 addition & 1 deletion processor/memorylimiterprocessor/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.22.0
require (
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.0.0-20241112045949-9c4c007a12b4
go.opentelemetry.io/collector/config/configtelemetry v0.113.0
go.opentelemetry.io/collector/confmap v1.19.0
go.opentelemetry.io/collector/consumer v0.113.0
Expand Down
2 changes: 1 addition & 1 deletion processor/processorhelper/processorhelperprofiles/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.22.0
require (
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.0.0-20241112045949-9c4c007a12b4
go.opentelemetry.io/collector/consumer v0.113.0
go.opentelemetry.io/collector/consumer/consumerprofiles v0.113.0
go.opentelemetry.io/collector/consumer/consumertest v0.113.0
Expand Down
2 changes: 1 addition & 1 deletion processor/processortest/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require (
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.113.0
go.opentelemetry.io/collector/component/componentstatus v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.0.0-20241112045949-9c4c007a12b4
go.opentelemetry.io/collector/consumer v0.113.0
go.opentelemetry.io/collector/consumer/consumerprofiles v0.113.0
go.opentelemetry.io/collector/consumer/consumertest v0.113.0
Expand Down
2 changes: 1 addition & 1 deletion receiver/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.22.0
require (
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.0.0-20241112045949-9c4c007a12b4
go.opentelemetry.io/collector/config/configtelemetry v0.113.0
go.opentelemetry.io/collector/consumer v0.113.0
go.opentelemetry.io/collector/consumer/consumertest v0.113.0
Expand Down
2 changes: 1 addition & 1 deletion receiver/nopreceiver/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ go 1.22.0
require (
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.0.0-20241112045949-9c4c007a12b4
go.opentelemetry.io/collector/confmap v1.19.0
go.opentelemetry.io/collector/consumer v0.113.0
go.opentelemetry.io/collector/consumer/consumertest v0.113.0
Expand Down
2 changes: 1 addition & 1 deletion receiver/otlpreceiver/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ require (
go.opentelemetry.io/collector v0.113.0
go.opentelemetry.io/collector/component v0.113.0
go.opentelemetry.io/collector/component/componentstatus v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.0.0-20241112045949-9c4c007a12b4
go.opentelemetry.io/collector/config/configauth v0.113.0
go.opentelemetry.io/collector/config/configgrpc v0.113.0
go.opentelemetry.io/collector/config/confighttp v0.113.0
Expand Down
2 changes: 1 addition & 1 deletion receiver/receivertest/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/google/uuid v1.6.0
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.0.0-20241112045949-9c4c007a12b4
go.opentelemetry.io/collector/consumer v0.113.0
go.opentelemetry.io/collector/consumer/consumererror v0.113.0
go.opentelemetry.io/collector/consumer/consumerprofiles v0.113.0
Expand Down
2 changes: 1 addition & 1 deletion service/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ require (
go.opentelemetry.io/collector v0.113.0
go.opentelemetry.io/collector/component v0.113.0
go.opentelemetry.io/collector/component/componentstatus v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.113.0
go.opentelemetry.io/collector/component/componenttest v0.0.0-20241112045949-9c4c007a12b4
go.opentelemetry.io/collector/config/confighttp v0.113.0
go.opentelemetry.io/collector/config/configtelemetry v0.113.0
go.opentelemetry.io/collector/confmap v1.19.0
Expand Down

0 comments on commit 115568a

Please sign in to comment.