newrelic-forks
diff --git a/‎.chloggen/config.yaml‎
Lines changed: 6 additions & 2 deletions b/‎.chloggen/config.yaml‎
Lines changed: 6 additions & 2 deletions
diff --git a/‎.chloggen/feature_atp.yaml‎
Lines changed: 0 additions & 27 deletions b/‎.chloggen/feature_atp.yaml‎
Lines changed: 0 additions & 27 deletions
diff --git a/‎.github/actionlint.yaml‎
Lines changed: 3 additions & 4 deletions b/‎.github/actionlint.yaml‎
Lines changed: 3 additions & 4 deletions
diff --git a/‎.github/lychee.toml‎
Lines changed: 7 additions & 1 deletion b/‎.github/lychee.toml‎
Lines changed: 7 additions & 1 deletion
diff --git a/‎.github/workflows/build-and-test.yml‎
Lines changed: 0 additions & 1 deletion b/‎.github/workflows/build-and-test.yml‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎.github/workflows/changelog.yml‎
Lines changed: 3 additions & 3 deletions b/‎.github/workflows/changelog.yml‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎.github/workflows/scoped-test.yaml‎
Lines changed: 2 additions & 1 deletion b/‎.github/workflows/scoped-test.yaml‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎.github/workflows/scripts/release-prepare-release.sh‎
Lines changed: 18 additions & 0 deletions b/‎.github/workflows/scripts/release-prepare-release.sh‎
Lines changed: 18 additions & 0 deletions
diff --git a/‎.github/workflows/scripts/update-golang.sh‎
Lines changed: 47 additions & 0 deletions b/‎.github/workflows/scripts/update-golang.sh‎
Lines changed: 47 additions & 0 deletions
diff --git a/‎.github/workflows/update-otel.yaml‎
Lines changed: 3 additions & 1 deletion b/‎.github/workflows/update-otel.yaml‎
Lines changed: 3 additions & 1 deletion
@@ -9,8 +9,12 @@ summary_template: .chloggen/summary.tmpl
 components:
     - all
     - cmd/codecovgen
-    - exporter/nopexporter
+    - cmd/nrdotcol
+    - cmd/oteltestbedcol
+    - exporter/nop
     - internal/common
     - internal/coreinternal
-    - receiver/nopreceiver
+    - internal/tools
+    - processor/adaptivetelemetry
+    - receiver/nop
     - testbed
@@ -1,9 +1,8 @@
-self-hosted-runner:
-  labels:
-    - oracle-bare-metal-64cpu-512gb-x86-64
-
 config-variables: null
 
 paths:
   .github/workflows/**/*.{yml,yaml}:
     ignore:
+      # only report warning/errors
+      - 'SC\d+:info'
+      - 'SC\d+:style'
@@ -8,7 +8,13 @@ exclude  = [
     "^https://dev.mysql.com",
     "^https://bugs.mysql.com",
     "^https://techdocs.akamai.com",
-    "^https://www.vultr.com"
+    "^https://www.vultr.com",
+    # disabled
+    "^https://github.com/newrelic/nrdot-collector-components/discussions",
+    # private org links
+    "^https://www.github.com/newrelic/dbi",
+    "^https://www.github.com/newrelic/ohai"
+
 ]
 
 # better to be safe and avoid failures
 
@@ -71,7 +71,6 @@ jobs:
         id: go-setup
         with:
           go-version: oldstable
-          cache-dependency-path: "**/*.sum"
       - name: Install dependencies
         if: steps.go-setup.outputs.cache-hit != 'true'
         run: make -j2 gomoddownload
 
@@ -67,10 +67,10 @@ jobs:
       - name: Ensure ./.chloggen/*.yaml addition(s)
         if: ${{ !contains(github.event.pull_request.labels.*.name, 'dependencies') && !contains(github.event.pull_request.labels.*.name, 'Skip Changelog') && !contains(github.event.pull_request.title, '[chore]')}}
         run: |
-          if [[ 1 -gt "$(git diff --diff-filter=A --name-only "$(git merge-base origin/main "$PR_HEAD")" "$PR_HEAD" ./.chloggen | grep -c \\.yaml)" ]]
+          if [[ 1 -gt "$(git diff --diff-filter=AM --name-only "$(git merge-base origin/main "$PR_HEAD")" "$PR_HEAD" ./.chloggen | grep -c \\.yaml)" ]]
           then
-            echo "No changelog entry was added to the ./.chloggen/ directory."
-            echo "Please add a .yaml file to the ./.chloggen/ directory."
+            echo "No changelog entry was added or changed in the ./.chloggen/ directory."
+            echo "Please add or edit an existing .yaml file in the ./.chloggen/ directory."
             echo "See CONTRIBUTING.md for more details."
             echo "Alternately, add either \"[chore]\" to the title of the pull request or add the \"Skip Changelog\" label if this job should be skipped."
             false
 
@@ -19,7 +19,6 @@ jobs:
       - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
         with:
           fetch-depth: 0
-
       - name: Get changes
         shell: bash
         id: changes
@@ -69,6 +68,8 @@ jobs:
           echo "go_sources: ${{ needs.changedfiles.outputs.go_sources }}"
           echo "go_tests: ${{ needs.changedfiles.outputs.go_tests }}"
       - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
+        with:
+          fetch-depth: 0
       - run: ./.github/workflows/scripts/free-disk-space.sh
       - uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6
         id: go-setup
 
@@ -27,6 +27,24 @@ BRANCH="prepare-release-prs/${CANDIDATE_BETA}"
 git checkout -b "${BRANCH}"
 
 if [[ ${SYNC_UPSTREAM} == "true" ]]; then
+    # Resolve the highest published OTel release tag at the candidate minor version so that
+    # multimod sync operates against a known stable release rather than a floating main HEAD.
+    # We query the Go module proxy directly rather than relying on local git tags, since a
+    # shallow clone will not have historical tags for older minor versions.
+    CANDIDATE_MINOR=$(echo "${CANDIDATE_BETA}" | cut -d. -f1-2)
+    HIGHEST_OTEL_VERSION=$(cd cmd/nrdotcol && go list -m -versions go.opentelemetry.io/collector 2>/dev/null \
+        | tr ' ' '\n' | grep "^v${CANDIDATE_MINOR}\." | grep -v -- '-' | sort -V | tail -1)
+    if [[ -n "${HIGHEST_OTEL_VERSION}" ]]; then
+        echo "Using OTel collector version: ${HIGHEST_OTEL_VERSION}"
+        pushd ../opentelemetry-collector
+        git fetch --depth=1 origin "refs/tags/${HIGHEST_OTEL_VERSION}:refs/tags/${HIGHEST_OTEL_VERSION}"
+        git checkout "${HIGHEST_OTEL_VERSION}"
+        popd
+    else
+        echo "Error: No published version found for v${CANDIDATE_MINOR}.x on the Go module proxy"
+        exit 1
+    fi
+
     # If the version is blank, multimod will use the version from upstream versions.yaml
     make update-otel OTEL_VERSION="" OTEL_STABLE_VERSION="" CONTRIB_VERSION=""
 
 
@@ -0,0 +1,47 @@
+#!/bin/bash
+set -e
+
+VERSION=''
+
+while getopts v: flag
+do
+    case "${flag}" in
+        v) VERSION=${OPTARG};;
+        *) exit 1;;
+    esac
+done
+
+if [ -z "$VERSION" ]; then
+    echo "Error: VERSION is required"
+    echo "Usage: $0 -v <version>"
+    exit 1
+fi
+
+echo "Bumping Go version to $VERSION..."
+
+# Determine the OS and set the sed function accordingly
+if [[ "$OSTYPE" == "darwin"* ]]; then
+  # macOS
+  sed_inplace() {
+    sed -i '' "$@"
+  }
+else
+  # Linux
+  sed_inplace() {
+    sed -i "$@"
+  }
+fi
+
+# Find all go.mod files
+echo "Finding all go.mod files..."
+GO_MOD_FILES=$(find . -name "go.mod" -type f)
+
+# Update all go.mod files
+echo "Updating all go.mod files..."
+while IFS= read -r file; do
+  sed_inplace -E "s/^go [0-9]+\.[0-9]+.*/go $VERSION/g" "$file"
+done <<< "$GO_MOD_FILES"
+
+echo ""
+echo "✓ Successfully bumped golang version to $VERSION"
+echo ""
@@ -46,6 +46,7 @@ jobs:
           exec > >(tee log.out) 2>&1
           LAST_COMMIT="$(git -C ./opentelemetry-collector/ rev-parse HEAD)"
           LAST_CONTRIB_COMMIT="$(git -C ./opentelemetry-collector-contrib/ rev-parse HEAD)"
+          GO_VERSION="$(grep '^go ' ./opentelemetry-collector/service/go.mod | awk '{print $2}')"
           cd nrdot-collector-components
           git config user.name "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
@@ -54,6 +55,7 @@ jobs:
           make gennrdotcol
           echo "LAST_COMMIT=$LAST_COMMIT" >> "$GITHUB_ENV"
           echo "LAST_CONTRIB_COMMIT=$LAST_CONTRIB_COMMIT" >> "$GITHUB_ENV"
+          echo "GO_VERSION=$GO_VERSION" >> "$GITHUB_ENV"
           echo "BRANCH_NAME=$branch" >> "$GITHUB_ENV"
       - name: Gets packages from links with retries
         uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3.0.2
@@ -64,7 +66,7 @@ jobs:
           retry_on: error
           command: |
             cd nrdot-collector-components
-            make update-otel OTEL_STABLE_VERSION=${{ env.LAST_COMMIT }} OTEL_VERSION=${{ env.LAST_COMMIT }} CONTRIB_VERSION=${{ env.LAST_CONTRIB_COMMIT }}
+            make update-otel OTEL_STABLE_VERSION=${{ env.LAST_COMMIT }} OTEL_VERSION=${{ env.LAST_COMMIT }} CONTRIB_VERSION=${{ env.LAST_CONTRIB_COMMIT }} GO_VERSION=${{ env.GO_VERSION }}
       - name: Push and create PR
         run: |
           cd nrdot-collector-components