Merge branch 'main' of github.com:open-telemetry/opentelemetry-operator into bug/2561

Author: iblancasa

.chainsaw.yaml

@@ -0,0 +1,14 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/kyverno/chainsaw/main/.schemas/json/configuration-chainsaw-v1alpha1.json
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Configuration
+metadata:
+  name: configuration
+spec:
+  parallel: 4
+  timeouts:
+    assert: 6m0s
+    cleanup: 5m0s
+    delete: 5m0s
+    error: 5m0s
+    apply: 15s
+    exec: 15s

.chloggen/2622-bump-autoinstrumentation-nodejs-to-allow-disabling-instrumentations-via-env.yaml

@@ -0,0 +1,18 @@
+# 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: "Bump NodeJS autoinstrumentations dependency to a version that supports enabling selected instrumentations via environment variable."
+
+# One or more tracking issues related to the change
+issues: [2622]
+
+# (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: |
+  See [the documentation](https://github.com/open-telemetry/opentelemetry-js-contrib/tree/main/metapackages/auto-instrumentations-node#usage-auto-instrumentation) for details.
+  Usage example: `export OTEL_NODE_ENABLED_INSTRUMENTATIONS="http,nestjs-core"`.

.chloggen/TEMPLATE.yaml

@@ -1,7 +1,7 @@
 # One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
 change_type:
 
-# The name of the component, or a single word describing the area of concern, (e.g. operator, target allocator, github action)
+# 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:
 
 # A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).

.chloggen/add_shared_process_namespace_cap.yaml .chloggen/add-missing-label-servicemonitor.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: Added missing label for Service/Pod Monitors
 
 # One or more tracking issues related to the change
-issues: [2472]
+issues: [2251]
 
 # (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/feat_ta_monitor-selectors.yaml

@@ -1,16 +1,16 @@
 # 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. operator, target allocator, github action)
-component: target allocator
+# 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
 
 # A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
-note: Use recommended interfaces(resource selector) by the prometheus-operator for watching CRs.
+note:  remove featuregate `operator.autoinstrumentation.python`. Use command line flag `--enable-python-instrumentation` instead
 
 # One or more tracking issues related to the change
-issues: [2309]
+issues: [2582, 2672]
 
 # (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 target allocator now requires get/list/watch permissions for namespaces. Update your RBAC permissions for the attached role, if necessary.
+subtext:

.chloggen/target-allocator-use-recommended-prometheus-operator-interfaces.yaml .chloggen/featuregate_cli_python.yaml

@@ -1,16 +1,16 @@
 # 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. operator, target allocator, github action)
-component: autoinstrumentation
+component: instrumentation
 
 # A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
-note: Bump OpenTelemetry .NET Automatic Instrumentation to 1.3.0
+note: "Don't preserve ownership of files copied from the autoinstrumenation image. This avoids issues when instrumenting workloads running as non-root"
 
 # One or more tracking issues related to the change
-issues: [2538]
+issues: [2655]
 
 # (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 version brings stable semantic convention for network and HTTP. It includes new metrics and attributes names.
+subtext:

.chloggen/dotnet_auto_1_3_0.yaml .chloggen/fix-2655.yaml

@@ -0,0 +1,16 @@
+# 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. collector, target allocator, auto-instrumentation, opamp, github action)
+component: opamp bridge
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Fix opamp bridge configmap "app.kubernetes.io/version" label to be generated in the same way as other resource version labels
+
+# One or more tracking issues related to the change
+issues: [2583]
+
+# (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:

.chloggen/opampbridge-version-label.yaml

@@ -1,14 +1,14 @@
 # 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. operator, target allocator, github action)
-component: target allocator
+# 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: instrumentation
 
 # 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: Remove env var prefix validation
 
 # One or more tracking issues related to the change
-issues: [2477]
+issues: [2768]
 
 # (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/remove-env-var-validation.yaml

@@ -0,0 +1,25 @@
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: new_component
+
+# The name of the component, or a single word describing the area of concern, (e.g. operator, target allocator, github action)
+component: collector
+
+# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Enable reconciliation of Collector v1beta1 CRD.
+
+# One or more tracking issues related to the change
+issues: [2620]
+
+# (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: | 
+  Users are expected to migrate to `otelcol.v1beta1.opentelemetry.io`. 
+  The support for `otelcol.v1alpha1.opentelemetry.io` will be removed in the future.
+  Follow [migration guide](https://kubernetes.io/docs/tasks/extend-kubernetes/custom-resources/custom-resource-definition-versioning/#upgrade-existing-objects-to-a-new-stored-version) for upgrading already created collector instances.
+  After all `otelcol.v1alpha1.opentelemetry.io` are stored as `v1beta1` update the collector CRD to store only `v1beta1`
+  `kubectl patch customresourcedefinitions opentelemetrycollectors.opentelemetry.io  --subresource='status' --type='merge' -p '{"status":{"storedVersions":["v1beta1"]}}'`.
+  **Only `AllNamespaces` install mode is now supported** due to the conversion webhook from `v1beta1` to `v1alpha1`.
+  See [OLM docs](https://olm.operatorframework.io/docs/tasks/install-operator-with-olm/) and
+  [OLM operator groups docs](https://olm.operatorframework.io/docs/advanced-tasks/operator-scoping-with-operatorgroups/).
+  

.chloggen/v1beta1-webhook.yaml

@@ -1,9 +1,13 @@
 #!/bin/bash
 
-OPERATOR_VERSION=$(git describe --tags)
+NOTES_FILE=/tmp/notes.md
+# Note: We expect the versions to not have the `v` prefix here
+sed -n "/${DESIRED_VERSION}/,/${CURRENT_VERSION}/{/${CURRENT_VERSION}/!p;}" CHANGELOG.md >${NOTES_FILE}
 
 gh config set prompt disabled
 gh release create \
-    -t "Release ${OPERATOR_VERSION}" \
-    "${OPERATOR_VERSION}" \
+    -t "Release v${DESIRED_VERSION}" \
+    --notes-file ${NOTES_FILE} \
+    --draft \
+    "v${DESIRED_VERSION}" \
     'dist/opentelemetry-operator.yaml#Installation manifest for Kubernetes'

.ci/create-release-github.sh

@@ -15,11 +15,10 @@ body:
       description: Which component(s) does your bug report concern?
       multiple: true
       options:
-      - operator
       - collector
-      - instrumentation
+      - auto-instrumentation
       - target allocator
-      - opamp bridge
+      - opamp
   - type: textarea
     attributes:
       label: What happened?

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -9,11 +9,10 @@ body:
       description: Which component(s) does your feature request concern?
       multiple: true
       options:
-      - operator
       - collector
-      - instrumentation
+      - auto-instrumentation
       - target allocator
-      - opamp bridge
+      - opamp
   - type: textarea
     attributes:
       label: Is your feature request related to a problem? Please describe.

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -9,11 +9,10 @@ body:
       description: Which component(s) does your issue concern?
       multiple: true
       options:
-      - operator
       - collector
-      - instrumentation
+      - auto-instrumentation
       - target allocator
-      - opamp bridge
+      - opamp
   - type: textarea
     attributes:
       label: Describe the issue you're reporting

.github/ISSUE_TEMPLATE/other.yaml

@@ -2,7 +2,9 @@
 <!--Ex. Fixing a bug - Describe the bug and how this fixes the issue.
 Ex. Adding a feature - Explain what this achieves.-->
 
-**Link to tracking Issue:** <Issue number if applicable>
+**Link to tracking Issue(s):** <Issue number if applicable>
+
+- Resolves: #issue-number
 
 **Testing:** <Describe what testing was performed and which tests were added.>
 

.github/pull_request_template.md

@@ -20,9 +20,19 @@ jobs:
 
     - name: Set up Go
       uses: actions/setup-go@v5
+      id: setup-go
       with:
         go-version: "~1.21.1"
 
+    - name: Cache tools
+      uses: actions/cache@v4
+      with:
+        path: bin
+        key: ${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('Makefile') }}-${{ steps.setup-go.outputs.go-version }}
+
+    - name: Install tools
+      run: make install-tools
+
     - name: "basic checks"
       run: make ci
 
@@ -38,6 +48,16 @@ jobs:
       with:
         go-version: "~1.21.1"
 
+    - name: Cache tools
+      uses: actions/cache@v4
+      id: setup-go
+      with:
+        path: bin
+        key: ${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('Makefile') }}-${{ steps.setup-go.outputs.go-version }}
+
+    - name: Install tools
+      run: make install-tools
+
     - uses: actions/cache@v4
       with:
         path: |
@@ -58,6 +78,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/continuous-integration.yaml

@@ -12,7 +12,6 @@ concurrency:
 
 jobs:
   e2e-tests:
-    name: End-to-end tests ${{ matrix.group }} on K8s ${{ matrix.kube-version }}
     runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
@@ -25,48 +24,57 @@ jobs:
          - "1.29"
        group:
          - e2e
-         - e2e-instrumentation
-         - e2e-upgrade
          - e2e-autoscale
-         - e2e-pdb
+         - e2e-instrumentation
          - e2e-opampbridge
+         - e2e-pdb
          - e2e-prometheuscr
+         - e2e-targetallocator
+         - e2e-upgrade
          - e2e-multi-instrumentation
+         - e2e-metadata-filters
        include:
-         - group: e2e-prometheuscr
-           setup: "prepare-e2e-with-featuregates FEATUREGATES=+operator.observability.prometheus"
          - group: e2e-multi-instrumentation
-           setup: "prepare-e2e-with-featuregates FEATUREGATES=+operator.autoinstrumentation.multi-instrumentation"
+           setup: "add-operator-arg OPERATOR_ARG=--enable-multi-instrumentation prepare-e2e"
+         - group: e2e-metadata-filters
+           setup: "add-operator-arg OPERATOR_ARG='--annotations-filter=*filter.out --labels=*filter.out' prepare-e2e"
 
     steps:
     - name: Check out code into the Go module directory
       uses: actions/checkout@v4
-
     - name: Set up Go
       uses: actions/setup-go@v5
+      id: setup-go
       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: "install kuttl"
-      run: ./hack/install-kuttl.sh
-
-    - name: "run tests"
+    - name: Cache tools
+      uses: actions/cache@v4
+      with:
+        path: bin
+        key: ${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('Makefile') }}-${{ steps.setup-go.outputs.go-version }}
+    - name: Install chainsaw
+      uses: kyverno/action-install[email protected]
+    - name: Install tools
+      run: make install-tools
+    - name: Prepare e2e tests
       env:
         KUBE_VERSION: ${{ matrix.kube-version }}
       run: |
+        set -e
         make ${{ matrix.setup != '' && matrix.setup || 'prepare-e2e' }} KUBE_VERSION=$KUBE_VERSION VERSION=e2e
+    - name: Run e2e tests
+      env:
+        KUBE_VERSION: ${{ matrix.kube-version }}
+      run: |
+        set -e
         make ${{ matrix.group }}
-
     - name: "log operator if failed"
       if: ${{ failure() }}
       env:
         KUBE_VERSION: ${{ matrix.kube-version }}
-      run: make e2e-log-operator KUBE_VERSION=$KUBE_VERSION
+      run: |
+        set -e
+        make e2e-log-operator KUBE_VERSION=$KUBE_VERSION
 
   e2e-tests-check:
     runs-on: ubuntu-22.04