diff --git a/receiver/scwaudittrail/audit_trail_to_logs.go b/receiver/scwaudittrail/audit_trail_to_logs.go index 53bc948..f248f1e 100644 --- a/receiver/scwaudittrail/audit_trail_to_logs.go +++ b/receiver/scwaudittrail/audit_trail_to_logs.go @@ -17,15 +17,8 @@ func auditTrailEventToLogs(logger *zap.Logger, event *audit_trail.Event) plog.Lo sl := rl.ScopeLogs().AppendEmpty() lr := sl.LogRecords().AppendEmpty() - if event.Resource != nil { - resourceAttrs := rl.Resource().Attributes() - resourceAttrs.PutStr("audit_trail.resource.id", event.Resource.ID) - resourceAttrs.PutStr("audit_trail.resource.type", event.Resource.Type.String()) - - if event.Resource.Name != nil { - resourceAttrs.PutStr("audit_trail.resource.name", *event.Resource.Name) - } - } + resourceAttrs := rl.Resource().Attributes() + resourceAttrs.PutStr(semconv.AttributeServiceName, event.ServiceName) lr.SetTimestamp(pcommon.NewTimestampFromTime(*event.RecordedAt)) lr.SetEventName(event.MethodName) @@ -52,7 +45,6 @@ func auditTrailEventToLogs(logger *zap.Logger, event *audit_trail.Event) plog.Lo attrs.PutStr("audit_trail.event.source_ip", event.SourceIP.String()) attrs.PutInt("audit_trail.event.status_code", int64(event.StatusCode)) attrs.PutStr("audit_trail.event.request_id", event.RequestID) - attrs.PutStr(semconv.AttributeServiceName, event.ServiceName) if event.UserAgent != nil { attrs.PutStr("audit_trail.event.user_agent", *event.UserAgent) diff --git a/receiver/scwaudittrail/audit_trail_to_logs_test.go b/receiver/scwaudittrail/audit_trail_to_logs_test.go index c786030..bfede2b 100644 --- a/receiver/scwaudittrail/audit_trail_to_logs_test.go +++ b/receiver/scwaudittrail/audit_trail_to_logs_test.go @@ -21,8 +21,8 @@ func Test_auditTrailEventToLogs(t *testing.T) { attrs := lr.LogRecords().At(0).Attributes() assert.Equal(t, 1, ld.ResourceLogs().Len()) - assert.Equal(t, 3, resourceAttrs.Len()) - assert.Equal(t, 7, attrs.Len()) + assert.Equal(t, 1, resourceAttrs.Len()) + assert.Equal(t, 6, attrs.Len()) auditTrailEvent.Resource = nil auditTrailEvent.MethodName = "DeleteSecret" @@ -38,8 +38,8 @@ func Test_auditTrailEventToLogs(t *testing.T) { attrs = lr.LogRecords().At(0).Attributes() assert.Equal(t, 1, ld.ResourceLogs().Len()) - assert.Equal(t, 0, resourceAttrs.Len()) - assert.Equal(t, 7, attrs.Len()) + assert.Equal(t, 1, resourceAttrs.Len()) + assert.Equal(t, 6, attrs.Len()) } func getEvent() *audit_trail.Event { diff --git a/receiver/scwaudittrail/go.mod b/receiver/scwaudittrail/go.mod index 960cf49..49d87d9 100644 --- a/receiver/scwaudittrail/go.mod +++ b/receiver/scwaudittrail/go.mod @@ -3,7 +3,7 @@ module github.com/scaleway/opentelemetry-collector-scaleway/receiver/scwaudittra go 1.23.4 require ( - github.com/scaleway/scaleway-sdk-go v1.0.0-beta.31 + github.com/scaleway/scaleway-sdk-go v1.0.0-beta.32 github.com/stretchr/testify v1.10.0 go.opentelemetry.io/collector/component v0.118.0 go.opentelemetry.io/collector/component/componenttest v0.118.0 @@ -47,9 +47,9 @@ require ( go.opentelemetry.io/otel/sdk/metric v1.32.0 // indirect go.opentelemetry.io/otel/trace v1.32.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/net v0.34.0 // indirect - golang.org/x/sys v0.29.0 // indirect - golang.org/x/text v0.21.0 // indirect + golang.org/x/net v0.37.0 // indirect + golang.org/x/sys v0.31.0 // indirect + golang.org/x/text v0.23.0 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect google.golang.org/grpc v1.69.4 // indirect google.golang.org/protobuf v1.36.2 // indirect diff --git a/receiver/scwaudittrail/go.sum b/receiver/scwaudittrail/go.sum index 78cd12e..9fb4f35 100644 --- a/receiver/scwaudittrail/go.sum +++ b/receiver/scwaudittrail/go.sum @@ -44,8 +44,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= -github.com/scaleway/scaleway-sdk-go v1.0.0-beta.31 h1:Fj7jPyu9TQjqfXcLylINK5PANSzOWXIX4QtGmfp67AY= -github.com/scaleway/scaleway-sdk-go v1.0.0-beta.31/go.mod h1:kzh+BSAvpoyHHdHBCDhmSWtBc1NbLMZ2lWHqnBoxFks= +github.com/scaleway/scaleway-sdk-go v1.0.0-beta.32 h1:4+LP7qmsLSGbmc66m1s5dKRMBwztRppfxFKlYqYte/c= +github.com/scaleway/scaleway-sdk-go v1.0.0-beta.32/go.mod h1:kzh+BSAvpoyHHdHBCDhmSWtBc1NbLMZ2lWHqnBoxFks= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= @@ -111,20 +111,20 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0= -golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k= +golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c= +golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU= -golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik= +golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= -golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= +golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY= +golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=