Merge branch 'main' into fix/operator-disable-prom-annotations-5043

Author: praveen9354

.chloggen/crds_wip.yaml

@@ -0,0 +1,35 @@
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: enhancement
+
+# 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: auto-instrumentation
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Allow to run the mutating webhook using static configuration, without the need for CRDs.
+
+# One or more tracking issues related to the change
+issues: [4201]
+
+# (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: |
+  With this change, you can deploy the manager as a mutating webhook without setting up a v1alpha1.Instrumentation custom resource
+  or the v1alpha1.Instrumentation CRD.
+  
+  Instead, you can now set up instrumentation by configuring the manager via its config file with these settings:
+  ```yaml
+    ignore-missing-collector-crds: true 
+    enable-instrumentation-crds: false # Ignore that the CRD is not registered.
+    enable-multi-instrumentation: false
+    instrumentations: # Static configuration for our instrumentation
+      spec:
+        exporter:
+          endpoint: http://collector.default.svc:4318
+        propagators:
+          - tracecontext
+          - baggage
+          - b3
+        java:
+          image: "java-autoinstrumentation:dev"
+  ```

.chloggen/ta-manifests.yaml .chloggen/events-receiver-role.yaml.chloggen/ta-manifests.yaml renamed to .chloggen/events-receiver-role.yaml

@@ -1,14 +1,14 @@
 # One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
-change_type: enhancement
+change_type: bug_fix
 
 # 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
+component: collector
 
 # A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
-note: Introduce kustomizaton manifests for standalone deployment
+note: Remove unnecessary RBAC permissions from the events receiver.
 
 # One or more tracking issues related to the change
-issues: [4945]
+issues: [5073]
 
 # (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.

.chloggen/split-rbac-markers.yaml …ggen/fix_jaeger-query-ext-grpc-port.yaml.chloggen/split-rbac-markers.yaml renamed to .chloggen/fix_jaeger-query-ext-grpc-port.yaml .chloggen/split-rbac-markers.yaml renamed to .chloggen/fix_jaeger-query-ext-grpc-port.yaml

@@ -1,19 +1,16 @@
 # One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
-change_type: enhancement
+change_type: bug_fix
 
 # 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
+component: collector
 
 # A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
-note: Split kubebuilder RBAC markers and restrict pod permissions to get/list/watch only
+note: Fix when configuring a gRPC port for the `jaeger_query` extension, the `collector-extension` Service only generates an HTTP port and is missing the gRPC port.
 
 # One or more tracking issues related to the change
-issues: [3156]
+issues: [4912]
 
 # (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: |
-  The operator does not create, update, patch, or delete Pod objects directly;
-  pods are managed by Deployment, DaemonSet, and StatefulSet controllers.
-  Also reduced targetallocators/finalizers to only the `update` verb.
+subtext:

…pgrade-default-java-instrumentation.yaml …loggen/fix_preserve-telemetry-shape.yaml.chloggen/feat_upgrade-default-java-instrumentation.yaml renamed to .chloggen/fix_preserve-telemetry-shape.yaml .chloggen/feat_upgrade-default-java-instrumentation.yaml renamed to .chloggen/fix_preserve-telemetry-shape.yaml

@@ -1,20 +1,17 @@
 # One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
-change_type: breaking
+change_type: bug_fix
 
 # 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: auto-instrumentation
+component: collector
 
 # A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
-note: Update default Java auto-instrumentation version from 1.33.6 to 2.27.0
+note: Explicitly set without_type_suffix, without_units, and without_scope_info to false on the operator-injected Prometheus telemetry reader.
 
 # One or more tracking issues related to the change
-issues: [4996]
+issues: [5075]
 
 # (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: |
-  This is a breaking change due to HTTP semantic convention changes between versions.
-  Existing Instrumentation CRs using a 1.x.x version will NOT be automatically upgraded.
-  To upgrade, manually update the image in your Instrumentation CR after reviewing the migration guide.
-  See https://github.com/open-telemetry/opentelemetry-operator/issues/2542 for details.
+  Preserves historical metric names. Without this, users upgrading to a collector containing open-telemetry/opentelemetry-collector#15027 would see operator-managed collector metric names silently change shape. Added alpha feature gate operator.collector.usedefaulttelemetryshape (off by default) to opt into collector defaults instead. The gate will be promoted to beta (on by default) in a future release.

.chloggen/move-otelconfig-and-metrics-to-internal.yaml

@@ -0,0 +1,29 @@
+# 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: api
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Move config parsing and CRD metrics from apis to internal package
+
+# One or more tracking issues related to the change
+issues: [4362]
+
+# (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: |
+  - Methods on `*Config` (package `apis/v1beta1`) converted to standalone functions in `internal/otelconfig`, now taking `*v1beta1.Config` as the first parameter:
+      - GetEnabledComponents, GetReceiverPorts, GetExporterPorts, GetExtensionPorts, GetReceiverAndExporterPorts, GetAllPorts, GetEnvironmentVariables, GetAllRbacRules, ApplyDefaults, GetLivenessProbe, GetReadinessProbe, GetStartupProbe, Yaml, NullObjects
+  - Methods on `*Service` converted to functions in `internal/otelconfig`:
+      - MetricsEndpoint, GetTelemetry
+      - ApplyDefaults → renamed to ServiceApplyDefaults
+  - Method on `*Telemetry` converted to function:
+      - ToAnyConfig → renamed to TelemetryToAnyConfig
+  -  Functions moved from `apis/v1beta1` to `internal/metrics` with renames:
+      - BootstrapMetrics → Bootstrap
+      - NewMetrics(prv, ctx, cl) → New(ctx, prv, cl) (parameter reorder: ctx now first)
+  - Types moved out of `apis/v1beta1`:
+      - MetricsConfig, Telemetry → internal/otelconfig
+      - Metrics → internal/metrics

.chloggen/secrets-access-namespaces.yaml

@@ -2,19 +2,15 @@
 change_type: bug_fix
 
 # 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: auto-instrumentation
+component: collector
 
 # A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
-note: Validate `spec.apacheHttpd.configPath` and `spec.nginx.configFile` more strictly for Instrumentations
+note: Skip provisioning Services, Ingress, NetworkPolicy, and HPA for sidecar mode collectors since the operator does not control the Pod lifecycle in that mode. PodMonitors are still provisioned when metrics are enabled.
 
 # One or more tracking issues related to the change
-issues: [4925]
+issues: [4934]
 
 # (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: |
-  Values from `Instrumentation.spec.apacheHttpd.configPath` and `Instrumentation.spec.nginx.configFile`
-  are now passed to init container scripts as positional arguments instead of being concatenated into
-  the shell command string, so they are no longer parsed by the shell. They're also restricted to usual Unix
-  path characters and limited to 256 characters.
+subtext:

…fix_nginx-instrumentation-arguments.yaml .chloggen/skip-services-sidecar-mode.yaml.chloggen/fix_nginx-instrumentation-arguments.yaml renamed to .chloggen/skip-services-sidecar-mode.yaml .chloggen/fix_nginx-instrumentation-arguments.yaml renamed to .chloggen/skip-services-sidecar-mode.yaml

@@ -1,31 +1,5 @@
 version: 2
 updates:
-  - package-ecosystem: gomod
-    directory: /
-    schedule:
-      interval: weekly
-    # Create a group of dependencies to be updated together in one pull request
-    groups:
-      golang-org-x:
-        patterns:
-          - "golang.org/x/*"
-      prometheus:
-        patterns:
-          - "github.com/prometheus-operator/prometheus-operator"
-          - "github.com/prometheus-operator/prometheus-operator/*"
-          - "github.com/prometheus/prometheus"
-          - "github.com/prometheus/prometheus/*"
-          - "github.com/prometheus/client_go"
-          - "github.com/prometheus/client_go/*"
-      kubernetes:
-        patterns:
-          - "k8s.io/*"
-          - "sigs.k8s.io/*"
-      otel:
-        patterns:
-          - "go.opentelemetry.io/otel"
-          - "go.opentelemetry.io/otel/*"
-
   - package-ecosystem: github-actions
     directory: /
     schedule:

.github/dependabot.yml

@@ -89,15 +89,15 @@ jobs:
         go-version: "~1.26.3"
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v3.29.5
+      uses: github/codeql-action/init@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v3.29.5
       with:
         languages: go
 
     - name: Autobuild
-      uses: github/codeql-action/autobuild@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v3.29.5
+      uses: github/codeql-action/autobuild@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v3.29.5
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v3.29.5
+      uses: github/codeql-action/analyze@9e0d7b8d25671d64c341c19c0152d693099fb5ba # v3.29.5
 
   govulncheck:
     name: Govulncheck

.github/workflows/continuous-integration.yaml

@@ -71,6 +71,7 @@ jobs:
         - e2e-autoscale
         - e2e-instrumentation-default
         - e2e-instrumentation
+        - e2e-no-crds
         - e2e-opampbridge
         - e2e-pdb
         - e2e-prometheuscr
@@ -102,6 +103,8 @@ jobs:
           setup: "add-rbac-permissions-to-operator prepare-e2e"
         - group: e2e-ta-standalone
           setup: "prepare-e2e-ta-standalone"
+        - group: e2e-no-crds
+          setup: "prepare-e2e-no-crds"
 
     steps:
     - name: Check out code into the Go module directory