Merge remote-tracking branch 'refs/remotes/upstream/main' into scrape…

…_config_probe_selector # Conflicts: # bundle/community/manifests/opentelemetry-operator.clusterserviceversion.yaml # bundle/openshift/manifests/opentelemetry-operator.clusterserviceversion.yaml
open-telemetry · Dec 4, 2024 · eefadde · eefadde
2 parents 5bca0ff + 42a689e
commit eefadde
Show file tree

Hide file tree

Showing 38 changed files with 648 additions and 238 deletions.
diff --git a/.chloggen/3432.yaml b/.chloggen/3432.yaml
diff --git a/.chloggen/3446.yaml b/.chloggen/3446.yaml
diff --git a/.chloggen/add_fallback_strategy_for_per_node_strategy.yaml b/.chloggen/add_fallback_strategy_for_per_node_strategy.yaml
diff --git a/.chloggen/chore_change-kube-rbac-proxy-image-registry.yaml b/.chloggen/chore_change-kube-rbac-proxy-image-registry.yaml
diff --git a/.chloggen/3429.yaml → .chloggen/fix-prometheus-rule-file.yaml b/.chloggen/3429.yaml → .chloggen/fix-prometheus-rule-file.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: collector
+component: 'github action'
 
 # A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
-note: Create RBAC rules for the k8sobjects receiver automatically.
+note: Add new line character at the end of PrometheusRule file.
 
 # One or more tracking issues related to the change
-issues: [3429]
+issues: [3503]
 
 # (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.

diff --git a/.../bump-base-instrumentation-mem-limit.yaml → .chloggen/revert-3379-otel-configmap.yaml b/.../bump-base-instrumentation-mem-limit.yaml → .chloggen/revert-3379-otel-configmap.yaml
@@ -5,12 +5,15 @@ change_type: bug_fix
 component: auto-instrumentation
 
 # A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
-note: Bump base memory requirements for python and go
+note: Reverts PR 3379 which inadvertently broke users setting JAVA_TOOL_OPTIONS
 
 # One or more tracking issues related to the change
-issues: [3479]
+issues: [3463]
 
 # (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:
+subtext: |
+  Reverts a previous PR which was causing JAVA_TOOL_OPTIONS to not be overriden when
+  set by users. This was resulting in application crashloopbackoffs for users relying
+  on java autoinstrumentation.
diff --git a/.chloggen/3427.yaml → .chloggen/service-extension.yaml b/.chloggen/3427.yaml → .chloggen/service-extension.yaml
@@ -5,10 +5,10 @@ change_type: enhancement
 component: collector
 
 # A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
-note: Create RBAC rules for the k8s_cluster receiver automatically.
+note: support for creating a service for extensions when ports are specified.
 
 # One or more tracking issues related to the change
-issues: [3427]
+issues: [3460]
 
 # (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.

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,50 @@
 
 <!-- next version -->
 
+## 0.114.0
+
+### 💡 Enhancements 💡
+
+- `collector`: Create RBAC rules for the k8s_cluster receiver automatically. (#3427)
+- `collector`: Create RBAC rules for the k8sobjects receiver automatically. (#3429)
+- `collector`: Add a warning message when one created collector needs extra RBAC permissions and the service account doesn't have them. (#3432)
+- `target allocator`: Added allocation_fallback_strategy option as fallback strategy for per-node allocation strategy, can be enabled with feature flag operator.targetallocator.fallbackstrategy (#3477)
+
+  If using per-node allocation strategy, targets that are not attached to a node will not
+  be allocated. As the per-node strategy is required when running as a daemonset, it is 
+  not possible to assign some targets under a daemonset deployment.
+  Feature flag operator.targetallocator.fallbackstrategy has been added and results in consistent-hashing
+  being used as the fallback allocation strategy for "per-node" only at this time.
+
+- `auto-instrumentation`: updated node auto-instrumentation dependencies to the latest version (#3476)
+
+  - auto-instrumentations-node to 0.53.0
+  - exporter-metrics-otlp-grpc to 0.55.0
+  - exporter-prometheus to 0.55.0
+
+- `operator`: Replace references to gcr.io/kubebuilder/kube-rbac-proxy with quay.io/brancz/kube-rbac-proxy (#3485)
+
+### 🧰 Bug fixes 🧰
+
+- `operator`: Operator pod crashed if the Service Monitor for the operator metrics was created before by another operator pod. (#3446)
+
+  Operator fails when the pod is restarted and the Service Monitor for operator metrics was already created by another operator pod.
+  To fix this, the operator now sets the owner reference on the Service Monitor to itself and checks if the Service Monitor already exists.
+
+- `auto-instrumentation`: Bump base memory requirements for python and go (#3479)
+
+### Components
+
+* [OpenTelemetry Collector - v0.114.0](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.114.0)
+* [OpenTelemetry Contrib - v0.114.0](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.114.0)
+* [Java auto-instrumentation - v1.33.5](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v1.33.5)
+* [.NET auto-instrumentation - v1.2.0](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/tag/v1.2.0)
+* [Node.JS - v0.53.0](https://github.com/open-telemetry/opentelemetry-js/releases/tag/experimental%2Fv0.53.0)
+* [Python - v0.48b0](https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/v0.48b0)
+* [Go - v0.17.0-alpha](https://github.com/open-telemetry/opentelemetry-go-instrumentation/releases/tag/v0.17.0-alpha)
+* [ApacheHTTPD - 1.0.4](https://github.com/open-telemetry/opentelemetry-cpp-contrib/releases/tag/webserver%2Fv1.0.4)
+* [Nginx - 1.0.4](https://github.com/open-telemetry/opentelemetry-cpp-contrib/releases/tag/webserver%2Fv1.0.4)
+
 ## 0.113.0
 
 ### 💡 Enhancements 💡

diff --git a/RELEASE.md b/RELEASE.md
@@ -44,10 +44,10 @@ The operator should be released within a week after the [OpenTelemetry collector
 
 | Version  | Release manager |
 |----------|-----------------|
-| v0.114.0 | @TylerHelmuth   |
-| v0.115.0 | @jaronoff97     |
-| v0.116.0 | @swiatekm       |
+| v0.115.0 | @TylerHelmuth   |
+| v0.116.0 | @jaronoff97     |
 | v0.117.0 | @iblancasa      |
 | v0.118.0 | @frzifus        |
 | v0.119.0 | @yuriolisa      |
 | v0.120.0 | @pavolloffay    |
+| v0.121.0 | @swiatekm       |
diff --git a/apis/v1beta1/config.go b/apis/v1beta1/config.go
@@ -206,7 +206,12 @@ func (c *Config) getPortsForComponentKinds(logger logr.Logger, componentKinds ..
 		case KindProcessor:
 			continue
 		case KindExtension:
-			continue
+			retriever = extensions.ParserFor
+			if c.Extensions == nil {
+				cfg = AnyConfig{}
+			} else {
+				cfg = *c.Extensions
+			}
 		}
 		for componentName := range enabledComponents[componentKind] {
 			// TODO: Clean up the naming here and make it simpler to use a retriever.
@@ -318,10 +323,18 @@ func (c *Config) GetExporterPorts(logger logr.Logger) ([]corev1.ServicePort, err
 	return c.getPortsForComponentKinds(logger, KindExporter)
 }
 
-func (c *Config) GetAllPorts(logger logr.Logger) ([]corev1.ServicePort, error) {
+func (c *Config) GetExtensionPorts(logger logr.Logger) ([]corev1.ServicePort, error) {
+	return c.getPortsForComponentKinds(logger, KindExtension)
+}
+
+func (c *Config) GetReceiverAndExporterPorts(logger logr.Logger) ([]corev1.ServicePort, error) {
 	return c.getPortsForComponentKinds(logger, KindReceiver, KindExporter)
 }
 
+func (c *Config) GetAllPorts(logger logr.Logger) ([]corev1.ServicePort, error) {
+	return c.getPortsForComponentKinds(logger, KindReceiver, KindExporter, KindExtension)
+}
+
 func (c *Config) GetEnvironmentVariables(logger logr.Logger) ([]corev1.EnvVar, error) {
 	return c.getEnvironmentVariablesForComponentKinds(logger, KindReceiver)
 }

diff --git a/autoinstrumentation/nodejs/package.json b/autoinstrumentation/nodejs/package.json
@@ -14,8 +14,8 @@
         "typescript": "^5.6.3"
     },
     "dependencies": {
-        "@opentelemetry/auto-instrumentations-node": "0.52.1",
-        "@opentelemetry/exporter-metrics-otlp-grpc": "0.54.0",
-        "@opentelemetry/exporter-prometheus": "0.54.0"
+        "@opentelemetry/exporter-metrics-otlp-grpc": "0.55.0",
+        "@opentelemetry/auto-instrumentations-node": "0.53.0",
+        "@opentelemetry/exporter-prometheus": "0.55.0"
     }
 }
diff --git a/bundle/community/manifests/opentelemetry-operator.clusterserviceversion.yaml b/bundle/community/manifests/opentelemetry-operator.clusterserviceversion.yaml
@@ -99,13 +99,13 @@ metadata:
     categories: Logging & Tracing,Monitoring
     certified: "false"
     containerImage: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator
-    createdAt: "2024-11-18T05:42:43Z"
+    createdAt: "2024-11-27T11:54:33Z"
     description: Provides the OpenTelemetry components, including the Collector
     operators.operatorframework.io/builder: operator-sdk-v1.29.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: github.com/open-telemetry/opentelemetry-operator
     support: OpenTelemetry Community
-  name: opentelemetry-operator.v0.113.0
+  name: opentelemetry-operator.v0.114.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -483,7 +483,7 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: spec.serviceAccountName
-                image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.113.0
+                image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.114.0
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -591,7 +591,7 @@ spec:
   minKubeVersion: 1.23.0
   provider:
     name: OpenTelemetry Community
-  version: 0.113.0
+  version: 0.114.0
   webhookdefinitions:
   - admissionReviewVersions:
     - v1alpha1

diff --git a/...ests/opentelemetry-operator-prometheus-rules_monitoring.coreos.com_v1_prometheusrule.yaml b/...ests/opentelemetry-operator-prometheus-rules_monitoring.coreos.com_v1_prometheusrule.yaml
@@ -21,4 +21,4 @@ spec:
     - expr: sum by (type) (opentelemetry_collector_connectors)
       record: type:opentelemetry_collector_connectors:sum
     - expr: sum by (type) (opentelemetry_collector_info)
-      record: type:opentelemetry_collector_info:sum
+      record: type:opentelemetry_collector_info:sum
diff --git a/bundle/openshift/manifests/opentelemetry-operator.clusterserviceversion.yaml b/bundle/openshift/manifests/opentelemetry-operator.clusterserviceversion.yaml
@@ -99,13 +99,13 @@ metadata:
     categories: Logging & Tracing,Monitoring
     certified: "false"
     containerImage: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator
-    createdAt: "2024-11-18T05:42:44Z"
+    createdAt: "2024-11-27T11:54:33Z"
     description: Provides the OpenTelemetry components, including the Collector
     operators.operatorframework.io/builder: operator-sdk-v1.29.0
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
     repository: github.com/open-telemetry/opentelemetry-operator
     support: OpenTelemetry Community
-  name: opentelemetry-operator.v0.113.0
+  name: opentelemetry-operator.v0.114.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -487,7 +487,7 @@ spec:
                   valueFrom:
                     fieldRef:
                       fieldPath: spec.serviceAccountName
-                image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.113.0
+                image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.114.0
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -606,7 +606,7 @@ spec:
   minKubeVersion: 1.23.0
   provider:
     name: OpenTelemetry Community
-  version: 0.113.0
+  version: 0.114.0
   webhookdefinitions:
   - admissionReviewVersions:
     - v1alpha1

diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -1,2 +1,3 @@
 resources:
 - manager.yaml
+