Skip to content

Commit a57c8b7

Browse files
committed
temporary add replaces in builder-config.yaml
1 parent b523b52 commit a57c8b7

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

cmd/otelcontribcol/builder-config.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,3 +256,7 @@ providers:
256256
# When using `make genotelcontribcol`, a `replaces` section is appended to this
257257
# file before passing it to OCB, to ensure that local versions are used for all
258258
# Contrib modules.
259+
replaces:
260+
- go.opentelemetry.io/collector/extension/extensionauth => go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250226024140-8099e51f9a77
261+
- go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest => go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250226024140-8099e51f9a77
262+
- go.opentelemetry.io/collector/service/hostcapabilities => go.opentelemetry.io/collector/service/hostcapabilities v0.0.0-20250226024140-8099e51f9a77

cmd/oteltestbedcol/builder-config.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,8 @@ providers:
6363
# When using `make genoteltestbedcol`, a `replaces` section is appended to this
6464
# file before passing it to OCB, to ensure that local versions are used for all
6565
# Contrib modules.
66+
replaces:
67+
- go.opentelemetry.io/collector/extension/extensionauth => go.opentelemetry.io/collector/extension/extensionauth v0.0.0-20250226024140-8099e51f9a77
68+
- go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest => go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest v0.0.0-20250226024140-8099e51f9a77
69+
- go.opentelemetry.io/collector/service/hostcapabilities => go.opentelemetry.io/collector/service/hostcapabilities v0.0.0-20250226024140-8099e51f9a77
6670

internal/buildscripts/ocb-add-replaces.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ CONFIG_OUT="cmd/$DIR/builder-config-replaced.yaml"
1212
cp "$CONFIG_IN" "$CONFIG_OUT"
1313

1414
local_mods=$(find . -type f -name "go.mod" -exec dirname {} \; | sort)
15-
echo "replaces:" >> "$CONFIG_OUT"
15+
# TODO: Uncomment once existing replaces are removed from the builder config
16+
# echo "replaces:" >> "$CONFIG_OUT"
1617
for mod_path in $local_mods; do
1718
mod=${mod_path#"."} # remove initial dot
1819
echo " - github.com/open-telemetry/opentelemetry-collector-contrib$mod => ../..$mod" >> "$CONFIG_OUT"

0 commit comments

Comments
 (0)