Merge branch 'main' into emiliaFer/addFips

emiliaFer · web-flow · commit 0882ce0fa898 · 2025-09-10T14:13:40.000-04:00
diff --git a/.github/workflows/ci-base.yaml b/.github/workflows/ci-base.yaml
@@ -126,7 +126,7 @@ jobs:
           REGISTRY: "${{ secrets.registry }}"
         with:
           distribution: goreleaser
-          version: '~> v2'
+          version: '2.11.2'
           args: ${{ env.goreleaser_args }}
           workdir: distributions/${{ inputs.distribution }}
 
diff --git a/.github/workflows/ci-nightly.yaml b/.github/workflows/ci-nightly.yaml
@@ -119,7 +119,7 @@ jobs:
           REGISTRY: ${{ env.REGISTRY }}
         with:
           distribution: goreleaser
-          version: '~> v2'
+          version: '2.11.2'
           args: --skip=announce,validate --clean --timeout 2h --config .goreleaser-nightly.yaml
           workdir: distributions/${{ matrix.distribution }}
       - name: Extract Docker Manifest SHA
diff --git a/.github/workflows/release-draft.yaml b/.github/workflows/release-draft.yaml
@@ -27,7 +27,7 @@ jobs:
         uses: goreleaser/goreleaser-action@v6
         with:
           distribution: goreleaser
-          version: '~> v2'
+          version: '2.11.2'
           args: --clean --timeout 2h
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -111,6 +111,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           distribution: goreleaser
-          version: '~> v2'
+          version: '2.11.2'
           args: --clean --skip=announce --timeout 2h
           workdir: distributions/${{ matrix.distribution }}
diff --git a/cmd/nrdot-collector-builder/go.mod b/cmd/nrdot-collector-builder/go.mod
@@ -18,7 +18,7 @@ require (
 
 require (
 	github.com/fsnotify/fsnotify v1.9.0 // indirect
-	github.com/go-viper/mapstructure/v2 v2.3.0 // indirect
+	github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/knadh/koanf/maps v0.1.2 // indirect
 	github.com/knadh/koanf/providers/file v1.2.0
diff --git a/cmd/nrdot-collector-builder/go.sum b/cmd/nrdot-collector-builder/go.sum
@@ -4,8 +4,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
 github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
-github.com/go-viper/mapstructure/v2 v2.3.0 h1:27XbWsHIqhbdR5TIC911OfYvgSaW93HM+dX7970Q7jk=
-github.com/go-viper/mapstructure/v2 v2.3.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
+github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs=
+github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/knadh/koanf/maps v0.1.2 h1:RBfmAW5CnZT+PJ1CVc1QSJKf4Xu9kxfQgYVQSu8hpbo=
diff --git a/distributions/nrdot-collector-host/config.yaml b/distributions/nrdot-collector-host/config.yaml
@@ -180,10 +180,7 @@ processors:
   resourcedetection/cloud:
     detectors: ["gcp", "ec2", "azure"]
     timeout: 2s
-    ec2:
-      resource_attributes:
-        host.name:
-          enabled: false
+    override: true
 
   # Gives OTEL_RESOURCE_ATTRIBUTES precedence over other sources.
   # host.id is set from env whenever the collector is orchestrated by NR Agents.
diff --git a/distributions/nrdot-collector-host/test/spec-local.yaml b/distributions/nrdot-collector-host/test/spec-local.yaml
@@ -190,6 +190,19 @@ scenarios:
         - source: "internal-expected-metrics.yaml"
       # Tests for existence of signal + specific attributes
       nrqls:
+        # Resource attributes (any signal would work)
+        - query: FROM Log SELECT filter(count(*), service.name is not null) as logs_service_name
+          expected_results:
+            - key: logs_service_name
+              lowerBoundedValue: 1
+        - query: FROM Log SELECT filter(count(*), newrelic.collector_telemetry.version is not null) as logs_telemetry_version
+          expected_results:
+            - key: logs_telemetry_version
+              lowerBoundedValue: 1
+        - query: FROM Log SELECT filter(count(*), newrelic.service.type='otel_collector') as logs_service_type
+          expected_results:
+            - key: logs_service_type
+              lowerBoundedValue: 1
         # Logs
         - query: FROM Log SELECT count(*) as logs_all
           expected_results:
diff --git a/distributions/nrdot-collector-host/test/spec-nightly.yaml b/distributions/nrdot-collector-host/test/spec-nightly.yaml
@@ -1,8 +1,8 @@
 nightly:
   collectorChart:
     name: nr_backend
-    version: 0.1.0
   ec2:
     enabled: true
   testCaseSpecs:
-    - host
+    - host
+    - resourcedetection
diff --git a/distributions/nrdot-collector/config.yaml b/distributions/nrdot-collector/config.yaml
@@ -184,6 +184,7 @@ processors:
       resource_attributes:
         host.name:
           enabled: false
+    override: true
 
   # Gives OTEL_RESOURCE_ATTRIBUTES precedence over other sources.
   # host.id is set from env whenever the collector is orchestrated by NR Agents.
diff --git a/distributions/nrdot-collector/test/spec-local.yaml b/distributions/nrdot-collector/test/spec-local.yaml
@@ -190,6 +190,19 @@ scenarios:
         - source: "internal-expected-metrics.yaml"
       # Tests for existence of signal + specific attributes
       nrqls:
+        # Resource attributes (any signal would work)
+        - query: FROM Log SELECT filter(count(*), service.name is not null) as logs_service_name
+          expected_results:
+            - key: logs_service_name
+              lowerBoundedValue: 1
+        - query: FROM Log SELECT filter(count(*), newrelic.collector_telemetry.version is not null) as logs_telemetry_version
+          expected_results:
+            - key: logs_telemetry_version
+              lowerBoundedValue: 1
+        - query: FROM Log SELECT filter(count(*), newrelic.service.type='otel_collector') as logs_service_type
+          expected_results:
+              - key: logs_service_type
+                lowerBoundedValue: 1
         # Logs
         - query: FROM Log SELECT count(*) as logs_all
           expected_results:
diff --git a/distributions/nrdot-collector/test/spec-nightly.yaml b/distributions/nrdot-collector/test/spec-nightly.yaml
@@ -5,4 +5,5 @@ nightly:
   ec2:
     enabled: true
   testCaseSpecs:
-    - host
+    - host
+    - resourcedetection
diff --git a/examples/internal-telemetry-config.yaml b/examples/internal-telemetry-config.yaml
@@ -1,15 +1,19 @@
 ##### Example configuration for internal telemetry
 # This configuration is intended to be used in conjunction with a configuration of components and pipelines. The
 # collector supports config merging on startup.
+##### Requirements
+# - nrdot-collector (any distro) >= 1.3.0 or collector core version >= v1.35.0 / v0.129.0
 ##### Configuration via environment variables
-# For valid values, see: https://opentelemetry.io/docs/collector/internal-telemetry/
+# For official documentation, see: https://opentelemetry.io/docs/collector/internal-telemetry/
 ## Required
 # - INTERNAL_TELEMETRY_NEW_RELIC_LICENSE_KEY
 ## Optional
-# - INTERNAL_TELEMETRY_SERVICE_NAME: determines entity name in New Relic
-# - INTERNAL_TELEMETRY_OTLP_ENDPOINT: defaults to https://otlp.nr-data.net (https://docs.newrelic.com/docs/opentelemetry/best-practices/opentelemetry-otlp/)
-# - INTERNAL_TELEMETRY_METRICS_LEVEL
-# - INTERNAL_TELEMETRY_LOG_LEVEL
+# - INTERNAL_TELEMETRY_SERVICE_NAME: defaults to 'otel-collector', determines entity name in New Relic
+# - INTERNAL_TELEMETRY_OTLP_ENDPOINT: defaults to 'https://otlp.nr-data.net', see https://docs.newrelic.com/docs/opentelemetry/best-practices/opentelemetry-otlp/ and https://docs.newrelic.com/docs/opentelemetry/best-practices/opentelemetry-otlp-troubleshooting/
+# - INTERNAL_TELEMETRY_METRICS_LEVEL: defaults to 'detailed', other values are 'normal', 'basic', 'none'
+# - INTERNAL_TELEMETRY_LOG_LEVEL: defaults to INFO, other values are DEBUG, WARN, ERROR
+# - INTERNAL_TELEMETRY_TRACE_LEVEL: defaults to 'basic', other value is 'none'
+# - INTERNAL_TELEMETRY_TRACE_SAMPLE_RATIO: defaults to 1.0, i.e. all spans get sampled, use float <1, e.g. 0.1 for 10% sampling
 service:
   telemetry:
     metrics:
@@ -19,29 +23,47 @@ service:
             exporter:
               otlp:
                 protocol: http/protobuf
-                # https://docs.newrelic.com/docs/opentelemetry/best-practices/opentelemetry-otlp-troubleshooting/
                 endpoint: "${env:INTERNAL_TELEMETRY_OTLP_ENDPOINT:-https://otlp.nr-data.net}"
                 headers:
-                  api-key: "${env:INTERNAL_TELEMETRY_NEW_RELIC_LICENSE_KEY}"
+                  - name: api-key
+                    value: "${env:INTERNAL_TELEMETRY_NEW_RELIC_LICENSE_KEY}"
     logs:
       level: "${env:INTERNAL_TELEMETRY_LOG_LEVEL:-INFO}"
+      # default sampling config for reference to simplify overwrites even if not exposed via env var, e.g. --config=yaml:service::telemetry::logs::sampling::enabled::false
+      sampling:
+        enabled: true
+        # The interval in seconds that the logger applies to each sampling.
+        tick: 10s
+        # The number of messages logged at the start of each sampling::tick
+        initial: 10
+        # Sets the sampling policy for subsequent messages after sampling::initial messages are logged. When sampling::thereafter is set to N, every Nth message is logged and all others are dropped. If N is zero, the logger drops all messages after sampling::initial messages are logged.
+        thereafter: 100
       processors:
         - batch:
             exporter:
               otlp:
                 protocol: http/protobuf
                 endpoint: "${env:INTERNAL_TELEMETRY_OTLP_ENDPOINT:-https://otlp.nr-data.net}"
                 headers:
-                  api-key: "${env:INTERNAL_TELEMETRY_NEW_RELIC_LICENSE_KEY}"
+                  - name: api-key
+                    value: "${env:INTERNAL_TELEMETRY_NEW_RELIC_LICENSE_KEY}"
     traces:
+      level: "${env:INTERNAL_TELEMETRY_TRACE_LEVEL:-basic}"
+      sampler:
+        parent_based:
+          root:
+            trace_id_ratio_based:
+              ratio: ${env:INTERNAL_TELEMETRY_TRACE_SAMPLE_RATIO:-1.0}
       processors:
         - batch:
             exporter:
               otlp:
                 protocol: http/protobuf
                 endpoint: "${env:INTERNAL_TELEMETRY_OTLP_ENDPOINT:-https://otlp.nr-data.net}"
                 headers:
-                  api-key: "${env:INTERNAL_TELEMETRY_NEW_RELIC_LICENSE_KEY}"
+                  - name: api-key
+                    value: "${env:INTERNAL_TELEMETRY_NEW_RELIC_LICENSE_KEY}"
     resource:
-      newrelic.collector_telemetry.version: 0.1.0
+      newrelic.collector_telemetry.version: 0.3.0
+      newrelic.service.type: otel_collector
       service.name: "${env:INTERNAL_TELEMETRY_SERVICE_NAME:-otel-collector}"
diff --git a/test/charts/nr_backend/Chart.yaml b/test/charts/nr_backend/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
 name: nrdot-nr-backend
 description: A Helm chart for deploying an nrdot collector as a DaemonSet writing to New Relic
-version: 0.2.0
+version: 0.3.0
 appVersion: "1.0"
diff --git a/test/charts/nr_backend/templates/daemonset.yaml b/test/charts/nr_backend/templates/daemonset.yaml
@@ -37,4 +37,4 @@ spec:
                 fieldRef:
                   fieldPath: spec.nodeName
             - name: OTEL_RESOURCE_ATTRIBUTES
-              value: "host.name={{ .Values.collector.hostname }}-$(KUBE_NODE_NAME)"
+              value: "testKey={{ .Values.testKey }}-$(KUBE_NODE_NAME)"
diff --git a/test/charts/nr_backend/values.yaml b/test/charts/nr_backend/values.yaml
@@ -11,4 +11,6 @@ secrets:
 collector:
   hostname: nrdot-collector-default-hostname
 
+testKey: testKey-default-value
+
 clusterName: default-cluster-name
diff --git a/test/e2e/nightly/nightly_collector_nr_backend_test.go b/test/e2e/nightly/nightly_collector_nr_backend_test.go
@@ -12,19 +12,19 @@ import (
 )
 
 var ec2Ubuntu22 = spec.NightlySystemUnderTest{
-	HostNamePattern: testutil.NewNrQueryHostNamePattern("nightly", testutil.Wildcard, "ec2_ubuntu22_04"),
+	TestKeyPattern: testutil.NewNrQueryHostNamePattern("nightly", testutil.Wildcard, "ec2_ubuntu22_04"),
 	SkipIf: func(testSpec *spec.TestSpec) bool {
 		return !testSpec.Nightly.EC2.Enabled
 	},
 }
 var ec2Ubuntu24 = spec.NightlySystemUnderTest{
-	HostNamePattern: testutil.NewNrQueryHostNamePattern("nightly", testutil.Wildcard, "ec2_ubuntu24_04"),
+	TestKeyPattern: testutil.NewNrQueryHostNamePattern("nightly", testutil.Wildcard, "ec2_ubuntu24_04"),
 	SkipIf: func(testSpec *spec.TestSpec) bool {
 		return !testSpec.Nightly.EC2.Enabled
 	},
 }
 var k8sNode = spec.NightlySystemUnderTest{
-	HostNamePattern: testutil.NewNrQueryHostNamePattern("nightly", testutil.Wildcard, "k8s_node"),
+	TestKeyPattern: testutil.NewNrQueryHostNamePattern("nightly", testutil.Wildcard, "k8s_node"),
 }
 
 func TestNightlyCollectorWithNrBackend(t *testing.T) {
@@ -35,12 +35,12 @@ func TestNightlyCollectorWithNrBackend(t *testing.T) {
 
 	for _, sut := range []spec.NightlySystemUnderTest{ec2Ubuntu22, ec2Ubuntu24, k8sNode} {
 		if sut.SkipIf != nil && sut.SkipIf(testSpec) {
-			t.Logf("Skipping nightly system-under-test: %s", sut.HostNamePattern)
+			t.Logf("Skipping nightly system-under-test: %s", sut.TestKeyPattern)
 			continue
 		}
 		testEnvironment := map[string]string{
 			"clusterName": envutil.GetK8sContextName(),
-			"hostName":    sut.HostNamePattern,
+			"testKey":     sut.TestKeyPattern,
 		}
 		for _, testCaseSpecName := range testSpec.Nightly.TestCaseSpecs {
 			testCaseSpec := spec.LoadTestCaseSpec(testCaseSpecName)
@@ -52,14 +52,14 @@ func TestNightlyCollectorWithNrBackend(t *testing.T) {
 
 			whereClause := testCaseSpec.RenderWhereClause(testEnvironment)
 			for caseName, testCase := range testCaseSpec.GetTestCasesWithout(sut.ExcludedMetrics) {
-				t.Run(fmt.Sprintf("%s/%s/%s", sut.HostNamePattern, testCaseSpecName, caseName), func(t *testing.T) {
+				t.Run(fmt.Sprintf("%s/%s/%s", sut.TestKeyPattern, testCaseSpecName, caseName), func(t *testing.T) {
 					t.Parallel()
 					assertionFactory := assert.NewNrMetricAssertionFactory(
 						whereClause,
 						"2 hour ago",
 					)
 					assertion := assertionFactory.NewNrMetricAssertion(testCase.Metric, testCase.Assertions)
-					assertion.ExecuteWithRetries(t, client, 24, 5*time.Second)
+					assertion.ExecuteWithRetries(t, client, 50, 10*time.Second)
 				})
 			}
 		}
diff --git a/test/e2e/util/spec/host.yaml b/test/e2e/util/spec/host.yaml
@@ -1,7 +1,7 @@
 whereClause:
-  template: "WHERE host.name like '{{ .hostName }}'"
+  template: "WHERE testKey like '{{ .testKey }}'"
   vars:
-    - hostName
+    - testKey
 
 testCases:
   host_receiver_cpu.utilization_user:
diff --git a/test/e2e/util/spec/nightly.go b/test/e2e/util/spec/nightly.go
@@ -1,7 +1,7 @@
 package spec
 
 type NightlySystemUnderTest struct {
-	HostNamePattern string
+	TestKeyPattern  string
 	ExcludedMetrics []string
 	SkipIf          func(testSpec *TestSpec) bool
 }
diff --git a/test/e2e/util/spec/resourcedetection.yaml b/test/e2e/util/spec/resourcedetection.yaml
@@ -0,0 +1,15 @@
+whereClause:
+  template: "WHERE testKey like '{{ .testKey }}'"
+  vars:
+    - testKey
+
+testCases:
+  resourcedetection/cloud.ec2_host_name:
+    metric:
+      # any metric processed by resourcedetection works
+      name: system.cpu.utilization
+      whereClause: WHERE host.name like 'ip-%'
+    assertions:
+      - aggregationFunction: max
+        comparisonOperator: ">"
+        threshold: 0
diff --git a/test/e2e/util/spec/test_case_spec_test.go b/test/e2e/util/spec/test_case_spec_test.go
@@ -7,9 +7,9 @@ import (
 func TestRenderWhereClause(t *testing.T) {
 	testCaseSpec := LoadTestCaseSpec("host")
 	actual := testCaseSpec.RenderWhereClause(map[string]string{
-		"hostName": "nrdot-collector-host-foobar",
+		"testKey": "nrdot-collector-host-foobar",
 	})
-	if actual != "WHERE host.name like 'nrdot-collector-host-foobar'" {
+	if actual != "WHERE testKey like 'nrdot-collector-host-foobar'" {
 		t.Fatalf("unexpected where clause: %s", actual)
 	}
 }
diff --git a/test/terraform/modules/ec2/main.tf b/test/terraform/modules/ec2/main.tf
@@ -139,7 +139,7 @@ resource "aws_instance" "ubuntu" {
               ################################################
               echo 'Configuring Collector'
               echo 'NEW_RELIC_LICENSE_KEY=${var.nr_ingest_key}' >> /etc/${var.collector_distro}/${var.collector_distro}.conf
-              echo "OTEL_RESOURCE_ATTRIBUTES='host.name=${local.collector_reported_hostname_prefix}-${local.instance_config[count.index].hostname_suffix}'" >> /etc/${var.collector_distro}/${var.collector_distro}.conf
+              echo "OTEL_RESOURCE_ATTRIBUTES='testKey=${local.collector_reported_hostname_prefix}-${local.instance_config[count.index].hostname_suffix}'" >> /etc/${var.collector_distro}/${var.collector_distro}.conf
               systemctl reload-or-restart ${var.collector_distro}.service
               EOF
 }
diff --git a/test/terraform/nightly/main.tf b/test/terraform/nightly/main.tf
@@ -2,7 +2,7 @@ locals {
   test_spec                                       = yamldecode(file("${path.module}/../../../distributions/${var.distro}/test/spec-nightly.yaml"))
   ec2_enabled                                     = local.test_spec.nightly.ec2.enabled
   chart_name                                      = local.test_spec.nightly.collectorChart.name
-  chart_version                                   = local.test_spec.nightly.collectorChart.version
+  chart_version                                   = try(local.test_spec.nightly.collectorChart.version, null)
   releases_bucket_name                            = "nr-releases"
   required_permissions_boundary_arn_for_new_roles = "arn:aws:iam::${var.aws_account_id}:policy/resource-provisioner-boundary"
   k8s_namespace                                   = "nightly-${var.distro}"
@@ -19,10 +19,9 @@ data "aws_ecr_repository" "ecr_repo" {
 }
 
 resource "helm_release" "ci_e2e_nightly_nr_backend" {
-  count   = local.chart_name == "nr_backend" ? 1 : 0
-  name    = "nightly-nr-backend-${var.distro}"
-  chart   = "../../charts/nr_backend"
-  version = local.chart_version
+  count = local.chart_name == "nr_backend" ? 1 : 0
+  name  = "nightly-nr-backend-${var.distro}"
+  chart = "../../charts/nr_backend"
 
   create_namespace  = true
   namespace         = local.k8s_namespace
@@ -54,7 +53,7 @@ resource "helm_release" "ci_e2e_nightly_nr_backend" {
   }
 
   set {
-    name  = "collector.hostname"
+    name  = "testKey"
     value = "${var.test_environment}-${random_string.deploy_id.result}-${var.distro}-k8s_node"
   }
 
