Add oxide host as a resource attribute.

Useful when collecting metrics/logs from multiple oxide racks. Metrics and logs
should also include a rack id, but we should also include a human-readable
label identifying the rack.

Author: jmcarp

go.mod

@@ -9,7 +9,7 @@ tool (
 
 require (
 	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/pdatatest v0.139.0
-	github.com/oxidecomputer/oxide.go v0.8.1-0.20260304174018-b0f8ba0c764c
+	github.com/oxidecomputer/oxide.go v0.8.1-0.20260319134325-8a08d5f59e23
 	github.com/stretchr/testify v1.11.1
 	go.opentelemetry.io/collector/component v1.45.0
 	go.opentelemetry.io/collector/component/componenttest v0.139.0

go.sum

@@ -493,6 +493,8 @@ github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT9
 github.com/otiai10/mint v1.3.1/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc=
 github.com/oxidecomputer/oxide.go v0.8.1-0.20260304174018-b0f8ba0c764c h1:DfIxEF0z8prXMmYYDuRa4gTUXPHZ+4EYb3pc4iKqg+A=
 github.com/oxidecomputer/oxide.go v0.8.1-0.20260304174018-b0f8ba0c764c/go.mod h1:pL9BcSmHMyhR8Utxr2AcV6wG59OIrcSV3dNduIzGGdo=
+github.com/oxidecomputer/oxide.go v0.8.1-0.20260319134325-8a08d5f59e23 h1:2CoVXnrabOEEJMYs7a4I6/Sagqj1hrrOwZWj0M1c6j8=
+github.com/oxidecomputer/oxide.go v0.8.1-0.20260319134325-8a08d5f59e23/go.mod h1:I36KqKtLBuKdi9HeXRwP2FHc7s98+HvYgFozvfyKnpE=
 github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
 github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=

receiver/oxideauditlogsreceiver/scraper.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"net/url"
 	"os"
 	"path/filepath"
 	"time"
@@ -36,6 +37,7 @@ type auditLogClient interface {
 	AuditLogList(ctx context.Context, params oxide.AuditLogListParams) (
 		*oxide.AuditLogEntryResultsPage, error,
 	)
+	Host() string
 }
 
 // scraperMetrics holds metrics about the log scraper.
@@ -122,6 +124,15 @@ func (s *auditLogScraper) Start(_ context.Context, _ component.Host) error {
 
 func (s *auditLogScraper) Scrape(ctx context.Context) (plog.Logs, error) {
 	logs := plog.NewLogs()
+	resource := logs.ResourceLogs().AppendEmpty()
+	attrs := resource.Resource().Attributes()
+	attrs.PutStr("service.name", "oxide")
+	host := s.client.Host()
+	if u, err := url.Parse(host); err == nil && u.Host != "" {
+		host = u.Host
+	}
+	attrs.PutStr("oxide.host", host)
+	scope := resource.ScopeLogs().AppendEmpty()
 	startTime := time.Now()
 
 	params := oxide.AuditLogListParams{
@@ -157,7 +168,7 @@ func (s *auditLogScraper) Scrape(ctx context.Context) (plog.Logs, error) {
 				continue
 			}
 
-			if err := addLogRecord(logs, entry, startTime); err != nil {
+			if err := addLogRecord(scope, entry, startTime); err != nil {
 				return logs, fmt.Errorf("adding log record: %w", err)
 			}
 
@@ -260,7 +271,7 @@ func (s *auditLogScraper) saveCursor() {
 	}
 }
 
-func addLogRecord(logs plog.Logs, entry oxide.AuditLogEntry, observedTime time.Time) error {
+func addLogRecord(scope plog.ScopeLogs, entry oxide.AuditLogEntry, observedTime time.Time) error {
 	raw, err := json.Marshal(entry)
 	if err != nil {
 		return fmt.Errorf("marshaling audit log entry %s: %w", entry.Id, err)
@@ -270,10 +281,6 @@ func addLogRecord(logs plog.Logs, entry oxide.AuditLogEntry, observedTime time.T
 		return fmt.Errorf("unmarshaling audit log entry %s: %w", entry.Id, err)
 	}
 
-	resource := logs.ResourceLogs().AppendEmpty()
-	resource.Resource().Attributes().PutStr("service.name", "oxide")
-
-	scope := resource.ScopeLogs().AppendEmpty()
 	log := scope.LogRecords().AppendEmpty()
 
 	if entry.TimeStarted != nil {

receiver/oxideauditlogsreceiver/scraper_test.go

@@ -67,21 +67,13 @@ func TestAddLogRecord(t *testing.T) {
 	}
 
 	logs := plog.NewLogs()
+	scope := logs.ResourceLogs().AppendEmpty().ScopeLogs().AppendEmpty()
 	observedTime := now.Add(time.Minute)
-	require.NoError(t, addLogRecord(logs, entry, observedTime))
-
-	require.Equal(t, 1, logs.ResourceLogs().Len())
-	resource := logs.ResourceLogs().At(0)
-
-	// Check resource attributes.
-	serviceName, ok := resource.Resource().Attributes().Get("service.name")
-	require.True(t, ok)
-	require.Equal(t, "oxide", serviceName.Str())
+	require.NoError(t, addLogRecord(scope, entry, observedTime))
 
 	// Check log record.
-	require.Equal(t, 1, resource.ScopeLogs().Len())
-	require.Equal(t, 1, resource.ScopeLogs().At(0).LogRecords().Len())
-	log := resource.ScopeLogs().At(0).LogRecords().At(0)
+	require.Equal(t, 1, scope.LogRecords().Len())
+	log := scope.LogRecords().At(0)
 
 	require.Equal(t,
 		pcommon.NewTimestampFromTime(startTime),
@@ -149,12 +141,13 @@ func TestCursor(t *testing.T) {
 	}
 
 	logs := plog.NewLogs()
+	scope := logs.ResourceLogs().AppendEmpty().ScopeLogs().AppendEmpty()
 	now := time.Now()
 	for _, entry := range entries {
 		if entry.Id == s.cursor.ID {
 			continue
 		}
-		require.NoError(t, addLogRecord(logs, entry, now))
+		require.NoError(t, addLogRecord(scope, entry, now))
 		if entry.TimeCompleted != nil {
 			s.cursor = cursor{
 				TimeCompleted: entry.TimeCompleted,
@@ -187,6 +180,7 @@ func makeEntry(id string, tc *time.Time) oxide.AuditLogEntry {
 
 // mockAuditLogClient returns pages in sequence, allowing injection of errors.
 type mockAuditLogClient struct {
+	host  string
 	pages []mockPage
 	calls int
 }
@@ -208,11 +202,52 @@ func (m *mockAuditLogClient) AuditLogList(
 	return page.result, page.err
 }
 
+func (m *mockAuditLogClient) Host() string {
+	return m.host
+}
+
+func TestScrape(t *testing.T) {
+	t1 := time.Date(2025, 1, 1, 0, 0, 0, 0, time.UTC)
+
+	client := &mockAuditLogClient{
+		host: "https://example.oxide.computer",
+		pages: []mockPage{
+			{
+				result: &oxide.AuditLogEntryResultsPage{
+					Items: []oxide.AuditLogEntry{makeEntry("id-1", &t1)},
+				},
+			},
+		},
+	}
+
+	s := newAuditLogScraper(
+		&Config{InitialLookback: time.Hour},
+		componenttest.NewNopTelemetrySettings(),
+		client,
+	)
+	require.NoError(t, s.Start(context.Background(), nil))
+
+	logs, err := s.Scrape(context.Background())
+	require.NoError(t, err)
+	require.Equal(t, 1, logs.ResourceLogs().Len())
+
+	attrs := logs.ResourceLogs().At(0).Resource().Attributes()
+
+	serviceName, ok := attrs.Get("service.name")
+	require.True(t, ok)
+	require.Equal(t, "oxide", serviceName.Str())
+
+	host, ok := attrs.Get("oxide.host")
+	require.True(t, ok)
+	require.Equal(t, "example.oxide.computer", host.Str())
+}
+
 func TestScrapePartialResults(t *testing.T) {
 	t1 := time.Date(2025, 1, 1, 0, 0, 0, 0, time.UTC)
 	t2 := time.Date(2025, 1, 1, 0, 0, 1, 0, time.UTC)
 
 	client := &mockAuditLogClient{
+		host: "https://example.oxide.computer",
 		pages: []mockPage{
 			{
 				result: &oxide.AuditLogEntryResultsPage{
@@ -255,6 +290,7 @@ func TestCursorPersistence(t *testing.T) {
 	cursorPath := filepath.Join(t.TempDir(), "cursor.json")
 
 	client := &mockAuditLogClient{
+		host: "https://example.oxide.computer",
 		pages: []mockPage{
 			{
 				result: &oxide.AuditLogEntryResultsPage{

receiver/oxidemetricsreceiver/scraper.go

@@ -3,6 +3,7 @@ package oxidemetricsreceiver
 import (
 	"context"
 	"fmt"
+	"net/url"
 	"regexp"
 	"slices"
 	"time"
@@ -224,6 +225,12 @@ func (s *oxideScraper) Scrape(ctx context.Context) (pmetric.Metrics, error) {
 			for _, series := range table.Timeseries {
 				rm := metrics.ResourceMetrics().AppendEmpty()
 				resource := rm.Resource()
+				resource.Attributes().PutStr("service.name", "oxide")
+				host := s.client.Host()
+				if u, err := url.Parse(host); err == nil && u.Host != "" {
+					host = u.Host
+				}
+				resource.Attributes().PutStr("oxide.host", host)
 
 				addLabels(series, resource)