Merge branch 'main' into create-pull-request/update-nodejs-agent

Author: pjanotti

.codecov.yml

@@ -0,0 +1,20 @@
+codecov:
+  notify:
+    require_ci_to_pass: yes
+    # wait for unit and integration test builds.
+    after_n_builds: 2
+  strict_yaml_branch: main  # only use the latest copy on main branch
+
+coverage:
+  precision: 2
+  round: down
+  range: "80...100"
+  status:
+    project:
+      default:
+        enabled: yes
+        target: 40%
+    patch:
+      default:
+        enabled: yes
+        target: 85%

.github/dependabot.yml

@@ -55,6 +55,13 @@ updates:
       - dependency-name: "github.com/open-telemetry/*"
     schedule:
       interval: "weekly"
+  - package-ecosystem: "gomod"
+    directory: "/packaging/dotnet-instr-deployer-add-on"
+    ignore:
+      - dependency-name: "go.opentelemetry.io/*"
+      - dependency-name: "github.com/open-telemetry/*"
+    schedule:
+      interval: "weekly"
   - package-ecosystem: "gomod"
     directory: "/pkg/extension/smartagentextension"
     ignore:

.github/workflows/ansible.yml

@@ -55,8 +55,7 @@ jobs:
   linux-test:
     name: Linux Test
     needs: lint
-    # Use ubuntu-20.04.5 for containers with cgroups v1. Otherwise, use ubuntu-24.04 (cgroups v2).
-    runs-on: ${{ fromJSON('["ubuntu-24.04", "ubuntu-20.04"]')[contains(fromJSON('["amazonlinux2", "centos9", "opensuse12", "ubuntu1604"]'), matrix.distro)] }}
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
@@ -65,13 +64,10 @@ jobs:
           - ansible~=9.2.0
           - ansible~=8.7.0
         distro:
-          - amazonlinux2
           - amazonlinux2023
           - centos8
-          - centos9
           - debian11
           - debian12
-          - opensuse12
           - ubuntu2004
           - ubuntu2204
 

.github/workflows/auto-instrumentation.yml

@@ -23,7 +23,7 @@ env:
   PYTHON_VERSION: '3.13'
   PIP_VERSION: '24.2'
   REQUIREMENTS_PATH: "packaging/tests/requirements.txt"
-  GO_VERSION: 1.23.6
+  GO_VERSION: 1.23.8
 
 jobs:
   cross-compile:
@@ -53,7 +53,7 @@ jobs:
             ./bin/*
 
   build-package:
-    runs-on: ubuntu-24.04
+    runs-on: ${{ matrix.ARCH == 'amd64' && 'ubuntu-24.04' || 'ubuntu-24.04-arm' }}
     strategy:
       matrix:
         SYS_PACKAGE: [ "deb", "rpm" ]
@@ -64,12 +64,6 @@ jobs:
         with:
           fetch-depth: 0
 
-      - uses: docker/setup-qemu-action@v3
-        if: ${{ matrix.ARCH != 'amd64' }}
-        with:
-          platforms: ${{ matrix.ARCH }}
-          image: tonistiigi/binfmt:qemu-v7.0.0
-
       - name: Run tests
         run: make -C instrumentation tests ARCH=${{ matrix.ARCH }}
 
@@ -92,24 +86,24 @@ jobs:
         id: get-matrix
         run: |
           # create test matrix for distro and arch
-          dockerfiles=$(find packaging/tests/instrumentation/images/ -name "Dockerfile.*" | cut -d '.' -f2- | sort -u)
+          dockerfiles=$(find packaging/tests/instrumentation/images -name "Dockerfile.*" | cut -d '.' -f2- | sort -u)
           if [ -z "$dockerfiles" ]; then
             echo "Failed to get dockerfiles from packaging/tests/instrumentation/images!" >&2
             exit 1
           fi
           distro=$(for d in $dockerfiles; do echo -n "\"$d\","; done)
           arch="\"amd64\", \"arm64\""
           testcase="\"express\",\"tomcat\",\"dotnet\""
-          exclude='{"ARCH": "arm64", "TESTCASE": "dotnet"}'  # splunk-otel-dotnet currently not supported on arm64
+          # splunk-otel-dotnet currently not supported on arm64
+          exclude='{"ARCH": "arm64", "TESTCASE": "dotnet"}'
           matrix="{\"DISTRO\": [${distro%,}], \"ARCH\": [${arch}], \"TESTCASE\": [${testcase}], \"exclude\": [${exclude}]}"
           echo "$matrix" | jq
           echo "matrix=${matrix}" >> $GITHUB_OUTPUT
     outputs:
       matrix: ${{ steps.get-matrix.outputs.matrix }}
 
   test-package:
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ${{ fromJSON('["ubuntu-20.04", "ubuntu-22.04"]')[matrix.DISTRO == 'amazonlinux-2023'] }}
+    runs-on: ubuntu-24.04${{ matrix.ARCH == 'arm64' && '-arm' || '' }}
     timeout-minutes: 60
     needs: [cross-compile, build-package, test-package-matrix]
     strategy:
@@ -140,12 +134,6 @@ jobs:
           name: splunk-otel-auto-instrumentation-${{ matrix.ARCH }}-${{ env.SYS_PACKAGE }}
           path: ./instrumentation/dist
 
-      - uses: docker/setup-qemu-action@v3
-        if: ${{ matrix.ARCH != 'amd64' }}
-        with:
-          platforms: ${{ matrix.ARCH }}
-          image: tonistiigi/binfmt:qemu-v7.0.0
-
       - name: Setup python
         uses: actions/setup-python@v5
         with:
@@ -168,23 +156,15 @@ jobs:
         continue-on-error: true
         run: |
           distro="${{ matrix.DISTRO }}"
-          if [[ "$distro" = "amazonlinux-2" ]]; then
-            # workaround for pytest substring matching
-            distro="amazonlinux-2 and not amazonlinux-2023"
-          fi
           testcase="${{ matrix.TESTCASE }} or uninstall"
           python3 -u -m pytest -s --verbose -k "$distro and ${{ matrix.ARCH }} and ($testcase)" \
             packaging/tests/instrumentation/instrumentation_test.py
 
-      # qemu, networking, running systemd in containers, etc., can be flaky
+      # networking, running systemd in containers, etc., can be flaky
       - name: Re-run failed tests
         if: ${{ steps.pytest.outcome == 'failure' }}
         run: |
           distro="${{ matrix.DISTRO }}"
-          if [[ "$distro" = "amazonlinux-2" ]]; then
-            # workaround for pytest substring matching
-            distro="amazonlinux-2 and not amazonlinux-2023"
-          fi
           testcase="${{ matrix.TESTCASE }} or uninstall"
           python3 -u -m pytest -s --verbose -k "$distro and ${{ matrix.ARCH }} and ($testcase)" \
             --last-failed \

.github/workflows/build-and-test.yml

@@ -26,7 +26,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  GO_VERSION: 1.23.6
+  GO_VERSION: 1.23.8
 
 jobs:
   setup-environment:
@@ -86,9 +86,9 @@ jobs:
       - name: gofmt
         run: |
           make install-tools
-          make fmt
+          make for-all CMD="make fmt"
           if ! git diff --exit-code; then
-            echo "One or more Go files are not formatted correctly. Run 'make fmt' and push the changes."
+            echo "One or more Go files are not formatted correctly. Run 'make for-all CMD="make fmt"' and push the changes."
             exit 1
           fi
 
@@ -193,16 +193,19 @@ jobs:
           go-version: ${{ env.GO_VERSION }}
           cache-dependency-path: '**/go.sum'
 
-      - name: Coverage tests
-        run: |
-          make install-tools
-          make test-with-cover
+      - name: Install Tools
+        run: make install-tools
 
-      - name: Uploading artifacts
-        uses: actions/upload-artifact@v4
+      - name: Run Unit Tests With Coverage
+        run: make gotest-with-codecov
+
+      - name: Upload coverage report
+        uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # 5.4.0
         with:
-          name: coverage-results
-          path: ./coverage.html
+          fail_ci_if_error: true
+          verbose: true
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
   cross-compile:
     name: cross-compile

.github/workflows/configs/kind-config.yaml

@@ -0,0 +1,20 @@
+kind: Cluster
+apiVersion: kind.x-k8s.io/v1alpha4
+nodes:
+  - role: control-plane
+    kubeadmConfigPatches:
+      - |
+        kind: InitConfiguration
+        nodeRegistration:
+          kubeletExtraArgs:
+            node-labels: "ingress-ready=true"
+      - |
+        kind: KubeletConfiguration
+        serverTLSBootstrap: true
+    extraPortMappings:
+      - containerPort: 80
+        hostPort: 80
+        protocol: TCP
+      - containerPort: 443
+        hostPort: 443
+        protocol: TCP

.github/workflows/darwin-test.yml

@@ -19,7 +19,7 @@ on:
       - '!packaging/**'
 
 env:
-  GO_VERSION: '1.23.6'
+  GO_VERSION: 1.23.8
 
 concurrency:
   group: darwin-test-${{ github.event.pull_request.number || github.ref }}
@@ -45,14 +45,32 @@ jobs:
 
       - run: go env -w CGO_ENABLED=0
 
-      - name: Install golang dependency
-        run: make install-tools
-
-      - name: Unit tests with coverage
-        run: make test-with-cover
+      - name: Unit tests
+        run: |
+          set -o pipefail
+          make install-tools
+          mkdir -p unit-test-results-${{ matrix.OS }}/junit
+          trap "go-junit-report  -set-exit-code < unit-test-results-${{ matrix.OS }}/go-unit-tests.out > unit-test-results-${{ matrix.OS }}/junit/results.xml" EXIT
+          make gotest-cover-without-race | tee unit-test-results-${{ matrix.OS }}/go-unit-tests.out
 
       - name: Uploading artifacts
         uses: actions/upload-artifact@v4
         with:
-          name: coverage-results-${{ matrix.OS }}
-          path: ./coverage.html
+          name: unit-test-results-${{ matrix.OS }}
+          path: ./unit-test-results-${{ matrix.OS }}
+
+      - name: Upload coverage report
+        uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # 5.4.0
+        with:
+          fail_ci_if_error: true
+          verbose: true
+        env:
+          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
+
+      - name: bundle.d
+        run: |
+          make bundle.d
+          if ! git diff --exit-code; then
+            echo "Discovery bundle.d config has changed. Run 'make bundle.d' and push the changes or ensure correct .tmpl updated."
+            exit 1
+          fi

.github/workflows/dotnet-instr-deployer-add-on.yml

@@ -9,6 +9,8 @@ on:
     paths:
       - 'packaging/dotnet-instr-deployer-add-on/**'
       - '.github/workflows/dotnet-instr-deployer-add-on.yml'
+  schedule:
+    - cron: '0 1 * * 1,4' # Every Monday and Thursday at 1 AM UTC
   workflow_dispatch:
     inputs:
       splunk_uf_version:
@@ -21,13 +23,13 @@ on:
         default: '6b4ebe426ca6'
 
 env:
-  GO_VERSION: 1.23.6
+  GO_VERSION: 1.23.8
   # Provide default values for non-manually triggered executions
   splunk_uf_version: ${{ github.event.inputs.splunk_uf_version || '9.4.0' }}
   splunk_uf_build_hash: ${{ github.event.inputs.splunk_uf_build_hash || '6b4ebe426ca6' }}
 
 jobs:
-  build-pack-test-dotnet-deployer-ta:
+  build-pack-test-dotnet-instrumentation-deployer-ta:
     runs-on: windows-latest
 
     steps:
@@ -86,3 +88,44 @@ jobs:
         if: always()
         run: |
           Get-Content "${Env:ProgramFiles}\SplunkUniversalForwarder\var\log\splunk\splunk_otel_dotnet_deployer.log"
+
+  push-release-tag:
+    name: Push Release Tag
+    runs-on: ubuntu-24.04
+    needs: [build-pack-test-dotnet-instrumentation-deployer-ta]
+    if: github.ref == 'refs/heads/main'
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Read version from app.conf
+        id: read-app-conf
+        run: |
+          version=$(grep -oP '^version = \K.*' packaging/dotnet-instr-deployer-add-on/assets/default/app.conf)
+          echo "version=$version" >> $GITHUB_OUTPUT
+
+      - name: Ensure version is read from app.conf
+        if: steps.read-app-conf.outputs.version == ''
+        run: echo "Fail to read version from app.conf" && exit 1
+
+      - name: Push new release tag if it doesn't exist
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+              const tagRef = "tags/dotnet-instrumentation-deployer-ta-v${{ steps.read-app-conf.outputs.version }}"
+              const existingRefs = await github.rest.git.listMatchingRefs({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                ref: tagRef
+              })
+              if (existingRefs.data.length === 0) {
+                await github.rest.git.createRef({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  ref: "refs/" + tagRef,
+                  sha: context.sha
+                })
+              } else {
+                console.log(tagRef + " already exists")
+              }

.github/workflows/gendependabot.yml

@@ -8,7 +8,7 @@ on:
       - '.github/workflows/scripts/gendependabot.sh'
 
 env:
-  GO_VERSION: 1.23.6
+  GO_VERSION: 1.23.8
 
 jobs:
   gendependabot: