Merge branch 'open-telemetry:main' into main

.chainsaw.yaml

@@ -0,0 +1,12 @@
+# 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: 5m0s
+    cleanup: 5m0s
+    delete: 5m0s
+    error: 5m0s

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -15,7 +15,6 @@ body:
       description: Which component(s) does your bug report concern?
       multiple: true
       options:
-      - operator
       - collector
       - instrumentation
       - target allocator

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -9,7 +9,6 @@ body:
       description: Which component(s) does your feature request concern?
       multiple: true
       options:
-      - operator
       - collector
       - instrumentation
       - target allocator

.github/ISSUE_TEMPLATE/other.yaml

@@ -9,7 +9,6 @@ body:
       description: Which component(s) does your issue concern?
       multiple: true
       options:
-      - operator
       - collector
       - instrumentation
       - target allocator

.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/pull_request_template.md

@@ -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/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,7 +47,16 @@ jobs:
       with:
         go-version: "~1.21.1"
 
-    - uses: actions/cache@v3
+    - 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: |
           /home/runner/.cache/golangci-lint
@@ -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

@@ -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,12 +24,13 @@ 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
        include:
          - group: e2e-prometheuscr
@@ -41,32 +41,38 @@ jobs:
     steps:
     - 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.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') }}
+    - name: Install chainsaw
+      uses: kyverno/action-install-chainsaw@v0.1.4
+    - 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

.github/workflows/publish-autoinstrumentation-apache-httpd.yaml

@@ -42,7 +42,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Cache Docker layers
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ github.sha }}

.github/workflows/publish-autoinstrumentation-dotnet.yaml

@@ -44,7 +44,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Cache Docker layers
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ github.sha }}

.github/workflows/publish-autoinstrumentation-java.yaml

@@ -45,7 +45,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Cache Docker layers
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ github.sha }}

.github/workflows/publish-autoinstrumentation-nodejs.yaml

@@ -45,7 +45,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Cache Docker layers
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ github.sha }}

.github/workflows/publish-autoinstrumentation-python.yaml

@@ -45,7 +45,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Cache Docker layers
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: /tmp/.buildx-cache
           key: ${{ runner.os }}-buildx-${{ github.sha }}