Merge branch 'main' into improve-probe-parsing

Author: jaronoff97

.github/workflows/e2e.yaml

@@ -21,7 +21,7 @@ jobs:
        # should be compatible with them.
        kube-version:
          - "1.23"
-         - "1.30"
+         - "1.31"
        group:
          - e2e
          - e2e-automatic-rbac
@@ -40,7 +40,7 @@ jobs:
          - group: e2e-multi-instrumentation
            setup: "add-multi-instrumentation-params prepare-e2e"
          - group: e2e-metadata-filters
-           setup: "add-operator-arg OPERATOR_ARG='--annotations-filter=.*filter.out --annotations-filter=config.*.gke.io.* --labels=.*filter.out' prepare-e2e"
+           setup: "add-operator-arg OPERATOR_ARG='--annotations-filter=.*filter.out --annotations-filter=config.*.gke.io.* --labels-filter=.*filter.out' prepare-e2e"
          - group: e2e-automatic-rbac
            setup: "add-rbac-permissions-to-operator prepare-e2e"
     steps:
@@ -57,7 +57,7 @@ jobs:
         path: bin
         key: ${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('Makefile') }}-${{ steps.setup-go.outputs.go-version }}
     - name: Install chainsaw
-      uses: kyverno/[email protected].8
+      uses: kyverno/[email protected].10
     - name: Install tools
       run: make install-tools
     - name: Prepare e2e tests

.github/workflows/publish-test-e2e-images.yaml

@@ -53,3 +53,8 @@ jobs:
     with:
       path: nodejs
       platforms: linux/arm64,linux/amd64,linux/s390x,linux/ppc64le
+  metrics-basic-auth:
+    uses: ./.github/workflows/reusable-publish-test-e2e-images.yaml
+    with:
+      path: metrics-basic-auth
+      platforms: linux/arm64,linux/amd64,linux/s390x,linux/ppc64le 

.github/workflows/scorecard.yaml

@@ -18,7 +18,7 @@ jobs:
       matrix:
         kube-version:
           - "1.23"
-          - "1.30"
+          - "1.31"
 
     steps:
 

CHANGELOG.md

@@ -2,6 +2,70 @@
 
 <!-- next version -->
 
+## 0.109.0
+
+### 🚩 Deprecations 🚩
+
+- `operator`: Deprecated `label` flag and introduced `labels-filter` flag to align the label filtering with the attribute filtering flag name. The `label` flag will be removed when #3236 issue is resolved. (#3218)
+
+### 💡 Enhancements 💡
+
+- `collector`: adds test for memory utilization (#3283)
+- `operator`: Added reconciliation errors for webhook events. The webhooks run the manifest generators to check for any errors. (#2399)
+
+### Components
+
+* [OpenTelemetry Collector - v0.109.0](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.109.0)
+* [OpenTelemetry Contrib - v0.109.0](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.109.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.52.1](https://github.com/open-telemetry/opentelemetry-js/releases/tag/experimental%2Fv0.52.1)
+* [Python - v0.48b0](https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/v0.48b0)
+* [Go - v0.14.0-alpha](https://github.com/open-telemetry/opentelemetry-go-instrumentation/releases/tag/v0.14.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.108.0
+
+### 💡 Enhancements 💡
+
+- `auto-instrumentation`: set OTEL_EXPORTER_OTLP_PROTOCOL instead of signal specific env vars in python instrumentation (#3165)
+- `collector`: Allow autoscaler targetCPUUtilization and TargetMemoryUtilization to be greater than 99 (#3258)
+- `auto-instrumentation`: Not ignore the `instrumentation.opentelemetry.io/container-names` annotation when the multi-instrumentation is enabled (#3090)
+- `operator`: Support for Kubernetes `1.31` version. (#3247)
+- `target allocator`: introduces the global field in the TA config to allow for setting scrape protocols (#3160)
+
+### 🧰 Bug fixes 🧰
+
+- `auto-instrumentation`: Fix file copy for NGINX auto-instrumentation for non-root workloads. (#2726)
+- `target allocator`: Retrying failed namespace informer creation in promOperator CRD watcher, then exit if creation issue cannot be resolved (#3216)
+- `target allocator`: Rollback #3187 (#3242)
+  This Rollsback 3187 which breaks TargetAllocator config for clusters with custom domains.
+- `auto-instrumentation`: Fixes a bug that was preventing auto instrumentation from getting correct images. (#3014)
+  This PR removes the restriction on the operator to only upgrade manually applied CRDs. This meant
+  that resources applied by helm were not upgraded at all. The solution was to remove the restriction
+  we had on querying the label app.kubernetes.io/managed-by=opentelemetry-operator, thereby upgrading
+  ALL CRDs in the cluster.
+  
+- `collector`: Fixes a bug that was preventing upgrade patches from reliably applying. (#3074)
+  A bug was discovered in the process of testing the PR that was failing to remove the environment
+  variables introduced in the 0.104.0 upgrade. The fix was to take a deepcopy of the object and update that.
+  
+- `collector`: Don't unnecessarily take ownership of PersistentVolumes and PersistentVolumeClaims (#3042)
+- `awsxray-receiver`: Switched the protocol of awsxray-receiver to UDP from TCP (#3261)
+
+### Components
+
+* [OpenTelemetry Collector - v0.108.0](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.108.0)
+* [OpenTelemetry Contrib - v0.108.0](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.108.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.52.1](https://github.com/open-telemetry/opentelemetry-js/releases/tag/experimental%2Fv0.52.1)
+* [Python - v0.48b0](https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/v0.48b0)
+* [Go - v0.14.0-alpha](https://github.com/open-telemetry/opentelemetry-go-instrumentation/releases/tag/v0.14.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.107.0
 
 ### 💡 Enhancements 💡

Makefile

@@ -57,7 +57,7 @@ endif
 
 START_KIND_CLUSTER ?= true
 
-KUBE_VERSION ?= 1.30
+KUBE_VERSION ?= 1.31
 KIND_CONFIG ?= kind-$(KUBE_VERSION).yaml
 KIND_CLUSTER_NAME ?= "otel-operator"
 
@@ -437,7 +437,7 @@ GOLANGCI_LINT ?= $(LOCALBIN)/golangci-lint
 CHAINSAW ?= $(LOCALBIN)/chainsaw
 
 KUSTOMIZE_VERSION ?= v5.0.3
-CONTROLLER_TOOLS_VERSION ?= v0.14.0
+CONTROLLER_TOOLS_VERSION ?= v0.16.1
 GOLANGCI_LINT_VERSION ?= v1.57.2
 KIND_VERSION ?= v0.20.0
 CHAINSAW_VERSION ?= v0.2.5

README.md

@@ -12,6 +12,7 @@ The operator manages:
 ## Documentation
 
 - [API docs](./docs/api.md)
+- [Offical Telemetry Operator page](https://opentelemetry.io/docs/kubernetes/operator/)
 
 ## Helm Charts
 
@@ -360,7 +361,7 @@ In some cases (for example in the case of the injection of an Istio sidecar) it
 
 For this, it is possible to fine-tune the pod(s) on which the injection will be carried out.
 
-For this, we will use the `instrumentation.opentelemetry.io/container-names` annotation for which we will indicate one or more pod names (`.spec.containers.name`) on which the injection must be made:
+For this, we will use the `instrumentation.opentelemetry.io/container-names` annotation for which we will indicate one or more container names (`.spec.containers.name`) on which the injection must be made:
 
 ```yaml
 apiVersion: apps/v1
@@ -758,6 +759,8 @@ The OpenTelemetry Operator _might_ work on versions outside of the given range,
 
 | OpenTelemetry Operator | Kubernetes     | Cert-Manager | Prometheus-Operator |
 |------------------------|----------------| ------------ |---------------------|
+| v0.109.0               | v1.23 to v1.31 | v1           | v0.76.0             |
+| v0.108.0               | v1.23 to v1.31 | v1           | v0.76.0             |
 | v0.107.0               | v1.23 to v1.30 | v1           | v0.75.0             |
 | v0.106.0               | v1.23 to v1.30 | v1           | v0.75.0             |
 | v0.105.0               | v1.23 to v1.30 | v1           | v0.74.0             |
@@ -780,7 +783,6 @@ The OpenTelemetry Operator _might_ work on versions outside of the given range,
 | v0.88.0                | v1.23 to v1.28 | v1           | v0.68.0             |
 | v0.87.0                | v1.23 to v1.28 | v1           | v0.68.0             |
 | v0.86.0                | v1.23 to v1.28 | v1           | v0.68.0             |
-| v0.85.0                | v1.19 to v1.28 | v1           | v0.67.1             |
 
 ## Contributing and Developing
 
@@ -815,7 +817,7 @@ Emeritus Target Allocator Maintainers
 Maintainers ([@open-telemetry/operator-maintainers](https://github.com/orgs/open-telemetry/teams/operator-maintainers)):
 
 - [Jacob Aronoff](https://github.com/jaronoff97), Lightstep
-- [Mikołaj Świątek](https://github.com/swiatekm), Sumo Logic
+- [Mikołaj Świątek](https://github.com/swiatekm), Elastic
 - [Pavol Loffay](https://github.com/pavolloffay), Red Hat
 
 Emeritus Maintainers

RELEASE.md

@@ -42,11 +42,11 @@ In order to have more people comfortable with the release process, and in order
 
 The operator should be released within a week after the [OpenTelemetry collector release](https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/release.md#release-schedule).
 
-| Version   | Release manager |
-|-----------|-----------------|
-| v0.108.0  | @TylerHelmuth   |
-| v0.109.0  | @jaronoff97     |
-| v0.110.0  | @swiatekm       |
-| v0.111.0  | @frzifus        |
-| v0.112.0  | @yuriolisa      |
-| v0.113.0  | @pavolloffay    |
+| Version  | Release manager |
+|----------|-----------------|
+| v0.110.0 | @swiatekm       |
+| v0.111.0 | @frzifus        |
+| v0.112.0 | @yuriolisa      |
+| v0.113.0 | @pavolloffay    |
+| v0.114.0 | @TylerHelmuth   |
+| v0.115.0 | @jaronoff97     |

apis/v1alpha1/instrumentation_webhook.go

@@ -91,10 +91,6 @@ func (w InstrumentationWebhook) defaulter(r *Instrumentation) error {
 	if r.Labels == nil {
 		r.Labels = map[string]string{}
 	}
-	if r.Labels["app.kubernetes.io/managed-by"] == "" {
-		r.Labels["app.kubernetes.io/managed-by"] = "opentelemetry-operator"
-	}
-
 	if r.Spec.Java.Image == "" {
 		r.Spec.Java.Image = w.cfg.AutoInstrumentationJavaImage()
 	}

apis/v1alpha1/opampbridge_webhook.go

@@ -52,42 +52,38 @@ func (o *OpAMPBridgeWebhook) Default(ctx context.Context, obj runtime.Object) er
 	return o.defaulter(opampBridge)
 }
 
-func (c OpAMPBridgeWebhook) ValidateCreate(ctx context.Context, obj runtime.Object) (admission.Warnings, error) {
+func (o *OpAMPBridgeWebhook) ValidateCreate(ctx context.Context, obj runtime.Object) (admission.Warnings, error) {
 	opampBridge, ok := obj.(*OpAMPBridge)
 	if !ok {
 		return nil, fmt.Errorf("expected an OpAMPBridge, received %T", obj)
 	}
-	return c.validate(opampBridge)
+	return o.validate(opampBridge)
 }
 
-func (c OpAMPBridgeWebhook) ValidateUpdate(ctx context.Context, oldObj, newObj runtime.Object) (admission.Warnings, error) {
+func (o *OpAMPBridgeWebhook) ValidateUpdate(ctx context.Context, oldObj, newObj runtime.Object) (admission.Warnings, error) {
 	opampBridge, ok := newObj.(*OpAMPBridge)
 	if !ok {
 		return nil, fmt.Errorf("expected an OpAMPBridge, received %T", newObj)
 	}
-	return c.validate(opampBridge)
+	return o.validate(opampBridge)
 }
 
-func (o OpAMPBridgeWebhook) ValidateDelete(ctx context.Context, obj runtime.Object) (admission.Warnings, error) {
+func (o *OpAMPBridgeWebhook) ValidateDelete(ctx context.Context, obj runtime.Object) (admission.Warnings, error) {
 	opampBridge, ok := obj.(*OpAMPBridge)
 	if !ok || opampBridge == nil {
 		return nil, fmt.Errorf("expected an OpAMPBridge, received %T", obj)
 	}
 	return o.validate(opampBridge)
 }
 
-func (o OpAMPBridgeWebhook) defaulter(r *OpAMPBridge) error {
+func (o *OpAMPBridgeWebhook) defaulter(r *OpAMPBridge) error {
 	if len(r.Spec.UpgradeStrategy) == 0 {
 		r.Spec.UpgradeStrategy = UpgradeStrategyAutomatic
 	}
 
 	if r.Labels == nil {
 		r.Labels = map[string]string{}
 	}
-	if r.Labels["app.kubernetes.io/managed-by"] == "" {
-		r.Labels["app.kubernetes.io/managed-by"] = "opentelemetry-operator"
-	}
-
 	one := int32(1)
 	if r.Spec.Replicas == nil {
 		r.Spec.Replicas = &one
@@ -104,7 +100,7 @@ func (o OpAMPBridgeWebhook) defaulter(r *OpAMPBridge) error {
 	return nil
 }
 
-func (o OpAMPBridgeWebhook) validate(r *OpAMPBridge) (admission.Warnings, error) {
+func (o *OpAMPBridgeWebhook) validate(r *OpAMPBridge) (admission.Warnings, error) {
 	warnings := admission.Warnings{}
 
 	// validate OpAMP server endpoint

apis/v1alpha1/opampbridge_webhook_test.go

@@ -50,9 +50,7 @@ func TestOpAMPBridgeDefaultingWebhook(t *testing.T) {
 			opampBridge: OpAMPBridge{},
 			expected: OpAMPBridge{
 				ObjectMeta: metav1.ObjectMeta{
-					Labels: map[string]string{
-						"app.kubernetes.io/managed-by": "opentelemetry-operator",
-					},
+					Labels: map[string]string{},
 				},
 				Spec: OpAMPBridgeSpec{
 					Replicas:        &one,
@@ -71,9 +69,7 @@ func TestOpAMPBridgeDefaultingWebhook(t *testing.T) {
 			},
 			expected: OpAMPBridge{
 				ObjectMeta: metav1.ObjectMeta{
-					Labels: map[string]string{
-						"app.kubernetes.io/managed-by": "opentelemetry-operator",
-					},
+					Labels: map[string]string{},
 				},
 				Spec: OpAMPBridgeSpec{
 					Replicas:        &five,
@@ -93,9 +89,7 @@ func TestOpAMPBridgeDefaultingWebhook(t *testing.T) {
 			},
 			expected: OpAMPBridge{
 				ObjectMeta: metav1.ObjectMeta{
-					Labels: map[string]string{
-						"app.kubernetes.io/managed-by": "opentelemetry-operator",
-					},
+					Labels: map[string]string{},
 				},
 				Spec: OpAMPBridgeSpec{
 					Replicas:        &one,

apis/v1alpha1/targetallocator_types.go

@@ -21,10 +21,11 @@ import (
 )
 
 func init() {
-	v1beta1.SchemeBuilder.Register(&TargetAllocator{}, &TargetAllocatorList{})
+	SchemeBuilder.Register(&TargetAllocator{}, &TargetAllocatorList{})
 }
 
 //+kubebuilder:object:root=true
+//+kubebuilder:storageversion
 //+kubebuilder:subresource:status
 
 // TargetAllocator is the Schema for the targetallocators API.
@@ -73,6 +74,9 @@ type TargetAllocatorSpec struct {
 	// +optional
 	// +kubebuilder:default:=relabel-config
 	FilterStrategy v1beta1.TargetAllocatorFilterStrategy `json:"filterStrategy,omitempty"`
+	// GlobalConfig configures the global configuration for Prometheus
+	// For more info, see https://prometheus.io/docs/prometheus/latest/configuration/configuration/#configuration-file.
+	GlobalConfig v1beta1.AnyConfig `json:"global,omitempty"`
 	// ScrapeConfigs define static Prometheus scrape configurations for the target allocator.
 	// To use dynamic configurations from ServiceMonitors and PodMonitors, see the PrometheusCR section.
 	// For the exact format, see https://prometheus.io/docs/prometheus/latest/configuration/configuration/#scrape_config.