Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[chore] [cmd/builder] Require github.com/knadh/koanf submodules #8301

Merged

Conversation

dmitryax
Copy link
Member

@dmitryax dmitryax commented Aug 29, 2023

Explicitly require github.com/knadh/koanf/maps and github.com/knadh/koanf/providers/confmap in go.mod to workaround ambiguous imports. Otherwise, the command fails with:

Error: failed to update go.mod: exit status 1. Output:
go: github.com/open-telemetry/opentelemetry-collector-contrib/cmd/otelcontribcol imports
	github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector imports
	go.opentelemetry.io/collector/confmap imports
	github.com/knadh/koanf/maps: ambiguous import: found package github.com/knadh/koanf/maps in multiple modules:
	github.com/knadh/koanf v1.5.0 (/Users/danoshin/go/pkg/mod/github.com/knadh/[email protected]/maps)
	github.com/knadh/koanf/maps v0.1.1 (/Users/danoshin/go/pkg/mod/github.com/knadh/koanf/[email protected])
go: github.com/open-telemetry/opentelemetry-collector-contrib/cmd/otelcontribcol imports
	github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector imports
	go.opentelemetry.io/collector/confmap imports
	github.com/knadh/koanf/providers/confmap: ambiguous import: found package github.com/knadh/koanf/providers/confmap in multiple modules:
	github.com/knadh/koanf v1.5.0 (/Users/danoshin/go/pkg/mod/github.com/knadh/[email protected]/providers/confmap)
	github.com/knadh/koanf/providers/confmap v0.1.0 (/Users/danoshin/go/pkg/mod/github.com/knadh/koanf/providers/[email protected])

make: *** [genotelcontribcol] Error 1

Explicitly require github.com/knadh/koanf/maps and github.com/knadh/koanf/providers/confmap to workaround ambiguous imports. Otherwise, the command fails with:
```
Error: failed to update go.mod: exit status 1. Output:
go: github.com/open-telemetry/opentelemetry-collector-contrib/cmd/otelcontribcol imports
	github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector imports
	go.opentelemetry.io/collector/confmap imports
	github.com/knadh/koanf/maps: ambiguous import: found package github.com/knadh/koanf/maps in multiple modules:
	github.com/knadh/koanf v1.5.0 (/Users/danoshin/go/pkg/mod/github.com/knadh/[email protected]/maps)
	github.com/knadh/koanf/maps v0.1.1 (/Users/danoshin/go/pkg/mod/github.com/knadh/koanf/[email protected])
go: github.com/open-telemetry/opentelemetry-collector-contrib/cmd/otelcontribcol imports
	github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector imports
	go.opentelemetry.io/collector/confmap imports
	github.com/knadh/koanf/providers/confmap: ambiguous import: found package github.com/knadh/koanf/providers/confmap in multiple modules:
	github.com/knadh/koanf v1.5.0 (/Users/danoshin/go/pkg/mod/github.com/knadh/[email protected]/providers/confmap)
	github.com/knadh/koanf/providers/confmap v0.1.0 (/Users/danoshin/go/pkg/mod/github.com/knadh/koanf/providers/[email protected])

make: *** [genotelcontribcol] Error 1
```
@dmitryax dmitryax requested review from a team and mx-psi August 29, 2023 16:31
@codecov
Copy link

codecov bot commented Aug 29, 2023

Codecov Report

Patch coverage: 80.00% and project coverage change: +0.15% 🎉

Comparison is base (0a63747) 90.22% compared to head (16fd39c) 90.38%.
Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #8301      +/-   ##
==========================================
+ Coverage   90.22%   90.38%   +0.15%     
==========================================
  Files         302      303       +1     
  Lines       15859    15904      +45     
==========================================
+ Hits        14309    14375      +66     
+ Misses       1256     1235      -21     
  Partials      294      294              
Files Changed Coverage Δ
exporter/exporterhelper/internal/mock_storage.go 80.00% <80.00%> (ø)

... and 6 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@codeboten codeboten merged commit 4f94232 into open-telemetry:main Aug 29, 2023
@github-actions github-actions bot added this to the next release milestone Aug 29, 2023
@dmitryax dmitryax deleted the add-koanf-required-fields-gomod branch August 29, 2023 17:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants