Skip to content

Commit a7be72f

Browse files
dmitryaxdmitryax
authored
[chore] Remove redundant replaces (#38332)
Not needed anymore after open-telemetry/opentelemetry-collector#12521
1 parent 45b553c commit a7be72f

File tree

402 files changed

+198
-2016
lines changed

Some content is hidden

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

402 files changed

+198
-2016
lines changed

‎cmd/opampsupervisor/go.mod

-6
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,3 @@ require (
8282
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
8383
google.golang.org/grpc v1.70.0 // indirect
8484
)
85-
86-
replace go.opentelemetry.io/collector/extension/extensionauth => go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c
87-
88-
replace go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest => go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250303102058-a9bca17f1a4c
89-
90-
replace go.opentelemetry.io/collector/service/hostcapabilities => go.opentelemetry.io/collector/service/hostcapabilities v0.0.0-20250303102058-a9bca17f1a4c

‎cmd/telemetrygen/go.mod

-6
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,3 @@ retract (
6161

6262
// IMPORTANT NOTE: Do not add replace statements to this go.mod. This will break go install.
6363
// See https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/27855.
64-
65-
replace go.opentelemetry.io/collector/extension/extensionauth => go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c
66-
67-
replace go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest => go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250303102058-a9bca17f1a4c
68-
69-
replace go.opentelemetry.io/collector/service/hostcapabilities => go.opentelemetry.io/collector/service/hostcapabilities v0.0.0-20250303102058-a9bca17f1a4c

‎cmd/telemetrygen/internal/e2etest/go.mod

-6
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,3 @@ retract (
105105
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => ../../../../internal/common
106106

107107
replace github.com/open-telemetry/opentelemetry-collector-contrib/cmd/telemetrygen => ../..
108-
109-
replace go.opentelemetry.io/collector/extension/extensionauth => go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c
110-
111-
replace go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest => go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250303102058-a9bca17f1a4c
112-
113-
replace go.opentelemetry.io/collector/service/hostcapabilities => go.opentelemetry.io/collector/service/hostcapabilities v0.0.0-20250303102058-a9bca17f1a4c

‎cmd/telemetrygen/internal/e2etest/go.sum

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎confmap/provider/aesprovider/go.mod

-6
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,3 @@ require (
2121
go.uber.org/multierr v1.11.0 // indirect
2222
gopkg.in/yaml.v3 v3.0.1 // indirect
2323
)
24-
25-
replace go.opentelemetry.io/collector/extension/extensionauth => go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c
26-
27-
replace go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest => go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250303102058-a9bca17f1a4c
28-
29-
replace go.opentelemetry.io/collector/service/hostcapabilities => go.opentelemetry.io/collector/service/hostcapabilities v0.0.0-20250303102058-a9bca17f1a4c

‎confmap/provider/s3provider/go.mod

-6
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,3 @@ retract (
4646
v0.76.1
4747
v0.65.0
4848
)
49-
50-
replace go.opentelemetry.io/collector/extension/extensionauth => go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c
51-
52-
replace go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest => go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250303102058-a9bca17f1a4c
53-
54-
replace go.opentelemetry.io/collector/service/hostcapabilities => go.opentelemetry.io/collector/service/hostcapabilities v0.0.0-20250303102058-a9bca17f1a4c

‎confmap/provider/secretsmanagerprovider/go.mod

-6
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,3 @@ require (
3434
go.uber.org/zap v1.27.0 // indirect
3535
gopkg.in/yaml.v3 v3.0.1 // indirect
3636
)
37-
38-
replace go.opentelemetry.io/collector/extension/extensionauth => go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c
39-
40-
replace go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest => go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250303102058-a9bca17f1a4c
41-
42-
replace go.opentelemetry.io/collector/service/hostcapabilities => go.opentelemetry.io/collector/service/hostcapabilities v0.0.0-20250303102058-a9bca17f1a4c

‎connector/countconnector/go.mod

-6
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,3 @@ retract (
9393
)
9494

9595
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden => ../../pkg/golden
96-
97-
replace go.opentelemetry.io/collector/extension/extensionauth => go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c
98-
99-
replace go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest => go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250303102058-a9bca17f1a4c
100-
101-
replace go.opentelemetry.io/collector/service/hostcapabilities => go.opentelemetry.io/collector/service/hostcapabilities v0.0.0-20250303102058-a9bca17f1a4c

‎connector/datadogconnector/go.mod

-6
Original file line numberDiff line numberDiff line change
@@ -414,9 +414,3 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/datadog =>
414414
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/core/xidutils => ../../pkg/core/xidutils
415415

416416
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/datadog => ../../internal/datadog
417-
418-
replace go.opentelemetry.io/collector/extension/extensionauth => go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c
419-
420-
replace go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest => go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250303102058-a9bca17f1a4c
421-
422-
replace go.opentelemetry.io/collector/service/hostcapabilities => go.opentelemetry.io/collector/service/hostcapabilities v0.0.0-20250303102058-a9bca17f1a4c

‎connector/datadogconnector/go.sum

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎connector/exceptionsconnector/go.mod

-6
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,3 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest
7171
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden => ../../pkg/golden
7272

7373
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil => ../../pkg/pdatautil
74-
75-
replace go.opentelemetry.io/collector/extension/extensionauth => go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c
76-
77-
replace go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest => go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250303102058-a9bca17f1a4c
78-
79-
replace go.opentelemetry.io/collector/service/hostcapabilities => go.opentelemetry.io/collector/service/hostcapabilities v0.0.0-20250303102058-a9bca17f1a4c

‎connector/failoverconnector/go.mod

-6
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,3 @@ require (
5454
google.golang.org/protobuf v1.36.5 // indirect
5555
gopkg.in/yaml.v3 v3.0.1 // indirect
5656
)
57-
58-
replace go.opentelemetry.io/collector/extension/extensionauth => go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c
59-
60-
replace go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest => go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250303102058-a9bca17f1a4c
61-
62-
replace go.opentelemetry.io/collector/service/hostcapabilities => go.opentelemetry.io/collector/service/hostcapabilities v0.0.0-20250303102058-a9bca17f1a4c

‎connector/grafanacloudconnector/go.mod

-6
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,3 @@ require (
5757
google.golang.org/protobuf v1.36.5 // indirect
5858
gopkg.in/yaml.v3 v3.0.1 // indirect
5959
)
60-
61-
replace go.opentelemetry.io/collector/extension/extensionauth => go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c
62-
63-
replace go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest => go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250303102058-a9bca17f1a4c
64-
65-
replace go.opentelemetry.io/collector/service/hostcapabilities => go.opentelemetry.io/collector/service/hostcapabilities v0.0.0-20250303102058-a9bca17f1a4c

‎connector/otlpjsonconnector/go.mod

-6
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,3 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil
6363
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest => ../../pkg/pdatatest
6464

6565
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden => ../../pkg/golden
66-
67-
replace go.opentelemetry.io/collector/extension/extensionauth => go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c
68-
69-
replace go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest => go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250303102058-a9bca17f1a4c
70-
71-
replace go.opentelemetry.io/collector/service/hostcapabilities => go.opentelemetry.io/collector/service/hostcapabilities v0.0.0-20250303102058-a9bca17f1a4c

‎connector/roundrobinconnector/go.mod

-6
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,3 @@ require (
5353
google.golang.org/protobuf v1.36.5 // indirect
5454
gopkg.in/yaml.v3 v3.0.1 // indirect
5555
)
56-
57-
replace go.opentelemetry.io/collector/extension/extensionauth => go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c
58-
59-
replace go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest => go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250303102058-a9bca17f1a4c
60-
61-
replace go.opentelemetry.io/collector/service/hostcapabilities => go.opentelemetry.io/collector/service/hostcapabilities v0.0.0-20250303102058-a9bca17f1a4c

‎connector/routingconnector/go.mod

-6
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,3 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil
8585
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest => ../../pkg/pdatatest
8686

8787
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden => ../../pkg/golden
88-
89-
replace go.opentelemetry.io/collector/extension/extensionauth => go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c
90-
91-
replace go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest => go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250303102058-a9bca17f1a4c
92-
93-
replace go.opentelemetry.io/collector/service/hostcapabilities => go.opentelemetry.io/collector/service/hostcapabilities v0.0.0-20250303102058-a9bca17f1a4c

‎connector/servicegraphconnector/go.mod

-6
Original file line numberDiff line numberDiff line change
@@ -142,9 +142,3 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest
142142
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil => ../../internal/pdatautil
143143

144144
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil => ../../pkg/pdatautil
145-
146-
replace go.opentelemetry.io/collector/extension/extensionauth => go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c
147-
148-
replace go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest => go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250303102058-a9bca17f1a4c
149-
150-
replace go.opentelemetry.io/collector/service/hostcapabilities => go.opentelemetry.io/collector/service/hostcapabilities v0.0.0-20250303102058-a9bca17f1a4c

‎connector/servicegraphconnector/go.sum

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎connector/signaltometricsconnector/go.mod

-6
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,3 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest
8989
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden => ../../pkg/golden
9090

9191
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/sampling => ../../pkg/sampling
92-
93-
replace go.opentelemetry.io/collector/extension/extensionauth => go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c
94-
95-
replace go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest => go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250303102058-a9bca17f1a4c
96-
97-
replace go.opentelemetry.io/collector/service/hostcapabilities => go.opentelemetry.io/collector/service/hostcapabilities v0.0.0-20250303102058-a9bca17f1a4c

‎connector/spanmetricsconnector/go.mod

-6
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,3 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest
7979
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden => ../../pkg/golden
8080

8181
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil => ../../internal/pdatautil
82-
83-
replace go.opentelemetry.io/collector/extension/extensionauth => go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c
84-
85-
replace go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest => go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250303102058-a9bca17f1a4c
86-
87-
replace go.opentelemetry.io/collector/service/hostcapabilities => go.opentelemetry.io/collector/service/hostcapabilities v0.0.0-20250303102058-a9bca17f1a4c

‎connector/sumconnector/go.mod

-6
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,3 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden =>
8989
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatautil => ../../pkg/pdatautil
9090

9191
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest => ../../pkg/pdatatest
92-
93-
replace go.opentelemetry.io/collector/extension/extensionauth => go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c
94-
95-
replace go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest => go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250303102058-a9bca17f1a4c
96-
97-
replace go.opentelemetry.io/collector/service/hostcapabilities => go.opentelemetry.io/collector/service/hostcapabilities v0.0.0-20250303102058-a9bca17f1a4c

‎examples/demo/client/go.mod

-6
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,3 @@ retract (
3737
v0.76.1
3838
v0.65.0
3939
)
40-
41-
replace go.opentelemetry.io/collector/extension/extensionauth => go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c
42-
43-
replace go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest => go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250303102058-a9bca17f1a4c
44-
45-
replace go.opentelemetry.io/collector/service/hostcapabilities => go.opentelemetry.io/collector/service/hostcapabilities v0.0.0-20250303102058-a9bca17f1a4c

‎examples/demo/server/go.mod

-6
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,3 @@ retract (
3737
v0.76.1
3838
v0.65.0
3939
)
40-
41-
replace go.opentelemetry.io/collector/extension/extensionauth => go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c
42-
43-
replace go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest => go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250303102058-a9bca17f1a4c
44-
45-
replace go.opentelemetry.io/collector/service/hostcapabilities => go.opentelemetry.io/collector/service/hostcapabilities v0.0.0-20250303102058-a9bca17f1a4c

‎exporter/alertmanagerexporter/go.mod

-6
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,3 @@ retract (
8888
)
8989

9090
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => ../../internal/common
91-
92-
replace go.opentelemetry.io/collector/extension/extensionauth => go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250303102058-a9bca17f1a4c
93-
94-
replace go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest => go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250303102058-a9bca17f1a4c
95-
96-
replace go.opentelemetry.io/collector/service/hostcapabilities => go.opentelemetry.io/collector/service/hostcapabilities v0.0.0-20250303102058-a9bca17f1a4c

0 commit comments

Comments
 (0)