Merge branch 'aws-cwa-dev' into dependabot/go_modules/extension/azureauthextension/golang.org/x/crypto-0.45.0

Author: the-mann

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

@@ -50,6 +50,7 @@ jobs:
     runs-on: otel-linux-arm64
     steps:
       - uses: actions/checkout@v4
+      - run: ./.github/workflows/scripts/free-disk-space.sh
       - uses: actions/setup-go@v5
         with:
           go-version: "1.24.9"
@@ -87,3 +88,4 @@ jobs:
             echo "One or more matrix jobs failed."
             false
           fi
+      - run: ./.github/workflows/scripts/check-disk-space.sh

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

@@ -56,6 +56,7 @@ jobs:
       GOMEMLIMIT: 2GiB
     steps:
       - uses: actions/checkout@v4
+      - run: ./.github/workflows/scripts/free-disk-space.sh
       - name: install IIS
         run: Install-WindowsFeature -name Web-Server -IncludeManagementTools
       - uses: actions/setup-go@v5

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

@@ -25,6 +25,7 @@ jobs:
     if: ${{ github.actor != 'dependabot[bot]' }}
     steps:
       - uses: actions/checkout@v4
+      - run: ./.github/workflows/scripts/free-disk-space.sh
       - uses: actions/setup-go@v5
         with:
           go-version: "1.24.9"
@@ -45,6 +46,7 @@ jobs:
       - name: Install Tools
         if: steps.go-cache.outputs.cache-hit != 'true'
         run: make install-tools
+      - run: ./.github/workflows/scripts/check-disk-space.sh
   check-collector-module-version:
     runs-on: ubuntu-latest
     needs: [setup-environment]
@@ -82,6 +84,7 @@ jobs:
     needs: [setup-environment]
     steps:
       - uses: actions/checkout@v4
+      - run: ./.github/workflows/scripts/free-disk-space.sh
       - uses: actions/setup-go@v5
         with:
           go-version: "1.24.9"
@@ -109,6 +112,7 @@ jobs:
           key: go-lint-build-${{ matrix.group }}-${{ runner.os }}-${{ hashFiles('**/go.sum') }}
       - name: Lint
         run: GOOS=${{ matrix.goos }} GOARCH=amd64 make -j2 golint GROUP=${{ matrix.group }}
+      - run: ./.github/workflows/scripts/check-disk-space.sh
   lint:
     if: ${{ github.actor != 'dependabot[bot]' && always() }}
     runs-on: ubuntu-latest
@@ -301,6 +305,7 @@ jobs:
         with:
           name: coverage-artifacts-${{ matrix.go-version }}-${{ matrix.runner }}-${{ matrix.group }}
           path: ${{ matrix.group }}-coverage.txt
+      - run: ./.github/workflows/scripts/check-disk-space.sh
   unittest:
     if: ${{ github.actor != 'dependabot[bot]' && always() }}
     runs-on: ubuntu-latest
@@ -450,9 +455,11 @@ jobs:
     needs: [setup-environment]
     steps:
       - uses: actions/checkout@v4
+      - run: ./.github/workflows/scripts/free-disk-space.sh
       - run: make genotelcontribcol
       - name: Build Examples
         run: make build-examples
+      - run: ./.github/workflows/scripts/check-disk-space.sh
 
   cross-compile:
     runs-on: ubuntu-latest

.github/workflows/scripts/check-disk-space.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+#
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+declare BASELINE_SPACE
+
+free_space=$(df -m / | tail -1 | awk '{print $4}')
+used_space=$((BASELINE_SPACE - free_space))
+echo "Job used $used_space MiB of disk space, $free_space MiB remain."
+if [ "$used_space" -gt 14336 ]; then
+  echo "WARNING: The amount of space used exceeds the 14 GiB guaranteed by Github."
+fi
+if [ "$free_space" -lt 1024 ]; then
+  echo "WARNING: The amount of space remaining is dangerously low."
+  # TODO: Make this warning more visible
+fi

.github/workflows/scripts/free-disk-space.sh

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+#
+# Copyright The OpenTelemetry Authors
+# SPDX-License-Identifier: Apache-2.0
+
+contrib_dir="$(dirname -- "$0")/../../.."
+initial_checkout_size=$(du -sm "$contrib_dir" 2>/dev/null | cut -f1 || echo "0")
+space_before_cleanup=$(df -m / | tail -1 | awk '{print $4}')
+
+# The Android SDK is the biggest culprit for the lack of disk space in CI.
+# It is installed into /usr/local/lib/android manually (ie. not with apt) by this script:
+# https://github.com/actions/runner-images/blob/main/images/ubuntu/scripts/build/install-android-sdk.sh
+
+echo "Deleting unused Android SDK and tools..."
+if [ -d "/usr/local/lib/android" ]; then
+    sudo rm -rf /usr/local/lib/android
+else
+    echo "Android SDK directory not found, skipping cleanup"
+fi
+
+free_space=$(df -m / | tail -1 | awk '{print $4}')
+freed_space=$((free_space - space_before_cleanup))
+echo "Freed ${freed_space} MiB of disk space."
+
+# Hypothetical free space with the cleanup but without checkout
+baseline_space=$((free_space + initial_checkout_size))
+echo "BASELINE_SPACE=${baseline_space}" >> "$GITHUB_ENV"

receiver/awscontainerinsightreceiver/internal/nvme/nvme_lis_scraper_config.go

@@ -65,12 +65,6 @@ func getLisMetricRelabelConfig(hostInfoProvider hostInfoProvider) []*relabel.Con
 			Regex:        relabel.MustNewRegexp(".*_bucket|.*_sum|.*_count.*"),
 			Action:       relabel.Drop,
 		},
-		// Below metrics are NVMe data collection metrics which are not supported to maintain parity with EBS NVMe metrics
-		{
-			SourceLabels: model.LabelNames{"__name__"},
-			Regex:        relabel.MustNewRegexp(".*_nvme_collector_.*"),
-			Action:       relabel.Drop,
-		},
 		// Inject static values (clusterName/instanceId/nodeName/volumeID)
 		{
 			SourceLabels: model.LabelNames{"instance_id"},

receiver/snowflakereceiver/go.mod

@@ -52,7 +52,7 @@ require (
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/danieljoos/wincred v1.2.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/dvsekhvalnov/jose2go v1.6.0 // indirect
+	github.com/dvsekhvalnov/jose2go v1.7.0 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.7 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect

receiver/snowflakereceiver/go.sum

@@ -4,6 +4,7 @@ go 1.24.9
 
 require (
 	github.com/docker/go-connections v0.5.0
+	github.com/dvsekhvalnov/jose2go v1.7.0 // indirect
 	github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage v0.124.1
 	github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.124.1
 	github.com/open-telemetry/opentelemetry-collector-contrib/internal/sqlquery v0.124.1
@@ -79,7 +80,6 @@ require (
 	github.com/distribution/reference v0.6.0 // indirect
 	github.com/docker/docker v28.3.3+incompatible // indirect
 	github.com/docker/go-units v0.5.0 // indirect
-	github.com/dvsekhvalnov/jose2go v1.6.0 // indirect
 	github.com/ebitengine/purego v0.8.2 // indirect
 	github.com/elastic/lunes v0.1.0 // indirect
 	github.com/expr-lang/expr v1.17.2 // indirect