Merge branch 'main' of github.com:open-telemetry/opentelemetry-operator into 2603-part-two

Author: jaronoff97

.chloggen/autoinstrumentation-java-cli-flag.yaml

@@ -0,0 +1,16 @@
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: breaking
+
+# The name of the component, or a single word describing the area of concern, (e.g. collector, target allocator, auto-instrumentation, opamp, github action)
+component: operator
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: change java instrumentation feature gate operator.autoinstrumentation.java into command line flag --enable-java-instrumentation
+
+# One or more tracking issues related to the change
+issues: [2673, 2582]
+
+# (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:

.chloggen/chore_remove-ta-rewrite-flag.yaml

@@ -0,0 +1,16 @@
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: breaking
+
+# The name of the component, or a single word describing the area of concern, (e.g. collector, target allocator, auto-instrumentation, opamp, github action)
+component: target allocator
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Remove `operator.collector.rewritetargetallocator` feature flag
+
+# One or more tracking issues related to the change
+issues: [2796]
+
+# (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:

apis/v1alpha1/collector_webhook.go

@@ -32,7 +32,6 @@ import (
 	"github.com/open-telemetry/opentelemetry-operator/internal/config"
 	ta "github.com/open-telemetry/opentelemetry-operator/internal/manifests/targetallocator/adapters"
 	"github.com/open-telemetry/opentelemetry-operator/internal/rbac"
-	"github.com/open-telemetry/opentelemetry-operator/pkg/featuregate"
 )
 
 var (
@@ -365,7 +364,7 @@ func (c CollectorWebhook) validateTargetAllocatorConfig(ctx context.Context, r *
 	if err != nil {
 		return nil, fmt.Errorf("the OpenTelemetry Spec Prometheus configuration is incorrect, %w", err)
 	}
-	err = ta.ValidatePromConfig(promCfg, r.Spec.TargetAllocator.Enabled, featuregate.EnableTargetAllocatorRewrite.IsEnabled())
+	err = ta.ValidatePromConfig(promCfg, r.Spec.TargetAllocator.Enabled)
 	if err != nil {
 		return nil, fmt.Errorf("the OpenTelemetry Spec Prometheus configuration is incorrect, %w", err)
 	}

apis/v1beta1/allocation_strategy.go

@@ -16,7 +16,7 @@ package v1beta1
 
 type (
 	// TargetAllocatorAllocationStrategy represent a strategy Target Allocator uses to distribute targets to each collector
-	// +kubebuilder:validation:Enum=least-weighted;consistent-hashing
+	// +kubebuilder:validation:Enum=least-weighted;consistent-hashing;per-node
 	TargetAllocatorAllocationStrategy string
 	// TargetAllocatorFilterStrategy represent a filtering strategy for targets before they are assigned to collectors
 	// +kubebuilder:validation:Enum="";relabel-config
@@ -30,6 +30,9 @@ const (
 	// TargetAllocatorAllocationStrategyConsistentHashing targets will be consistently added to collectors, which allows a high-availability setup.
 	TargetAllocatorAllocationStrategyConsistentHashing TargetAllocatorAllocationStrategy = "consistent-hashing"
 
+	// TargetAllocatorAllocationStrategyPerNode targets will be assigned to the collector on the node they reside on (use only with daemon set).
+	TargetAllocatorAllocationStrategyPerNode TargetAllocatorAllocationStrategy = "per-node"
+
 	// TargetAllocatorFilterStrategyRelabelConfig targets will be consistently drops targets based on the relabel_config.
 	TargetAllocatorFilterStrategyRelabelConfig TargetAllocatorFilterStrategy = "relabel-config"
 )

bundle/manifests/opentelemetry.io_opentelemetrycollectors.yaml

@@ -7146,6 +7146,7 @@ spec:
                     enum:
                     - least-weighted
                     - consistent-hashing
+                    - per-node
                     type: string
                   enabled:
                     type: boolean

config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml

@@ -7132,6 +7132,7 @@ spec:
                     enum:
                     - least-weighted
                     - consistent-hashing
+                    - per-node
                     type: string
                   enabled:
                     type: boolean

config/crd/bases/opentelemetry.io_targetallocators.yaml

@@ -1072,6 +1072,7 @@ spec:
                 enum:
                 - least-weighted
                 - consistent-hashing
+                - per-node
                 type: string
               args:
                 additionalProperties:

docs/api.md

@@ -40460,7 +40460,7 @@ The current options are least-weighted, consistent-hashing and per-node. The def
 consistent-hashing.
 WARNING: The per-node strategy currently ignores targets without a Node, like control plane components.<br/>
           <br/>
-            <i>Enum</i>: least-weighted, consistent-hashing<br/>
+            <i>Enum</i>: least-weighted, consistent-hashing, per-node<br/>
             <i>Default</i>: consistent-hashing<br/>
         </td>
         <td>false</td>

internal/config/main.go

@@ -49,6 +49,7 @@ type Config struct {
 	enableDotNetInstrumentation         bool
 	enableNginxInstrumentation          bool
 	enablePythonInstrumentation         bool
+	enableJavaInstrumentation           bool
 	autoInstrumentationDotNetImage      string
 	autoInstrumentationGoImage          string
 	autoInstrumentationApacheHttpdImage string
@@ -74,6 +75,7 @@ func New(opts ...Option) Config {
 		operatorOpAMPBridgeConfigMapEntry: defaultOperatorOpAMPBridgeConfigMapEntry,
 		logger:                            logf.Log.WithName("config"),
 		version:                           version.Get(),
+		enableJavaInstrumentation:         true,
 	}
 	for _, opt := range opts {
 		opt(&o)
@@ -89,6 +91,7 @@ func New(opts ...Option) Config {
 		enableDotNetInstrumentation:         o.enableDotNetInstrumentation,
 		enableNginxInstrumentation:          o.enableNginxInstrumentation,
 		enablePythonInstrumentation:         o.enablePythonInstrumentation,
+		enableJavaInstrumentation:           o.enableJavaInstrumentation,
 		targetAllocatorImage:                o.targetAllocatorImage,
 		operatorOpAMPBridgeImage:            o.operatorOpAMPBridgeImage,
 		targetAllocatorConfigMapEntry:       o.targetAllocatorConfigMapEntry,
@@ -151,6 +154,11 @@ func (c *Config) EnableNginxAutoInstrumentation() bool {
 	return c.enableNginxInstrumentation
 }
 
+// EnableJavaAutoInstrumentation is true when the operator supports nginx auto instrumentation.
+func (c *Config) EnableJavaAutoInstrumentation() bool {
+	return c.enableJavaInstrumentation
+}
+
 // EnablePythonAutoInstrumentation is true when the operator supports dotnet auto instrumentation.
 func (c *Config) EnablePythonAutoInstrumentation() bool {
 	return c.enablePythonInstrumentation

internal/config/options.go

@@ -48,6 +48,7 @@ type options struct {
 	enableDotNetInstrumentation         bool
 	enableNginxInstrumentation          bool
 	enablePythonInstrumentation         bool
+	enableJavaInstrumentation           bool
 	targetAllocatorConfigMapEntry       string
 	operatorOpAMPBridgeConfigMapEntry   string
 	targetAllocatorImage                string
@@ -108,6 +109,11 @@ func WithEnableNginxInstrumentation(s bool) Option {
 		o.enableNginxInstrumentation = s
 	}
 }
+func WithEnableJavaInstrumentation(s bool) Option {
+	return func(o *options) {
+		o.enableJavaInstrumentation = s
+	}
+}
 func WithEnablePythonInstrumentation(s bool) Option {
 	return func(o *options) {
 		o.enablePythonInstrumentation = s

internal/manifests/collector/config_replace.go

@@ -25,7 +25,6 @@ import (
 	"github.com/open-telemetry/opentelemetry-operator/internal/manifests/collector/adapters"
 	ta "github.com/open-telemetry/opentelemetry-operator/internal/manifests/targetallocator/adapters"
 	"github.com/open-telemetry/opentelemetry-operator/internal/naming"
-	"github.com/open-telemetry/opentelemetry-operator/pkg/featuregate"
 )
 
 type targetAllocator struct {
@@ -62,43 +61,24 @@ func ReplaceConfig(instance v1beta1.OpenTelemetryCollector) (string, error) {
 		return "", getCfgPromErr
 	}
 
-	validateCfgPromErr := ta.ValidatePromConfig(promCfgMap, instance.Spec.TargetAllocator.Enabled, featuregate.EnableTargetAllocatorRewrite.IsEnabled())
+	validateCfgPromErr := ta.ValidatePromConfig(promCfgMap, instance.Spec.TargetAllocator.Enabled)
 	if validateCfgPromErr != nil {
 		return "", validateCfgPromErr
 	}
 
-	if featuregate.EnableTargetAllocatorRewrite.IsEnabled() {
-		// To avoid issues caused by Prometheus validation logic, which fails regex validation when it encounters
-		// $$ in the prom config, we update the YAML file directly without marshaling and unmarshalling.
-		updPromCfgMap, getCfgPromErr := ta.AddTAConfigToPromConfig(promCfgMap, naming.TAService(instance.Name))
-		if getCfgPromErr != nil {
-			return "", getCfgPromErr
-		}
-
-		// type coercion checks are handled in the AddTAConfigToPromConfig method above
-		config["receivers"].(map[interface{}]interface{})["prometheus"] = updPromCfgMap
-
-		out, updCfgMarshalErr := yaml.Marshal(config)
-		if updCfgMarshalErr != nil {
-			return "", updCfgMarshalErr
-		}
-		return string(out), nil
-	}
-
 	// To avoid issues caused by Prometheus validation logic, which fails regex validation when it encounters
 	// $$ in the prom config, we update the YAML file directly without marshaling and unmarshalling.
-	updPromCfgMap, err := ta.AddHTTPSDConfigToPromConfig(promCfgMap, naming.TAService(instance.Name))
-	if err != nil {
-		return "", err
+	updPromCfgMap, getCfgPromErr := ta.AddTAConfigToPromConfig(promCfgMap, naming.TAService(instance.Name))
+	if getCfgPromErr != nil {
+		return "", getCfgPromErr
 	}
 
-	// To avoid issues caused by Prometheus validation logic, which fails regex validation when it encounters
-	// type coercion checks are handled in the ConfigToPromConfig method above
+	// type coercion checks are handled in the AddTAConfigToPromConfig method above
 	config["receivers"].(map[interface{}]interface{})["prometheus"] = updPromCfgMap
 
-	out, err := yaml.Marshal(config)
-	if err != nil {
-		return "", err
+	out, updCfgMarshalErr := yaml.Marshal(config)
+	if updCfgMarshalErr != nil {
+		return "", updCfgMarshalErr
 	}
 
 	return string(out), nil

internal/manifests/targetallocator/adapters/config_to_prom_config.go

@@ -15,7 +15,6 @@
 package adapters
 
 import (
-	"errors"
 	"fmt"
 	"net/url"
 	"regexp"
@@ -297,20 +296,12 @@ func AddTAConfigToPromConfig(prometheus map[interface{}]interface{}, taServiceNa
 }
 
 // ValidatePromConfig checks if the prometheus receiver config is valid given other collector-level settings.
-func ValidatePromConfig(config map[interface{}]interface{}, targetAllocatorEnabled bool, targetAllocatorRewriteEnabled bool) error {
+func ValidatePromConfig(config map[interface{}]interface{}, targetAllocatorEnabled bool) error {
+	// TODO: Rethink this validation, now that target allocator rewrite is enabled permanently.
+
 	_, promConfigExists := config["config"]
 
 	if targetAllocatorEnabled {
-		if targetAllocatorRewriteEnabled { // if rewrite is enabled, we will add a target_allocator section during rewrite
-			return nil
-		}
-		_, targetAllocatorExists := config["target_allocator"]
-
-		// otherwise, either the target_allocator or config section needs to be here
-		if !(promConfigExists || targetAllocatorExists) {
-			return errors.New("either target allocator or prometheus config needs to be present")
-		}
-
 		return nil
 	}
 	// if target allocator isn't enabled, we need a config section

internal/manifests/targetallocator/adapters/config_to_prom_config_test.go

@@ -15,7 +15,6 @@
 package adapters_test
 
 import (
-	"errors"
 	"fmt"
 	"net/url"
 	"reflect"
@@ -302,66 +301,53 @@ func TestAddTAConfigToPromConfig(t *testing.T) {
 
 func TestValidatePromConfig(t *testing.T) {
 	testCases := []struct {
-		description                   string
-		config                        map[interface{}]interface{}
-		targetAllocatorEnabled        bool
-		targetAllocatorRewriteEnabled bool
-		expectedError                 error
+		description            string
+		config                 map[interface{}]interface{}
+		targetAllocatorEnabled bool
+		expectedError          error
 	}{
 		{
-			description:                   "target_allocator and rewrite enabled",
-			config:                        map[interface{}]interface{}{},
-			targetAllocatorEnabled:        true,
-			targetAllocatorRewriteEnabled: true,
-			expectedError:                 nil,
+			description:            "target_allocator enabled",
+			config:                 map[interface{}]interface{}{},
+			targetAllocatorEnabled: true,
+			expectedError:          nil,
 		},
 		{
 			description: "target_allocator enabled, target_allocator section present",
 			config: map[interface{}]interface{}{
 				"target_allocator": map[interface{}]interface{}{},
 			},
-			targetAllocatorEnabled:        true,
-			targetAllocatorRewriteEnabled: false,
-			expectedError:                 nil,
+			targetAllocatorEnabled: true,
+			expectedError:          nil,
 		},
 		{
 			description: "target_allocator enabled, config section present",
 			config: map[interface{}]interface{}{
 				"config": map[interface{}]interface{}{},
 			},
-			targetAllocatorEnabled:        true,
-			targetAllocatorRewriteEnabled: false,
-			expectedError:                 nil,
-		},
-		{
-			description:                   "target_allocator enabled, neither section present",
-			config:                        map[interface{}]interface{}{},
-			targetAllocatorEnabled:        true,
-			targetAllocatorRewriteEnabled: false,
-			expectedError:                 errors.New("either target allocator or prometheus config needs to be present"),
+			targetAllocatorEnabled: true,
+			expectedError:          nil,
 		},
 		{
 			description: "target_allocator disabled, config section present",
 			config: map[interface{}]interface{}{
 				"config": map[interface{}]interface{}{},
 			},
-			targetAllocatorEnabled:        false,
-			targetAllocatorRewriteEnabled: false,
-			expectedError:                 nil,
+			targetAllocatorEnabled: false,
+			expectedError:          nil,
 		},
 		{
-			description:                   "target_allocator disabled, config section not present",
-			config:                        map[interface{}]interface{}{},
-			targetAllocatorEnabled:        false,
-			targetAllocatorRewriteEnabled: false,
-			expectedError:                 fmt.Errorf("no %s available as part of the configuration", "prometheusConfig"),
+			description:            "target_allocator disabled, config section not present",
+			config:                 map[interface{}]interface{}{},
+			targetAllocatorEnabled: false,
+			expectedError:          fmt.Errorf("no %s available as part of the configuration", "prometheusConfig"),
 		},
 	}
 
 	for _, testCase := range testCases {
 		testCase := testCase
 		t.Run(testCase.description, func(t *testing.T) {
-			err := ta.ValidatePromConfig(testCase.config, testCase.targetAllocatorEnabled, testCase.targetAllocatorRewriteEnabled)
+			err := ta.ValidatePromConfig(testCase.config, testCase.targetAllocatorEnabled)
 			assert.Equal(t, testCase.expectedError, err)
 		})
 	}

main.go

@@ -114,6 +114,7 @@ func main() {
 		enableDotNetInstrumentation      bool
 		enablePythonInstrumentation      bool
 		enableNginxInstrumentation       bool
+		enableJavaInstrumentation        bool
 		collectorImage                   string
 		targetAllocatorImage             string
 		operatorOpAMPBridgeImage         string
@@ -142,6 +143,7 @@ func main() {
 	pflag.BoolVar(&enableDotNetInstrumentation, constants.FlagDotNet, true, "Controls whether the operator supports dotnet auto-instrumentation")
 	pflag.BoolVar(&enablePythonInstrumentation, constants.FlagPython, true, "Controls whether the operator supports python auto-instrumentation")
 	pflag.BoolVar(&enableNginxInstrumentation, constants.FlagNginx, false, "Controls whether the operator supports nginx auto-instrumentation")
+	pflag.BoolVar(&enableJavaInstrumentation, constants.FlagJava, true, "Controls whether the operator supports java 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.")
@@ -186,6 +188,7 @@ func main() {
 		"enable-dotnet-instrumentation", enableDotNetInstrumentation,
 		"enable-python-instrumentation", enablePythonInstrumentation,
 		"enable-nginx-instrumentation", enableNginxInstrumentation,
+		"enable-java-instrumentation", enableJavaInstrumentation,
 	)
 
 	restConfig := ctrl.GetConfigOrDie()
@@ -207,6 +210,7 @@ func main() {
 		config.WithEnableDotNetInstrumentation(enableDotNetInstrumentation),
 		config.WithEnableNginxInstrumentation(enableNginxInstrumentation),
 		config.WithEnablePythonInstrumentation(enablePythonInstrumentation),
+		config.WithEnableJavaInstrumentation(enableJavaInstrumentation),
 		config.WithTargetAllocatorImage(targetAllocatorImage),
 		config.WithOperatorOpAMPBridgeImage(operatorOpAMPBridgeImage),
 		config.WithAutoInstrumentationJavaImage(autoInstrumentationJava),

pkg/constants/env.go

@@ -41,4 +41,5 @@ const (
 	FlagDotNet      = "enable-dotnet-instrumentation"
 	FlagPython      = "enable-python-instrumentation"
 	FlagNginx       = "enable-nginx-instrumentation"
+	FlagJava        = "enable-java-instrumentation"
 )