Skip to content

Commit 96a3ad1

Browse files
songy23songy23
authored
[chore] put back replace and add new packages in builder yaml (open-telemetry#11909)
This reverts commit open-telemetry@5272797 because it breaks releases, see https://github.com/open-telemetry/opentelemetry-collector/actions/runs/12358329683/job/34488569900?pr=11904 and adds replace of the new x[consumer|experter|...] packages to the builder yaml
1 parent 6a47030 commit 96a3ad1

2 files changed

Lines changed: 73 additions & 10 deletions

File tree

‎cmd/builder/test/core.builder.yaml‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,75 @@ receivers:
1111

1212
exporters:
1313
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.115.0
14+
15+
replaces:
16+
- go.opentelemetry.io/collector => ${WORKSPACE_DIR}
17+
- go.opentelemetry.io/collector/client => ${WORKSPACE_DIR}/client
18+
- go.opentelemetry.io/collector/component => ${WORKSPACE_DIR}/component
19+
- go.opentelemetry.io/collector/component/componenttest => ${WORKSPACE_DIR}/component/componenttest
20+
- go.opentelemetry.io/collector/component/componentstatus => ${WORKSPACE_DIR}/component/componentstatus
21+
- go.opentelemetry.io/collector/config/configauth => ${WORKSPACE_DIR}/config/configauth
22+
- go.opentelemetry.io/collector/config/configcompression => ${WORKSPACE_DIR}/config/configcompression
23+
- go.opentelemetry.io/collector/config/configgrpc => ${WORKSPACE_DIR}/config/configgrpc
24+
- go.opentelemetry.io/collector/config/confighttp => ${WORKSPACE_DIR}/config/confighttp
25+
- go.opentelemetry.io/collector/config/confignet => ${WORKSPACE_DIR}/config/confignet
26+
- go.opentelemetry.io/collector/config/configopaque => ${WORKSPACE_DIR}/config/configopaque
27+
- go.opentelemetry.io/collector/config/configretry => ${WORKSPACE_DIR}/config/configretry
28+
- go.opentelemetry.io/collector/config/configtelemetry => ${WORKSPACE_DIR}/config/configtelemetry
29+
- go.opentelemetry.io/collector/config/configtls => ${WORKSPACE_DIR}/config/configtls
30+
- go.opentelemetry.io/collector/config/internal => ${WORKSPACE_DIR}/config/internal
31+
- go.opentelemetry.io/collector/confmap => ${WORKSPACE_DIR}/confmap
32+
- go.opentelemetry.io/collector/confmap/provider/envprovider => ${WORKSPACE_DIR}/confmap/provider/envprovider
33+
- go.opentelemetry.io/collector/confmap/provider/fileprovider => ${WORKSPACE_DIR}/confmap/provider/fileprovider
34+
- go.opentelemetry.io/collector/confmap/provider/httpprovider => ${WORKSPACE_DIR}/confmap/provider/httpprovider
35+
- go.opentelemetry.io/collector/confmap/provider/httpsprovider => ${WORKSPACE_DIR}/confmap/provider/httpsprovider
36+
- go.opentelemetry.io/collector/confmap/provider/yamlprovider => ${WORKSPACE_DIR}/confmap/provider/yamlprovider
37+
- go.opentelemetry.io/collector/consumer => ${WORKSPACE_DIR}/consumer
38+
- go.opentelemetry.io/collector/consumer/consumererror => ${WORKSPACE_DIR}/consumer/consumererror
39+
- go.opentelemetry.io/collector/consumer/consumererror/consumererrorprofiles => ${WORKSPACE_DIR}/consumer/consumererror/consumererrorprofiles
40+
- go.opentelemetry.io/collector/consumer/consumerprofiles => ${WORKSPACE_DIR}/consumer/consumerprofiles
41+
- go.opentelemetry.io/collector/consumer/consumererror/xconsumererror => ${WORKSPACE_DIR}/consumer/consumererror/xconsumererror
42+
- go.opentelemetry.io/collector/consumer/xconsumer => ${WORKSPACE_DIR}/consumer/xconsumer
43+
- go.opentelemetry.io/collector/consumer/consumertest => ${WORKSPACE_DIR}/consumer/consumertest
44+
- go.opentelemetry.io/collector/connector => ${WORKSPACE_DIR}/connector
45+
- go.opentelemetry.io/collector/connector/connectortest => ${WORKSPACE_DIR}/connector/connectortest
46+
- go.opentelemetry.io/collector/connector/connectorprofiles => ${WORKSPACE_DIR}/connector/connectorprofiles
47+
- go.opentelemetry.io/collector/connector/xconnector => ${WORKSPACE_DIR}/connector/xconnector
48+
- go.opentelemetry.io/collector/exporter => ${WORKSPACE_DIR}/exporter
49+
- go.opentelemetry.io/collector/exporter/debugexporter => ${WORKSPACE_DIR}/exporter/debugexporter
50+
- go.opentelemetry.io/collector/exporter/exporterprofiles => ${WORKSPACE_DIR}/exporter/exporterprofiles
51+
- go.opentelemetry.io/collector/exporter/xexporter => ${WORKSPACE_DIR}/exporter/xexporter
52+
- go.opentelemetry.io/collector/exporter/exportertest => ${WORKSPACE_DIR}/exporter/exportertest
53+
- go.opentelemetry.io/collector/exporter/exporterhelper/exporterhelperprofiles => ${WORKSPACE_DIR}/exporter/exporterhelper/exporterhelperprofiles
54+
- go.opentelemetry.io/collector/exporter/exporterhelper/xexporterhelper => ${WORKSPACE_DIR}/exporter/exporterhelper/xexporterhelper
55+
- go.opentelemetry.io/collector/extension => ${WORKSPACE_DIR}/extension
56+
- go.opentelemetry.io/collector/extension/auth => ${WORKSPACE_DIR}/extension/auth
57+
- go.opentelemetry.io/collector/extension/auth/authtest => ${WORKSPACE_DIR}/extension/auth/authtest
58+
- go.opentelemetry.io/collector/extension/experimental/storage => ${WORKSPACE_DIR}/extension/experimental/storage
59+
- go.opentelemetry.io/collector/extension/extensioncapabilities => ${WORKSPACE_DIR}/extension/extensioncapabilities
60+
- go.opentelemetry.io/collector/extension/extensiontest => ${WORKSPACE_DIR}/extension/extensiontest
61+
- go.opentelemetry.io/collector/extension/zpagesextension => ${WORKSPACE_DIR}/extension/zpagesextension
62+
- go.opentelemetry.io/collector/featuregate => ${WORKSPACE_DIR}/featuregate
63+
- go.opentelemetry.io/collector/internal/memorylimiter => ${WORKSPACE_DIR}/internal/memorylimiter
64+
- go.opentelemetry.io/collector/internal/fanoutconsumer => ${WORKSPACE_DIR}/internal/fanoutconsumer
65+
- go.opentelemetry.io/collector/internal/sharedcomponent => ${WORKSPACE_DIR}/internal/sharedcomponent
66+
- go.opentelemetry.io/collector/otelcol => ${WORKSPACE_DIR}/otelcol
67+
- go.opentelemetry.io/collector/otelcol/otelcoltest => ${WORKSPACE_DIR}/otelcol/otelcoltest
68+
- go.opentelemetry.io/collector/pdata => ${WORKSPACE_DIR}/pdata
69+
- go.opentelemetry.io/collector/pdata/pprofile => ${WORKSPACE_DIR}/pdata/pprofile
70+
- go.opentelemetry.io/collector/pdata/testdata => ${WORKSPACE_DIR}/pdata/testdata
71+
- go.opentelemetry.io/collector/pipeline => ${WORKSPACE_DIR}/pipeline
72+
- go.opentelemetry.io/collector/pipeline/pipelineprofiles => ${WORKSPACE_DIR}/pipeline/pipelineprofiles
73+
- go.opentelemetry.io/collector/pipeline/xpipeline => ${WORKSPACE_DIR}/pipeline/xpipeline
74+
- go.opentelemetry.io/collector/processor => ${WORKSPACE_DIR}/processor
75+
- go.opentelemetry.io/collector/processor/processortest => ${WORKSPACE_DIR}/processor/processortest
76+
- go.opentelemetry.io/collector/processor/processorprofiles => ${WORKSPACE_DIR}/processor/processorprofiles
77+
- go.opentelemetry.io/collector/processor/xprocessor => ${WORKSPACE_DIR}/processor/xprocessor
78+
- go.opentelemetry.io/collector/receiver => ${WORKSPACE_DIR}/receiver
79+
- go.opentelemetry.io/collector/receiver/otlpreceiver => ${WORKSPACE_DIR}/receiver/otlpreceiver
80+
- go.opentelemetry.io/collector/receiver/receiverprofiles => ${WORKSPACE_DIR}/receiver/receiverprofiles
81+
- go.opentelemetry.io/collector/receiver/xreceiver => ${WORKSPACE_DIR}/receiver/xreceiver
82+
- go.opentelemetry.io/collector/receiver/receivertest => ${WORKSPACE_DIR}/receiver/receivertest
83+
- go.opentelemetry.io/collector/scraper => ${WORKSPACE_DIR}/scraper
84+
- go.opentelemetry.io/collector/semconv => ${WORKSPACE_DIR}/semconv
85+
- go.opentelemetry.io/collector/service => ${WORKSPACE_DIR}/service

‎cmd/builder/test/test.sh‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ test_build_config() {
3333
echo "Starting test '${test}' at $(date)" >> "${out}/test.log"
3434

3535
final_build_config=$(basename "${build_config}")
36-
"${WORKSPACE_DIR}/.tools/envsubst" -o "${out}/${final_build_config}" -i <(cat "$build_config" "$replaces")
36+
"${WORKSPACE_DIR}/.tools/envsubst" < "$build_config" > "${out}/${final_build_config}"
3737
if ! go run . --config "${out}/${final_build_config}" --output-path "${out}" > "${out}/builder.log" 2>&1; then
3838
echo "❌ FAIL ${test}. Failed to compile the test ${test}. Build logs:"
3939
cat "${out}/builder.log"
@@ -113,15 +113,6 @@ tests="core"
113113
base=$(mktemp -d)
114114
echo "Running the tests in ${base}"
115115

116-
replaces="$base/replaces"
117-
# Get path of all core modules, in sorted order, without the initial dot
118-
core_mods=$(cd ../.. && find . -type f -name "go.mod" -exec dirname {} \; | sort | sed 's/.//')
119-
echo "replaces:" >> "$replaces"
120-
for mod in $core_mods; do
121-
echo " - go.opentelemetry.io/collector$mod => \${WORKSPACE_DIR}$mod" >> "$replaces"
122-
done
123-
echo "Wrote replace statements to $replaces"
124-
125116
failed=false
126117

127118
for test in $tests

0 commit comments

Comments
 (0)
⚡