Skip to content

Commit 2dda0b2

Browse files
authored
Merge branch 'main' into arc-feature
2 parents 88486c8 + c08dbf5 commit 2dda0b2

File tree

52 files changed

+156
-20
lines changed

Some content is hidden

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

52 files changed

+156
-20
lines changed

cmd/builder/internal/builder/main_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ var replaceModules = []string{
9292
"/internal/fanoutconsumer",
9393
"/internal/sharedcomponent",
9494
"/internal/telemetry",
95+
"/internal/testutil",
9596
"/otelcol",
9697
"/pdata",
9798
"/pdata/testdata",

cmd/mdatagen/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,12 +190,12 @@ replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/con
190190

191191
replace go.opentelemetry.io/collector/config/confighttp => ../../config/confighttp
192192

193-
replace go.opentelemetry.io/collector => ../..
194-
195193
replace go.opentelemetry.io/collector/extension/extensioncapabilities => ../../extension/extensioncapabilities
196194

197195
replace go.opentelemetry.io/collector/pdata/xpdata => ../../pdata/xpdata
198196

199197
replace go.opentelemetry.io/collector/exporter/exporterhelper => ../../exporter/exporterhelper
200198

201199
replace go.opentelemetry.io/collector/service/telemetry/telemetrytest => ../../service/telemetry/telemetrytest
200+
201+
replace go.opentelemetry.io/collector/internal/testutil => ../../internal/testutil

cmd/otelcorecol/builder-config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ replaces:
9393
- go.opentelemetry.io/collector/internal/fanoutconsumer => ../../internal/fanoutconsumer
9494
- go.opentelemetry.io/collector/internal/telemetry => ../../internal/telemetry
9595
- go.opentelemetry.io/collector/internal/sharedcomponent => ../../internal/sharedcomponent
96+
- go.opentelemetry.io/collector/internal/testutil => ../../internal/testutil
9697
- go.opentelemetry.io/collector/otelcol => ../../otelcol
9798
- go.opentelemetry.io/collector/pdata => ../../pdata
9899
- go.opentelemetry.io/collector/pdata/testdata => ../../pdata/testdata

cmd/otelcorecol/go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,8 @@ replace go.opentelemetry.io/collector/internal/telemetry => ../../internal/telem
287287

288288
replace go.opentelemetry.io/collector/internal/sharedcomponent => ../../internal/sharedcomponent
289289

290+
replace go.opentelemetry.io/collector/internal/testutil => ../../internal/testutil
291+
290292
replace go.opentelemetry.io/collector/otelcol => ../../otelcol
291293

292294
replace go.opentelemetry.io/collector/pdata => ../../pdata

config/configgrpc/go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,3 +114,5 @@ replace go.opentelemetry.io/collector/extension/extensionmiddleware/extensionmid
114114
replace go.opentelemetry.io/collector/confmap => ../../confmap
115115

116116
replace go.opentelemetry.io/collector/confmap/xconfmap => ../../confmap/xconfmap
117+
118+
replace go.opentelemetry.io/collector/internal/testutil => ../../internal/testutil

config/confighttp/go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,3 +107,5 @@ replace go.opentelemetry.io/collector/extension/extensionmiddleware/extensionmid
107107
replace go.opentelemetry.io/collector/confmap => ../../confmap
108108

109109
replace go.opentelemetry.io/collector/confmap/xconfmap => ../../confmap/xconfmap
110+
111+
replace go.opentelemetry.io/collector/internal/testutil => ../../internal/testutil

config/confighttp/xconfighttp/go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,3 +106,5 @@ replace go.opentelemetry.io/collector/extension/extensionmiddleware/extensionmid
106106
replace go.opentelemetry.io/collector/confmap => ../../../confmap
107107

108108
replace go.opentelemetry.io/collector/confmap/xconfmap => ../../../confmap/xconfmap
109+
110+
replace go.opentelemetry.io/collector/internal/testutil => ../../../internal/testutil

config/configopaque/go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,5 @@ replace go.opentelemetry.io/collector/featuregate => ../../featuregate
3232
replace go.opentelemetry.io/collector/confmap => ../../confmap
3333

3434
replace go.opentelemetry.io/collector/confmap/xconfmap => ../../confmap/xconfmap
35+
36+
replace go.opentelemetry.io/collector/internal/testutil => ../../internal/testutil

config/configoptional/go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,5 @@ replace go.opentelemetry.io/collector/confmap => ../../confmap
3232
replace go.opentelemetry.io/collector/featuregate => ../../featuregate
3333

3434
replace go.opentelemetry.io/collector/confmap/xconfmap => ../../confmap/xconfmap
35+
36+
replace go.opentelemetry.io/collector/internal/testutil => ../../internal/testutil

config/configtls/go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,5 @@ replace go.opentelemetry.io/collector/featuregate => ../../featuregate
4040
replace go.opentelemetry.io/collector/confmap => ../../confmap
4141

4242
replace go.opentelemetry.io/collector/confmap/xconfmap => ../../confmap/xconfmap
43+
44+
replace go.opentelemetry.io/collector/internal/testutil => ../../internal/testutil

0 commit comments

Comments
 (0)