make apache httpd naming consistent

Author: changexd

internal/config/main.go

@@ -44,7 +44,7 @@ type Config struct {
 	collectorConfigMapEntry             string
 	createRBACPermissions               bool
 	enableMultiInstrumentation          bool
-	enableApacheHTTPInstrumentation     bool
+	enableApacheHttpdInstrumentation    bool
 	autoInstrumentationDotNetImage      string
 	autoInstrumentationGoImage          string
 	autoInstrumentationApacheHttpdImage string
@@ -78,7 +78,7 @@ func New(opts ...Option) Config {
 		collectorConfigMapEntry:             o.collectorConfigMapEntry,
 		createRBACPermissions:               o.createRBACPermissions,
 		enableMultiInstrumentation:          o.enableMultiInstrumentation,
-		enableApacheHTTPInstrumentation:     o.enableApacheHTTPInstrumentation,
+		enableApacheHttpdInstrumentation:    o.enableApacheHttpdInstrumentation,
 		targetAllocatorImage:                o.targetAllocatorImage,
 		operatorOpAMPBridgeImage:            o.operatorOpAMPBridgeImage,
 		targetAllocatorConfigMapEntry:       o.targetAllocatorConfigMapEntry,
@@ -118,8 +118,8 @@ func (c *Config) EnableMultiInstrumentation() bool {
 	return c.enableMultiInstrumentation
 }
 
-func (c *Config) EnableApacheHTTPAutoInstrumentation() bool {
-	return c.enableApacheHTTPInstrumentation
+func (c *Config) EnableApacheHttpdAutoInstrumentation() bool {
+	return c.enableApacheHttpdInstrumentation
 }
 
 // CollectorConfigMapEntry represents the configuration file name for the collector. Immutable.

internal/config/options.go

@@ -43,7 +43,7 @@ type options struct {
 	collectorConfigMapEntry             string
 	createRBACPermissions               bool
 	enableMultiInstrumentation          bool
-	enableApacheHTTPInstrumentation     bool
+	enableApacheHttpdInstrumentation    bool
 	targetAllocatorConfigMapEntry       string
 	operatorOpAMPBridgeConfigMapEntry   string
 	targetAllocatorImage                string
@@ -87,9 +87,9 @@ func WithEnableMultiInstrumentation(s bool) Option {
 		o.enableMultiInstrumentation = s
 	}
 }
-func WithEnableApacheHTTPInstrumentation(s bool) Option {
+func WithEnableApacheHttpdInstrumentation(s bool) Option {
 	return func(o *options) {
-		o.enableApacheHTTPInstrumentation = s
+		o.enableApacheHttpdInstrumentation = s
 	}
 }
 func WithTargetAllocatorConfigMapEntry(s string) Option {

main.go

@@ -100,26 +100,26 @@ func main() {
 
 	// add flags related to this operator
 	var (
-		metricsAddr                     string
-		probeAddr                       string
-		pprofAddr                       string
-		enableLeaderElection            bool
-		createRBACPermissions           bool
-		enableMultiInstrumentation      bool
-		enableApacheHTTPInstrumentation bool
-		collectorImage                  string
-		targetAllocatorImage            string
-		operatorOpAMPBridgeImage        string
-		autoInstrumentationJava         string
-		autoInstrumentationNodeJS       string
-		autoInstrumentationPython       string
-		autoInstrumentationDotNet       string
-		autoInstrumentationApacheHttpd  string
-		autoInstrumentationNginx        string
-		autoInstrumentationGo           string
-		labelsFilter                    []string
-		webhookPort                     int
-		tlsOpt                          tlsConfig
+		metricsAddr                      string
+		probeAddr                        string
+		pprofAddr                        string
+		enableLeaderElection             bool
+		createRBACPermissions            bool
+		enableMultiInstrumentation       bool
+		enableApacheHttpdInstrumentation bool
+		collectorImage                   string
+		targetAllocatorImage             string
+		operatorOpAMPBridgeImage         string
+		autoInstrumentationJava          string
+		autoInstrumentationNodeJS        string
+		autoInstrumentationPython        string
+		autoInstrumentationDotNet        string
+		autoInstrumentationApacheHttpd   string
+		autoInstrumentationNginx         string
+		autoInstrumentationGo            string
+		labelsFilter                     []string
+		webhookPort                      int
+		tlsOpt                           tlsConfig
 	)
 
 	pflag.StringVar(&metricsAddr, "metrics-addr", ":8080", "The address the metric endpoint binds to.")
@@ -130,7 +130,7 @@ func main() {
 			"Enabling this will ensure there is only one active controller manager.")
 	pflag.BoolVar(&createRBACPermissions, "create-rbac-permissions", false, "Automatically create RBAC permissions needed by the processors")
 	pflag.BoolVar(&enableMultiInstrumentation, "enable-multi-instrumentation", false, "Controls whether the operator supports multi instrumentation")
-	pflag.BoolVar(&enableApacheHTTPInstrumentation, constants.FlagApacheHttpd, true, "controls whether the operator supports Apache HTTPD auto-instrumentation")
+	pflag.BoolVar(&enableApacheHttpdInstrumentation, constants.FlagApacheHttpd, true, "controls whether the operator supports Apache HTTPD auto-instrumentation")
 	stringFlagOrEnv(&collectorImage, "collector-image", "RELATED_IMAGE_COLLECTOR", fmt.Sprintf("ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:%s", v.OpenTelemetryCollector), "The default OpenTelemetry collector image. This image is used when no image is specified in the CustomResource.")
 	stringFlagOrEnv(&targetAllocatorImage, "target-allocator-image", "RELATED_IMAGE_TARGET_ALLOCATOR", fmt.Sprintf("ghcr.io/open-telemetry/opentelemetry-operator/target-allocator:%s", v.TargetAllocator), "The default OpenTelemetry target allocator image. This image is used when no image is specified in the CustomResource.")
 	stringFlagOrEnv(&operatorOpAMPBridgeImage, "operator-opamp-bridge-image", "RELATED_IMAGE_OPERATOR_OPAMP_BRIDGE", fmt.Sprintf("ghcr.io/open-telemetry/opentelemetry-operator/operator-opamp-bridge:%s", v.OperatorOpAMPBridge), "The default OpenTelemetry Operator OpAMP Bridge image. This image is used when no image is specified in the CustomResource.")
@@ -169,7 +169,7 @@ func main() {
 		"go-os", runtime.GOOS,
 		"labels-filter", labelsFilter,
 		"enable-multi-instrumentation", enableMultiInstrumentation,
-		"enable-apache-http-instrumentation", enableApacheHTTPInstrumentation,
+		"enable-apache-http-instrumentation", enableApacheHttpdInstrumentation,
 	)
 
 	restConfig := ctrl.GetConfigOrDie()
@@ -187,7 +187,7 @@ func main() {
 		config.WithCollectorImage(collectorImage),
 		config.WithCreateRBACPermissions(createRBACPermissions),
 		config.WithEnableMultiInstrumentation(enableMultiInstrumentation),
-		config.WithEnableApacheHTTPInstrumentation(enableApacheHTTPInstrumentation),
+		config.WithEnableApacheHttpdInstrumentation(enableApacheHttpdInstrumentation),
 		config.WithTargetAllocatorImage(targetAllocatorImage),
 		config.WithOperatorOpAMPBridgeImage(operatorOpAMPBridgeImage),
 		config.WithAutoInstrumentationJavaImage(autoInstrumentationJava),

pkg/instrumentation/podmutator.go

@@ -290,7 +290,7 @@ func (pm *instPodMutator) Mutate(ctx context.Context, ns corev1.Namespace, pod c
 		logger.Error(err, "failed to select an OpenTelemetry Instrumentation instance for this pod")
 		return pod, err
 	}
-	if pm.config.EnableApacheHTTPAutoInstrumentation() || inst == nil {
+	if pm.config.EnableApacheHttpdAutoInstrumentation() || inst == nil {
 		insts.ApacheHttpd.Instrumentation = inst
 	} else {
 		logger.Error(nil, "support for Apache HTTPD auto instrumentation is not enabled")

pkg/instrumentation/podmutator_test.go

@@ -2751,7 +2751,7 @@ func TestMutatePod(t *testing.T) {
 					},
 				},
 			},
-			config: config.New(config.WithEnableApacheHTTPInstrumentation(true)),
+			config: config.New(config.WithEnableApacheHttpdInstrumentation(true)),
 		},
 		{
 			name: "apache httpd injection feature gate disabled",
@@ -2826,7 +2826,7 @@ func TestMutatePod(t *testing.T) {
 					},
 				},
 			},
-			config: config.New(config.WithEnableApacheHTTPInstrumentation(false)),
+			config: config.New(config.WithEnableApacheHttpdInstrumentation(false)),
 		},
 
 		{

pkg/instrumentation/upgrade/upgrade.go

@@ -62,7 +62,7 @@ type InstrumentationUpgrade struct {
 
 func NewInstrumentationUpgrade(client client.Client, logger logr.Logger, recorder record.EventRecorder, cfg config.Config) *InstrumentationUpgrade {
 	defaultAnnotationToConfig := map[string]autoInstConfig{
-		constants.AnnotationDefaultAutoInstrumentationApacheHttpd: autoInstConfig{constants.FlagApacheHttpd, cfg.EnableApacheHTTPAutoInstrumentation()},
+		constants.AnnotationDefaultAutoInstrumentationApacheHttpd: autoInstConfig{constants.FlagApacheHttpd, cfg.EnableApacheHttpdAutoInstrumentation()},
 	}
 
 	return &InstrumentationUpgrade{

pkg/instrumentation/upgrade/upgrade_test.go

@@ -78,7 +78,7 @@ func TestUpgrade(t *testing.T) {
 			config.WithAutoInstrumentationGoImage("go:1"),
 			config.WithAutoInstrumentationApacheHttpdImage("apache-httpd:1"),
 			config.WithAutoInstrumentationNginxImage("nginx:1"),
-			config.WithEnableApacheHTTPInstrumentation(true),
+			config.WithEnableApacheHttpdInstrumentation(true),
 		),
 	).Default(context.Background(), inst)
 	assert.Nil(t, err)
@@ -100,7 +100,7 @@ func TestUpgrade(t *testing.T) {
 		config.WithAutoInstrumentationGoImage("go:2"),
 		config.WithAutoInstrumentationApacheHttpdImage("apache-httpd:2"),
 		config.WithAutoInstrumentationNginxImage("nginx:2"),
-		config.WithEnableApacheHTTPInstrumentation(true),
+		config.WithEnableApacheHttpdInstrumentation(true),
 	)
 	up := NewInstrumentationUpgrade(k8sClient, ctrl.Log.WithName("instrumentation-upgrade"), &record.FakeRecorder{}, cfg)