Merge branch 'main' into bugfix/potential_duplication

Author: mike9421

.chloggen/api-conversion-resilience.yaml

@@ -2,15 +2,17 @@
 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: target allocator
+component: collector, target allocator
 
 # A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
-note: Add CollectorTargetReloadInterval option to configure the interval at which the Prometheus receiver reloads targets from the target allocator
+note: Add TrafficDistribution support for OpenTelemetryCollector and TargetAllocator Services
 
 # One or more tracking issues related to the change
-issues: [4095]
+issues: [4285]
 
 # (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: |
+  The TrafficDistribution field is now available in OpenTelemetryCollector and TargetAllocator.
+  This field allows setting the traffic distribution policy for Kubernetes Services.

.chloggen/feature_add-collector-target-reload-interval.yaml renamed to .chloggen/traffic-distribution-field.yaml

@@ -89,15 +89,15 @@ jobs:
         go-version: "~1.24.6"
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@f1f6e5f6af878fb37288ce1c627459e94dbf7d01 # v3.29.5
+      uses: github/codeql-action/init@192325c86100d080feab897ff886c34abd4c83a3 # v3.29.5
       with:
         languages: go
 
     - name: Autobuild
-      uses: github/codeql-action/autobuild@f1f6e5f6af878fb37288ce1c627459e94dbf7d01 # v3.29.5
+      uses: github/codeql-action/autobuild@192325c86100d080feab897ff886c34abd4c83a3 # v3.29.5
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@f1f6e5f6af878fb37288ce1c627459e94dbf7d01 # v3.29.5
+      uses: github/codeql-action/analyze@192325c86100d080feab897ff886c34abd4c83a3 # v3.29.5
 
     - name: Govulncheck
       uses: golang/govulncheck-action@b625fbe08f3bccbe446d94fbf87fcc875a4f50ee # v1.0.4

.github/workflows/continuous-integration.yaml

@@ -42,6 +42,6 @@ jobs:
       # Upload the results to GitHub's code scanning dashboard (optional).
       # Commenting out will disable upload of results to your repo's Code Scanning dashboard
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@f1f6e5f6af878fb37288ce1c627459e94dbf7d01 # v3.29.5
+        uses: github/codeql-action/upload-sarif@192325c86100d080feab897ff886c34abd4c83a3 # v3.29.5
         with:
           sarif_file: results.sarif

.github/workflows/ossf-scorecard.yml

@@ -2,6 +2,28 @@
 
 <!-- next version -->
 
+## 0.134.0
+
+### 💡 Enhancements 💡
+
+- `target allocator`: Add CollectorTargetReloadInterval option to configure the interval at which the Prometheus receiver reloads targets from the target allocator (#4095)
+
+### 🧰 Bug fixes 🧰
+
+- `collector`: Always return a valid OpenTelemetryCollector configuration during v1beta1 conversion. (#4288)
+
+### Components
+
+* [OpenTelemetry Collector - v0.134.0](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.134.0)
+* [OpenTelemetry Contrib - v0.134.0](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.134.0)
+* [Java auto-instrumentation - v1.33.6](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v1.33.6)
+* [.NET auto-instrumentation - v1.2.0](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/tag/v1.2.0)
+* [Node.JS - v0.63.0](https://github.com/open-telemetry/opentelemetry-js/releases/tag/experimental%2Fv0.63.0)
+* [Python - v0.58b0](https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/v0.58b0)
+* [Go - v0.22.1](https://github.com/open-telemetry/opentelemetry-go-instrumentation/releases/tag/v0.22.1)
+* [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.133.0
 
 ### ⚠️ Skip Release ⚠️

CHANGELOG.md

@@ -606,7 +606,7 @@ KIND_VERSION ?= v0.30.0
 # renovate: datasource=go depName=github.com/kyverno/chainsaw
 CHAINSAW_VERSION ?= v0.2.13
 # renovate: datasource=go depName=gotest.tools/gotestsum
-GOTESTSUM_VERSION ?= v1.12.3
+GOTESTSUM_VERSION ?= v1.13.0
 
 .PHONY: install-tools
 install-tools: kustomize golangci-lint kind controller-gen envtest crdoc operator-sdk chainsaw gotestsum

Makefile

@@ -44,10 +44,10 @@ The operator should be released within a week after the [OpenTelemetry collector
 
 | Version  | Release manager |
 |----------|-----------------|
-| v0.134.0 | @frzifus        |
 | v0.135.0 | @jaronoff97     |
 | v0.136.0 | @swiatekm       |
 | v0.137.0 | @iblancasa      |
 | v0.138.0 | @pavolloffay    |
 | v0.140.0 | @yuriolisa      |
 | v0.141.0 | @TylerHelmuth   |
+| v0.142.0 | @frzifus        |

RELEASE.md

@@ -115,6 +115,7 @@ func tov1beta1(in OpenTelemetryCollector) v1beta1.OpenTelemetryCollector {
 				PriorityClassName:             copy.Spec.PriorityClassName,
 				InitContainers:                copy.Spec.InitContainers,
 				AdditionalContainers:          copy.Spec.AdditionalContainers,
+				TrafficDistribution:           copy.Spec.TrafficDistribution,
 			},
 			StatefulSetCommonFields: v1beta1.StatefulSetCommonFields{
 				VolumeClaimTemplates: copy.Spec.VolumeClaimTemplates,
@@ -371,6 +372,7 @@ func tov1alpha1(in v1beta1.OpenTelemetryCollector) (*OpenTelemetryCollector, err
 			ConfigMaps:                tov1alpha1ConfigMaps(copy.Spec.ConfigMaps),
 			UpdateStrategy:            copy.Spec.DaemonSetUpdateStrategy,
 			DeploymentUpdateStrategy:  copy.Spec.DeploymentUpdateStrategy,
+			TrafficDistribution:       copy.Spec.TrafficDistribution,
 		},
 	}, nil
 }

apis/v1alpha1/convert.go

@@ -238,6 +238,11 @@ type OpenTelemetryCollectorSpec struct {
 	// If not specified, it will default to "<name>-headless".
 	// +optional
 	ServiceName string `json:"serviceName,omitempty"`
+	// TrafficDistribution specifies how traffic to this service is routed.
+	// https://kubernetes.io/docs/concepts/services-networking/service/#traffic-distribution
+	// This is only applicable to Service resources.
+	// +optional
+	TrafficDistribution *string `json:"trafficDistribution,omitempty"`
 
 	// AdditionalContainers allows injecting additional containers into the Collector's pod definition.
 	// These sidecar containers can be used for authentication proxies, log shipping sidecars, agents for shipping