Merge branch 'main' into fix/featuregate-empty-segment-validation

Author: zanarellidev

cmd/builder/internal/builder/main.go

@@ -200,7 +200,8 @@ func GetModules(cfg *Config) error {
 	if semver.MajorMinor(coreDepVersion) != betaVersion {
 		return fmt.Errorf(
 			"%w: core collector version calculated by component dependencies %q does not match configured version %q. %s",
-			ErrVersionMismatch, coreDepVersion, betaVersion, skipStrictMsg)
+			ErrVersionMismatch, coreDepVersion, betaVersion, skipStrictMsg,
+		)
 	}
 
 	for _, mod := range cfg.allComponents() {
@@ -218,7 +219,8 @@ func GetModules(cfg *Config) error {
 		if semver.MajorMinor(moduleDepVersion) != semver.MajorMinor(version) {
 			return fmt.Errorf(
 				"%w: component %q version calculated by dependencies %q does not match configured version %q. %s",
-				ErrVersionMismatch, module, moduleDepVersion, version, skipStrictMsg)
+				ErrVersionMismatch, module, moduleDepVersion, version, skipStrictMsg,
+			)
 		}
 	}
 

cmd/mdatagen/internal/cfggen/generation.go

@@ -763,7 +763,8 @@ func formatSimpleValue(md *ConfigMetadata, name string, defaultValue any, rootPa
 					value := defaultValues[keyName]
 					exps = append(
 						exps,
-						fmt.Sprintf("%q: %v", keyName, FormatDefaultValue(md.Values, name, value, rootPackage, componentPackage)))
+						fmt.Sprintf("%q: %v", keyName, FormatDefaultValue(md.Values, name, value, rootPackage, componentPackage)),
+					)
 				}
 				return fmt.Sprintf("map[string]%s{%s}", typeExpr, strings.Join(exps, ", "))
 			}

cmd/mdatagen/internal/command.go

@@ -142,7 +142,8 @@ func run(ymlPath string) error {
 			err = inlineReplaceWithFns(
 				filepath.Join(tmplDir, "readme.md.tmpl"),
 				filepath.Join(ymlDir, "README.md"),
-				md, statusStart, statusEnd, md.GeneratedPackageName, importRootPath, nil)
+				md, statusStart, statusEnd, md.GeneratedPackageName, importRootPath, nil,
+			)
 			if err != nil {
 				return err
 			}
@@ -501,7 +502,8 @@ func templatize(tmplFile string, funcMap template.FuncMap) *template.Template {
 			New(filepath.Base(tmplFile)).
 			Option("missingkey=error").
 			Funcs(funcMap).
-			ParseFS(TemplateFS, "templates/helper.tmpl", strings.ReplaceAll(tmplFile, "\\", "/")))
+			ParseFS(TemplateFS, "templates/helper.tmpl", strings.ReplaceAll(tmplFile, "\\", "/")),
+	)
 }
 
 func executeTemplate(tmplFile string, md Metadata, goPackage, importRootPath string, fns template.FuncMap) ([]byte, error) {

cmd/mdatagen/internal/metric.go

@@ -146,7 +146,8 @@ func validateSemConvMetricURL(rawURL, semConvVersion, metricName string) error {
 	if !re.MatchString(rawURL) {
 		return fmt.Errorf(
 			"invalid semantic-conventions URL: want https://github.com/open-telemetry/semantic-conventions/blob/%s/*#%s, got %q",
-			semConvVersion, anchor, rawURL)
+			semConvVersion, anchor, rawURL,
+		)
 	}
 	return nil
 }

component/componenttest/configtest.go

@@ -103,7 +103,8 @@ func checkStructFieldTags(f reflect.StructField) error {
 		case "squash":
 			if (f.Type.Kind() != reflect.Struct) && (f.Type.Kind() != reflect.Ptr || f.Type.Elem().Kind() != reflect.Struct) {
 				return fmt.Errorf(
-					"attempt to squash non-struct type on field %q", f.Name)
+					"attempt to squash non-struct type on field %q", f.Name,
+				)
 			}
 		case "remain":
 			if f.Type.Kind() != reflect.Map && f.Type.Kind() != reflect.Interface {
@@ -128,7 +129,8 @@ func checkStructFieldTags(f reflect.StructField) error {
 				"field %q has config tag %q which doesn't satisfy %q",
 				f.Name,
 				fieldTag,
-				configFieldTagRegExp.String())
+				configFieldTagRegExp.String(),
+			)
 		}
 	}
 

config/configgrpc/client_middleware_test.go

@@ -81,7 +81,8 @@ func newTestClientMiddleware(name string) extension.Extension {
 
 						// Continue the call with our updated context
 						return invoker(newCtx, method, req, reply, cc, opts...)
-					}),
+					},
+				),
 			}, nil
 		},
 	}

config/configgrpc/server_middleware_test.go

@@ -55,7 +55,8 @@ func newTestServerMiddleware(name string) extension.Extension {
 				) (any, error) {
 					ctx = context.WithValue(ctx, middlewareCallsKey, append(getMiddlewareCalls(ctx), name))
 					return handler(ctx, req)
-				})}, nil
+				},
+			)}, nil
 		},
 	}
 }

config/confighttp/client_middleware_test.go

@@ -56,7 +56,8 @@ func newTestClientMiddleware(name string) component.Component {
 						resp.ContentLength = int64(len(newBody))
 
 						return resp, nil
-					}), nil
+					},
+				), nil
 			}, nil
 		},
 	}

config/confighttp/confighttp_example_test.go

@@ -21,7 +21,8 @@ func ExampleServerConfig() {
 		context.Background(),
 		host.GetExtensions(),
 		componenttest.NewNopTelemetrySettings(),
-		http.HandlerFunc(func(http.ResponseWriter, *http.Request) {}))
+		http.HandlerFunc(func(http.ResponseWriter, *http.Request) {}),
+	)
 	if err != nil {
 		panic(err)
 	}

config/confighttp/server.go

@@ -284,7 +284,8 @@ func (sc *ServerConfig) ToServer(ctx context.Context, extensions map[component.I
 			}),
 			otelhttp.WithMeterProvider(settings.MeterProvider),
 		},
-		serverOpts.OtelhttpOpts...)
+		serverOpts.OtelhttpOpts...,
+	)
 
 	// Enable OpenTelemetry observability plugin.
 	handler = otelhttp.NewHandler(handler, "", otelOpts...)