@@ -534,12 +534,30 @@ otel-from-tree:
534534 # 2. Run `make otel-from-tree` (only need to run it once to remap go modules)
535535 # 3. You can now build contrib and it will use your local otel core changes.
536536 # 4. Before committing/pushing your contrib changes, undo by running `make otel-from-lib`.
537- $(MAKE ) for-all CMD=" $( GOCMD) mod edit -replace go.opentelemetry.io/collector=$( SRC_PARENT_DIR) /opentelemetry-collector"
537+ @source $(MODULES ) && \
538+ replace_args=" " ; \
539+ echo " # BEGIN otel-from-tree" >> " ./cmd/otelcontribcol/builder-config.yaml" ; \
540+ echo " # BEGIN otel-from-tree" >> " ./cmd/oteltestbedcol/builder-config.yaml" ; \
541+ for module in " $$ {beta_modules[@]}" " $$ {stable_modules[@]}" ; do \
542+ subpath=$$ {module#go.opentelemetry.io/collector}; \
543+ if [ " $$ {subpath}" = " $$ {module}" ]; then subpath=" " ; fi ; \
544+ replace_args=" $$ {replace_args} -replace $$ {module}=$( SRC_PARENT_DIR) /opentelemetry-collector$$ {subpath}" ; \
545+ echo " - $$ {module} => $( SRC_PARENT_DIR) /opentelemetry-collector$$ {subpath}" >> " ./cmd/otelcontribcol/builder-config.yaml" ; \
546+ echo " - $$ {module} => $( SRC_PARENT_DIR) /opentelemetry-collector$$ {subpath}" >> " ./cmd/oteltestbedcol/builder-config.yaml" ; \
547+ done ; \
548+ $(MAKE ) for-all CMD=" $( GOCMD) mod edit $$ {replace_args}"
538549
539550.PHONY : otel-from-lib
540551otel-from-lib :
541552 # Sets opentelemetry core to be not be pulled from local source tree. (Undoes otel-from-tree.)
542- $(MAKE ) for-all CMD=" $( GOCMD) mod edit -dropreplace go.opentelemetry.io/collector"
553+ @source $(MODULES ) && \
554+ dropreplace_args=" " ; \
555+ for module in " $$ {beta_modules[@]}" " $$ {stable_modules[@]}" ; do \
556+ dropreplace_args=" $$ {dropreplace_args} -dropreplace $$ {module}" ; \
557+ done ; \
558+ sed -i ' ' ' /# BEGIN otel-from-tree/,$$d' " ./cmd/otelcontribcol/builder-config.yaml" ; \
559+ sed -i ' ' ' /# BEGIN otel-from-tree/,$$d' " ./cmd/oteltestbedcol/builder-config.yaml" ; \
560+ $(MAKE ) for-all CMD=" $( GOCMD) mod edit $$ {dropreplace_args}"
543561
544562.PHONY : build-examples
545563build-examples :
0 commit comments