Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions .chloggen/builder-empty-gomod-field.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Use this changelog template to create an entry for release notes.

# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: bug_fix

# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
component: builder

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: provide context when a module in the config is missing its gomod value

# One or more tracking issues or pull requests related to the change
issues: [10474]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:

# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: []
22 changes: 11 additions & 11 deletions cmd/builder/internal/builder/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (

const defaultOtelColVersion = "0.104.0"

// ErrInvalidGoMod indicates an invalid gomod
var ErrInvalidGoMod = errors.New("invalid gomod specification for module")
// ErrMissingGoMod indicates an empty gomod field
var ErrMissingGoMod = errors.New("missing gomod specification for module")

// Config holds the builder's configuration
type Config struct {
Expand Down Expand Up @@ -115,14 +115,14 @@ func NewDefaultConfig() Config {
func (c *Config) Validate() error {
var providersError error
if c.Providers != nil {
providersError = validateModules(*c.Providers)
providersError = validateModules("provider", *c.Providers)
}
return multierr.Combine(
validateModules(c.Extensions),
validateModules(c.Receivers),
validateModules(c.Exporters),
validateModules(c.Processors),
validateModules(c.Connectors),
validateModules("extension", c.Extensions),
validateModules("receiver", c.Receivers),
validateModules("exporter", c.Exporters),
validateModules("processor", c.Processors),
validateModules("connector", c.Connectors),
providersError,
)
}
Expand Down Expand Up @@ -235,10 +235,10 @@ func (c *Config) ParseModules() error {
return nil
}

func validateModules(mods []Module) error {
for _, mod := range mods {
func validateModules(name string, mods []Module) error {
for i, mod := range mods {
if mod.GoMod == "" {
return fmt.Errorf("module %q: %w", mod.GoMod, ErrInvalidGoMod)
return fmt.Errorf("%s module at index %v: %w", name, i, ErrMissingGoMod)
}
}
return nil
Expand Down
28 changes: 23 additions & 5 deletions cmd/builder/internal/builder/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -79,21 +79,30 @@ func TestModuleFromCore(t *testing.T) {
assert.True(t, strings.HasPrefix(cfg.Extensions[0].Name, "otlpreceiver"))
}

func TestInvalidModule(t *testing.T) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we also add a test with an invalid but existing go.mod file?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can but that doesn't seem relevant to this PR? I'm wondering if this was confused for https://github.com/open-telemetry/opentelemetry-collector/pull/10098/files

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Before the error said invalid gomod specification for module, so what I am wondering is if we are introducing a case where we say the go.mod file does not exist but what happens is that it's invalid. I am fine not adding the test on this PR if we are certain this does not happen

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The only validation being done currently is if the GoMod value is empty: if mod.GoMod == ""; here:
https://github.com/open-telemetry/opentelemetry-collector/pull/10475/files#diff-5aa5d2605e296c63681940c00cbc83eb2bb6b2e67ad2071f5c5c6435537d5561R240
There is no other validation of this config field. The field isn't a go.mod file, and it normally looks something like: go.opentelemetry.io/collector/confmap/provider/envprovider v0.103.0

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, thanks for clearing that up, that message sure was confusing to me 😄 we can merge this

func TestMissingModule(t *testing.T) {
type invalidModuleTest struct {
cfg Config
err error
}
// prepare
configurations := []invalidModuleTest{
{
cfg: Config{
Logger: zap.NewNop(),
Providers: &[]Module{{
Import: "invalid",
}},
},
err: ErrMissingGoMod,
},
{
cfg: Config{
Logger: zap.NewNop(),
Extensions: []Module{{
Import: "invalid",
}},
},
err: ErrInvalidGoMod,
err: ErrMissingGoMod,
},
{
cfg: Config{
Expand All @@ -102,7 +111,7 @@ func TestInvalidModule(t *testing.T) {
Import: "invalid",
}},
},
err: ErrInvalidGoMod,
err: ErrMissingGoMod,
},
{
cfg: Config{
Expand All @@ -111,7 +120,7 @@ func TestInvalidModule(t *testing.T) {
Import: "invali",
}},
},
err: ErrInvalidGoMod,
err: ErrMissingGoMod,
},
{
cfg: Config{
Expand All @@ -120,7 +129,16 @@ func TestInvalidModule(t *testing.T) {
Import: "invalid",
}},
},
err: ErrInvalidGoMod,
err: ErrMissingGoMod,
},
{
cfg: Config{
Logger: zap.NewNop(),
Connectors: []Module{{
Import: "invalid",
}},
},
err: ErrMissingGoMod,
},
}

Expand Down