Merge branch 'main' into 3078

Author: iblancasa

.chloggen/3474.yaml

@@ -0,0 +1,18 @@
+# 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: Make ServiceMonitor for operator metrics optional and disable it by default
+
+# One or more tracking issues related to the change
+issues: [3474]
+
+# (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: |
+  Add `--create-sm-operator-metrics` flag to create a ServiceMonitor for the operator metrics.
+  This is disabled by default, which is a breaking change, because it was enabled by default in 0.113.0 and 0.114.0.

.github/workflows/shellcheck.yaml

@@ -11,7 +11,8 @@ jobs:
     name: shellcheck
     runs-on: ubuntu-24.04
     env:
-      VERSION: v0.10.0
+      # renovate: datasource=github-releases depName=https://github.com/koalaman/shellcheck
+      SHELLCHECK_VERSION: v0.10.0
     steps:
       - uses: actions/checkout@v4
       - name: shellcheck ci scripts
@@ -21,12 +22,12 @@ jobs:
         with:
           scandir: ".ci"
           severity: warning
-          version: ${{ env.VERSION }}
+          version: ${{ env.SHELLCHECK_VERSION }}
       - name: shellcheck hack scripts
         uses: ludeeus/[email protected]
         env:
           SHELLCHECK_OPTS: -x -e SC2059 -e SC2086
         with:
           scandir: "hack"
           severity: warning
-          version: ${{ env.VERSION }}
+          version: ${{ env.SHELLCHECK_VERSION }}

bundle/openshift/manifests/opentelemetry-operator.clusterserviceversion.yaml

@@ -528,6 +528,7 @@ spec:
                 - --openshift-create-dashboard=true
                 - --feature-gates=+operator.observability.prometheus
                 - --enable-cr-metrics=true
+                - --create-sm-operator-metrics=true
                 env:
                 - name: SERVICE_ACCOUNT_NAME
                   valueFrom:

config/overlays/openshift/manager-patch.yaml

@@ -9,4 +9,5 @@
     - '--enable-go-instrumentation=true'
     - '--openshift-create-dashboard=true'
     - '--feature-gates=+operator.observability.prometheus'
-    - '--enable-cr-metrics=true'
+    - '--enable-cr-metrics=true'
+    - '--create-sm-operator-metrics=true'

controllers/reconcile_test.go

@@ -648,6 +648,13 @@ func TestOpenTelemetryCollectorReconciler_Reconcile(t *testing.T) {
 			if deletionTimestamp != nil {
 				err := k8sClient.Delete(testContext, &tt.args.params, client.PropagationPolicy(metav1.DeletePropagationForeground))
 				assert.NoError(t, err)
+				// wait until the reconciler sees the deletion
+				assert.EventuallyWithT(t, func(collect *assert.CollectT) {
+					actual := &v1beta1.OpenTelemetryCollector{}
+					err := reconciler.Get(testContext, nsn, actual)
+					assert.NoError(collect, err)
+					assert.NotNil(t, actual.GetDeletionTimestamp())
+				}, time.Second*5, time.Millisecond)
 			}
 			req := k8sreconcile.Request{
 				NamespacedName: nsn,

main.go

@@ -115,6 +115,7 @@ func main() {
 		enableNodeJSInstrumentation      bool
 		enableJavaInstrumentation        bool
 		enableCRMetrics                  bool
+		createSMOperatorMetrics          bool
 		collectorImage                   string
 		targetAllocatorImage             string
 		operatorOpAMPBridgeImage         string
@@ -154,6 +155,7 @@ func main() {
 	pflag.BoolVar(&enableNodeJSInstrumentation, constants.FlagNodeJS, true, "Controls whether the operator supports nodejs auto-instrumentation")
 	pflag.BoolVar(&enableJavaInstrumentation, constants.FlagJava, true, "Controls whether the operator supports java auto-instrumentation")
 	pflag.BoolVar(&enableCRMetrics, constants.FlagCRMetrics, false, "Controls whether exposing the CR metrics is enabled")
+	pflag.BoolVar(&createSMOperatorMetrics, "create-sm-operator-metrics", false, "Create a ServiceMonitor for the operator metrics")
 
 	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.")
@@ -219,6 +221,7 @@ func main() {
 		"enable-nodejs-instrumentation", enableNodeJSInstrumentation,
 		"enable-java-instrumentation", enableJavaInstrumentation,
 		"create-openshift-dashboard", createOpenShiftDashboard,
+		"create-sm-operator-metrics", createSMOperatorMetrics,
 		"zap-message-key", encodeMessageKey,
 		"zap-level-key", encodeLevelKey,
 		"zap-time-key", encodeTimeKey,
@@ -413,7 +416,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	if cfg.PrometheusCRAvailability() == prometheus.Available {
+	if cfg.PrometheusCRAvailability() == prometheus.Available && createSMOperatorMetrics {
 		operatorMetrics, opError := operatormetrics.NewOperatorMetrics(mgr.GetConfig(), scheme, ctrl.Log.WithName("operator-metrics-sm"))
 		if opError != nil {
 			setupLog.Error(opError, "Failed to create the operator metrics SM")

renovate.json

@@ -17,9 +17,10 @@
     },
     {
       "customType": "regex",
-      "description" : "Update tool versions in the Makefile",
+      "description" : "Update tool versions in the Makefile and Github Actions",
       "fileMatch": [
-        "(^|/)Makefile$"
+        "(^|/)Makefile$",
+        "(^|/)\\.github/workflows/.+\\.ya?ml$"
       ],
       "matchStrings": [
         "# renovate: datasource=(?<datasource>[a-z-.]+?) depName=(?<depName>[^\\s]+?)(?: (?:packageName)=(?<packageName>[^\\s]+?))?(?: versioning=(?<versioning>[^\\s]+?))?(?: extractVersion=(?<extractVersion>[^\\s]+?))?(?: registryUrl=(?<registryUrl>[^\\s]+?))\\s+[A-Za-z0-9_]+?_VERSION\\s*:*\\??=\\s*[\"']?(?<currentValue>.+?)[\"']?\\s"