Merge remote-tracking branch 'upstream/main'

Author: TylerHelmuth

.chloggen/fix-protocol-handling-in-serviceports.yaml

@@ -0,0 +1,18 @@
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: bug_fix
+
+# The name of the component, or a single word describing the area of concern, (e.g. operator, target allocator, github action)
+component: operator
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: "Fixed handling of protocol in exposed ports."
+
+# One or more tracking issues related to the change
+issues: [2619]
+
+# (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: |
+  Make distinction not only on the port number, but also on protocol. This fix allows to have multiple exposed
+  ServicePorts with the same port number, but different protocols.

.chloggen/fix-syslog-tcplog-udplog.yaml

@@ -0,0 +1,18 @@
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: bug_fix
+
+# The name of the component, or a single word describing the area of concern, (e.g. operator, target allocator, github action)
+component: operator
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: "Fixed handling of exposed port protocol in syslog, tcplog and udplog receivers."
+
+# One or more tracking issues related to the change
+issues: [767,2619]
+
+# (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: |
+  Please note that the operator currently exposes just one port (tcp or udp) of syslog receiver due to the current
+  receiver implementation (patches are welcome).

.chloggen/add_shared_process_namespace_cap.yaml .chloggen/fix_2589-watch-single-namespace.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. operator, target allocator, github action)
 component: operator
 
 # A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
-note: Add SharedProcessNamespace capabilities to the OpenTelemetryCollector CRD
+note: "Fixing WATCH_NAMESPACE for a single namespace value"
 
 # One or more tracking issues related to the change
-issues: [2472]
+issues: [2589]
 
 # (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/fix_filterstrategy-default.yaml .chloggen/per-node-allocation-strategy.yaml

@@ -5,10 +5,10 @@ change_type: enhancement
 component: target allocator
 
 # A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
-note: Set the default filter strategy in the CRD
+note: Add new "per node" allocation strategy to target allocator. This strategy will allocate targets to nodes on which given target resides.  It should only be used conjunction with the daemonset mode.
 
 # One or more tracking issues related to the change
-issues: [2477]
+issues: [1828]
 
 # (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.

.github/dependabot.yml

@@ -3,7 +3,7 @@ updates:
   - package-ecosystem: gomod
     directory: /
     schedule:
-      interval: daily
+      interval: weekly
     # Create a group of dependencies to be updated together in one pull request
     groups:
       golang-org-x:
@@ -29,7 +29,7 @@ updates:
   - package-ecosystem: github-actions
     directory: /
     schedule:
-      interval: daily
+      interval: weekly
     groups:
       gha-docker:
         patterns:
@@ -38,14 +38,14 @@ updates:
   - package-ecosystem: docker
     directory: /
     schedule:
-      interval: daily
+      interval: weekly
 
   - package-ecosystem: docker
     directory: /cmd/otel-allocator
     schedule:
-      interval: daily
+      interval: weekly
 
   - package-ecosystem: docker
     directory: /cmd/operator-opamp-bridge
     schedule:
-      interval: daily
+      interval: weekly

.github/workflows/continuous-integration.yaml

@@ -23,6 +23,15 @@ jobs:
       with:
         go-version: "~1.21.1"
 
+    - name: Cache tools
+      uses: actions/cache@v4
+      with:
+        path: bin
+        key: ${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('Makefile') }}
+
+    - name: Install tools
+      run: make install-tools
+
     - name: "basic checks"
       run: make ci
 
@@ -38,6 +47,15 @@ jobs:
       with:
         go-version: "~1.21.1"
 
+    - name: Cache tools
+      uses: actions/cache@v4
+      with:
+        path: bin
+        key: ${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('Makefile') }}
+
+    - name: Install tools
+      run: make install-tools
+
     - uses: actions/cache@v4
       with:
         path: |
@@ -58,6 +76,11 @@ jobs:
     - name: Check out code into the Go module directory
       uses: actions/checkout@v4
 
+    - name: Set up Go
+      uses: actions/setup-go@v5
+      with:
+        go-version: "~1.21.1"
+
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v3
       with:

.github/workflows/e2e.yaml

@@ -30,6 +30,7 @@ jobs:
          - e2e-autoscale
          - e2e-pdb
          - e2e-opampbridge
+         - e2e-targetallocator
          - e2e-prometheuscr
          - e2e-multi-instrumentation
        include:
@@ -47,13 +48,14 @@ jobs:
       with:
         go-version: "~1.21.3"
 
-    - name: Setup kind
-      env:
-        KIND_VERSION: "0.20.0"
-      run: go install sigs.k8s.io/kind@v${KIND_VERSION}
+    - name: Cache tools
+      uses: actions/cache@v4
+      with:
+        path: bin
+        key: ${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('Makefile') }}
 
-    - name: "install kuttl"
-      run: ./hack/install-kuttl.sh
+    - name: Install tools
+      run: make install-tools
 
     - name: "run tests"
       env:

.github/workflows/scorecard.yaml

@@ -27,21 +27,22 @@ jobs:
         with:
           go-version: "~1.21.1"
 
-      - name: Setup kind
-        env:
-          KIND_VERSION: "0.20.0"
-        run: go install sigs.k8s.io/kind@v${KIND_VERSION}
-
       - name: Check out code into the Go module directory
         uses: actions/checkout@v4
 
-      - name: "install kuttl and kind"
-        run: ./hack/install-kuttl.sh
+      - name: Cache tools
+        uses: actions/cache@v4
+        with:
+          path: bin
+          key: ${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('Makefile') }}
+
+      - name: Install tools
+        run: make install-tools
 
       - name: "start kind"
         env:
           KUBE_VERSION: ${{ matrix.kube-version }}
-        run: kind create cluster --config kind-$KUBE_VERSION.yaml
+        run: make start-kind
 
       - name: "wait until cluster is ready"
         run:  kubectl wait --timeout=5m --for=condition=available deployment/coredns -n kube-system

CHANGELOG.md

@@ -2,6 +2,40 @@ Changes by Version
 ==================
 <!-- next version -->
 
+## 0.93.0
+
+### 🛑 Breaking changes 🛑
+
+  This version brings stable semantic convention for network and HTTP. It includes new metrics and attributes names.
+- `target allocator`: Use standard K8s label selectors for Prometheus CRs in target allocator config (#1907)
+  This is a breaking change only for users of standalone target allocator. Operator users are unaffected.
+  The operator is still compatible with previous target allocator versions, and will be for the next 3 releases.
+- `target allocator`: Use recommended interfaces(resource selector) by the prometheus-operator for watching CRs. (#2309)
+  The target allocator now requires get/list/watch permissions for namespaces. Update your RBAC permissions for the attached role, if necessary.
+
+### 💡 Enhancements 💡
+
+- `operator`: Add SharedProcessNamespace capabilities to the OpenTelemetryCollector CRD (#2472)
+- `opamp bridge`: Added env variable parsing to opamp bridge config loading (#2577)
+- `target allocator`: Set the default filter strategy in the CRD (#2477)
+- `operator, target allocator`: Adding a feature flag to disable default prometheus annotations (#2554)
+
+### 🧰 Bug fixes 🧰
+
+- `operator`: Fix annotations required by the OpenShift Operator Hub (#2557)
+
+### Components
+
+* [OpenTelemetry Collector - v0.92.0](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.93.0)
+* [OpenTelemetry Contrib - v0.92.0](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.93.0)
+* [Java auto-instrumentation - 1.32.0](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v1.32.0)
+* [.NET auto-instrumentation - 1.2.0](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/tag/1.2.0)
+* [Node.JS - 0.46.0](https://github.com/open-telemetry/opentelemetry-js-contrib/releases/tag/auto-instrumentations-node-0.46.0)
+* [Python - 0.43b0](https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/0.43b0)
+* [Go - v0.10.0-alpha](https://github.com/open-telemetry/opentelemetry-go-instrumentation/releases/tag/v0.10.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.92.1
 
 ### 💡 Enhancements 💡