Skip to content

Commit f133008

Browse files
committed
Add more replace directives due to transitive dependencies
1 parent 2a79a07 commit f133008

File tree

11 files changed

+29
-3
lines changed

11 files changed

+29
-3
lines changed

cmd/otelcorecol/go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,3 +334,5 @@ replace go.opentelemetry.io/collector/service => ../../service
334334
replace go.opentelemetry.io/collector/service/hostcapabilities => ../../service/hostcapabilities
335335

336336
replace go.opentelemetry.io/collector/service/telemetry/telemetrytest => ../../service/telemetry/telemetrytest
337+
338+
replace go.opentelemetry.io/collector/internal/testutil => ../../internal/testutil

confmap/provider/httpprovider/go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,5 @@ require (
2929
replace go.opentelemetry.io/collector/confmap => ../../
3030

3131
replace go.opentelemetry.io/collector/featuregate => ../../../featuregate
32+
33+
replace go.opentelemetry.io/collector/internal/testutil => ../../../internal/testutil

confmap/provider/httpsprovider/go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,5 @@ require (
2929
replace go.opentelemetry.io/collector/confmap => ../../
3030

3131
replace go.opentelemetry.io/collector/featuregate => ../../../featuregate
32+
33+
replace go.opentelemetry.io/collector/internal/testutil => ../../../internal/testutil

exporter/otlpexporter/go.mod

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ require (
2323
go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.139.0
2424
go.opentelemetry.io/collector/exporter/exportertest v0.139.0
2525
go.opentelemetry.io/collector/exporter/xexporter v0.139.0
26+
go.opentelemetry.io/collector/internal/testutil v0.0.0-00010101000000-000000000000
2627
go.opentelemetry.io/collector/pdata v1.45.0
2728
go.opentelemetry.io/collector/pdata/pprofile v0.139.0
2829
go.opentelemetry.io/collector/pdata/testdata v0.139.0
@@ -178,3 +179,5 @@ replace go.opentelemetry.io/collector/pdata/xpdata => ../../pdata/xpdata
178179
replace go.opentelemetry.io/collector/config/configoptional => ../../config/configoptional
179180

180181
replace go.opentelemetry.io/collector/exporter/exporterhelper => ../exporterhelper
182+
183+
replace go.opentelemetry.io/collector/internal/testutil => ../../internal/testutil

exporter/otlphttpexporter/go.mod

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ require (
2222
go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper v0.139.0
2323
go.opentelemetry.io/collector/exporter/exportertest v0.139.0
2424
go.opentelemetry.io/collector/exporter/xexporter v0.139.0
25+
go.opentelemetry.io/collector/internal/testutil v0.0.0-00010101000000-000000000000
2526
go.opentelemetry.io/collector/pdata v1.45.0
2627
go.opentelemetry.io/collector/pdata/pprofile v0.139.0
2728
go.uber.org/goleak v1.3.0
@@ -176,3 +177,5 @@ replace go.opentelemetry.io/collector/extension/extensionmiddleware/extensionmid
176177
replace go.opentelemetry.io/collector/pdata/xpdata => ../../pdata/xpdata
177178

178179
replace go.opentelemetry.io/collector/exporter/exporterhelper => ../exporterhelper
180+
181+
replace go.opentelemetry.io/collector/internal/testutil => ../../internal/testutil

extension/zpagesextension/go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ go 1.24.0
44

55
require (
66
github.com/stretchr/testify v1.11.1
7-
go.opentelemetry.io/collector v0.139.0
87
go.opentelemetry.io/collector/component v1.45.0
98
go.opentelemetry.io/collector/component/componentstatus v0.139.0
109
go.opentelemetry.io/collector/component/componenttest v0.139.0
@@ -14,6 +13,7 @@ require (
1413
go.opentelemetry.io/collector/confmap v1.45.0
1514
go.opentelemetry.io/collector/extension v1.45.0
1615
go.opentelemetry.io/collector/extension/extensiontest v0.139.0
16+
go.opentelemetry.io/collector/internal/testutil v0.0.0-00010101000000-000000000000
1717
go.opentelemetry.io/contrib/zpages v0.63.0
1818
go.opentelemetry.io/otel/sdk v1.38.0
1919
go.opentelemetry.io/otel/trace v1.38.0
@@ -126,3 +126,5 @@ replace go.opentelemetry.io/collector/config/configmiddleware => ../../config/co
126126
replace go.opentelemetry.io/collector/extension/extensionmiddleware/extensionmiddlewaretest => ../extensionmiddleware/extensionmiddlewaretest
127127

128128
replace go.opentelemetry.io/collector/confmap/xconfmap => ../../confmap/xconfmap
129+
130+
replace go.opentelemetry.io/collector/internal/testutil => ../../internal/testutil

internal/e2e/go.mod

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ require (
66
github.com/google/go-cmp v0.7.0
77
github.com/prometheus/common v0.67.1
88
github.com/stretchr/testify v1.11.1
9-
go.opentelemetry.io/collector v0.139.0
109
go.opentelemetry.io/collector/component v1.45.0
1110
go.opentelemetry.io/collector/component/componentstatus v0.139.0
1211
go.opentelemetry.io/collector/component/componenttest v0.139.0
@@ -35,6 +34,7 @@ require (
3534
go.opentelemetry.io/collector/exporter/otlphttpexporter v0.139.0
3635
go.opentelemetry.io/collector/extension v1.45.0
3736
go.opentelemetry.io/collector/internal/sharedcomponent v0.139.0
37+
go.opentelemetry.io/collector/internal/testutil v0.0.0-00010101000000-000000000000
3838
go.opentelemetry.io/collector/otelcol v0.139.0
3939
go.opentelemetry.io/collector/pdata v1.45.0
4040
go.opentelemetry.io/collector/pdata/testdata v0.139.0
@@ -100,6 +100,7 @@ require (
100100
github.com/tklauser/numcpus v0.10.0 // indirect
101101
github.com/yusufpapurcu/wmi v1.2.4 // indirect
102102
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
103+
go.opentelemetry.io/collector v0.139.0 // indirect
103104
go.opentelemetry.io/collector/client v1.45.0 // indirect
104105
go.opentelemetry.io/collector/config/configcompression v1.45.0 // indirect
105106
go.opentelemetry.io/collector/config/configmiddleware v1.45.0 // indirect
@@ -300,3 +301,5 @@ replace go.opentelemetry.io/collector/processor/batchprocessor => ../../processo
300301
replace go.opentelemetry.io/collector/confmap/provider/envprovider => ../../confmap/provider/envprovider
301302

302303
replace go.opentelemetry.io/collector/exporter/exporterhelper => ../../exporter/exporterhelper
304+
305+
replace go.opentelemetry.io/collector/internal/testutil => ../../internal/testutil

otelcol/go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,3 +233,5 @@ replace go.opentelemetry.io/collector/config/configoptional => ../config/configo
233233
replace go.opentelemetry.io/collector/pdata/xpdata => ../pdata/xpdata
234234

235235
replace go.opentelemetry.io/collector/exporter/exporterhelper => ../exporter/exporterhelper
236+
237+
replace go.opentelemetry.io/collector/internal/testutil => ../internal/testutil

otelcol/otelcoltest/go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,3 +243,5 @@ replace go.opentelemetry.io/collector/pdata/xpdata => ../../pdata/xpdata
243243
replace go.opentelemetry.io/collector/exporter/exporterhelper => ../../exporter/exporterhelper
244244

245245
replace go.opentelemetry.io/collector/config/configoptional => ../../config/configoptional
246+
247+
replace go.opentelemetry.io/collector/internal/testutil => ../../internal/testutil

receiver/otlpreceiver/go.mod

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ require (
2323
go.opentelemetry.io/collector/consumer/xconsumer v0.139.0
2424
go.opentelemetry.io/collector/internal/sharedcomponent v0.139.0
2525
go.opentelemetry.io/collector/internal/telemetry v0.139.0
26+
go.opentelemetry.io/collector/internal/testutil v0.0.0-00010101000000-000000000000
2627
go.opentelemetry.io/collector/pdata v1.45.0
2728
go.opentelemetry.io/collector/pdata/pprofile v0.139.0
2829
go.opentelemetry.io/collector/pdata/testdata v0.139.0
@@ -163,3 +164,5 @@ replace go.opentelemetry.io/collector/extension/extensionmiddleware => ../../ext
163164
replace go.opentelemetry.io/collector/config/configmiddleware => ../../config/configmiddleware
164165

165166
replace go.opentelemetry.io/collector/extension/extensionmiddleware/extensionmiddlewaretest => ../../extension/extensionmiddleware/extensionmiddlewaretest
167+
168+
replace go.opentelemetry.io/collector/internal/testutil => ../../internal/testutil

0 commit comments

Comments
 (0)