Merge branch 'main' into codeboten/bump-otel-go

Author: codeboten

.chloggen/mdatagen-event-add-context.yaml

@@ -0,0 +1,25 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: breaking
+
+# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
+component: mdatagen
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Add context parameter for recording event to set traceID and spanID
+
+# One or more tracking issues or pull requests related to the change
+issues: [12571]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:
+
+# Optional: The change log or logs in which this entry should be included.
+# e.g. '[user]' or '[user, api]'
+# Include 'user' if the change is relevant to end users.
+# Include 'api' if there is a change to a library API.
+# Default: '[user]'
+change_logs: [api]

.chloggen/profiles-PutAttributes.yaml

@@ -0,0 +1,25 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: deprecation
+
+# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
+component: pdata/profile
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Replace AddAttribute with the PutAttribute helper method to modify the content of attributable records.
+
+# One or more tracking issues or pull requests related to the change
+issues: [12798]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:
+
+# Optional: The change log or logs in which this entry should be included.
+# e.g. '[user]' or '[user, api]'
+# Include 'user' if the change is relevant to end users.
+# Include 'api' if there is a change to a library API.
+# Default: '[user]'
+change_logs: [api]

cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_logs.go

@@ -12,6 +12,11 @@ import (
 	{{- if .SemConvVersion }}
 	conventions "go.opentelemetry.io/otel/semconv/v{{ .SemConvVersion }}"
 	{{- end }}
+	{{- if .Events }}
+	"context"
+	"go.opentelemetry.io/otel/trace"
+	"go.opentelemetry.io/collector/filter"
+	{{- end }}
 )
 
 
@@ -21,15 +26,21 @@ type event{{ $name.Render }} struct {
 	config   EventConfig         // event config provided by user.
 }
 
-func (e *event{{ $name.Render }}) recordEvent(timestamp pcommon.Timestamp
+func (e *event{{ $name.Render }}) recordEvent(ctx context.Context, timestamp pcommon.Timestamp
 {{- range $event.Attributes -}}, {{ .RenderUnexported }}AttributeValue {{ (attributeInfo .).Type.Primitive }}{{ end }}) {
 	if !e.config.Enabled {
 		return
 	}
 	lr := e.data.AppendEmpty()
 	lr.SetEventName("{{ $name }}")
 	lr.SetTimestamp(timestamp)
-	{{- range $event.Attributes }}
+
+	if span := trace.SpanContextFromContext(ctx); span.IsValid() {
+		lr.SetTraceID(pcommon.TraceID(span.TraceID()))
+		lr.SetSpanID(pcommon.SpanID(span.SpanID()))
+	}
+
+	{{ range $event.Attributes }}
 	{{- if eq (attributeInfo .).Type.Primitive "[]byte" }}
 	lr.Attributes().PutEmptyBytes("{{ (attributeInfo .).Name }}").FromRaw({{ .RenderUnexported }}AttributeValue)
 	{{- else if eq (attributeInfo .).Type.Primitive "[]any" }}
@@ -236,11 +247,11 @@ func (lb *LogsBuilder) Emit(options ...ResourceLogsOption) plog.Logs {
 
 {{ range $name, $event := .Events -}}
 // Record{{ $name.Render }}Event adds a log record of {{ $name }} event.
-func (lb *LogsBuilder) Record{{ $name.Render }}Event(timestamp pcommon.Timestamp
+func (lb *LogsBuilder) Record{{ $name.Render }}Event(ctx context.Context, timestamp pcommon.Timestamp
 	{{- range $event.Attributes -}}
 	, {{ .RenderUnexported }}AttributeValue {{ if (attributeInfo .).Enum }}Attribute{{ .Render }}{{ else }}{{ (attributeInfo .).Type.Primitive }}{{ end }}
 	{{- end }}) {
-	lb.event{{ $name.Render }}.recordEvent(timestamp
+	lb.event{{ $name.Render }}.recordEvent(ctx, timestamp
 		{{- range $event.Attributes -}}
 		, {{ .RenderUnexported }}AttributeValue{{ if (attributeInfo .).Enum }}.String(){{ end }}
 		{{- end }})

cmd/mdatagen/internal/samplereceiver/internal/metadata/generated_logs_test.go

@@ -5,16 +5,18 @@ package {{ .Package }}
 import (
 	"time"
 	"testing"
-
 	"github.com/stretchr/testify/assert"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zaptest/observer"
-
-    "go.opentelemetry.io/collector/pdata/pcommon"
-    "go.opentelemetry.io/collector/pdata/plog"
-    {{- if or isReceiver isScraper }}
-    "go.opentelemetry.io/collector/{{ .Status.Class }}/{{ .Status.Class }}test"
-    {{- end }}
+	"go.opentelemetry.io/collector/pdata/pcommon"
+	"go.opentelemetry.io/collector/pdata/plog"
+	{{- if or isReceiver isScraper }}
+	"go.opentelemetry.io/collector/{{ .Status.Class }}/{{ .Status.Class }}test"
+	{{- end }}
+	{{- if .Events }}
+	"context"
+	"go.opentelemetry.io/otel/trace"
+	{{- end }}
 )
 
 {{- if .Events }}
@@ -128,6 +130,13 @@ func TestLogsBuilder(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			timestamp := pcommon.Timestamp(1_000_001_000)
+			traceID := [16]byte{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}
+			spanID := [8]byte{0, 1, 2, 3, 4, 5, 6, 7}
+			ctx := trace.ContextWithSpanContext(context.Background(), trace.NewSpanContext(trace.SpanContextConfig{
+				TraceID:    trace.TraceID(traceID),
+				SpanID:     trace.SpanID(spanID),
+				TraceFlags: trace.FlagsSampled,
+            }))
 			observedZapCore, observedLogs := observer.New(zap.WarnLevel)
         	{{- if or isReceiver isScraper }}
             settings := {{ .Status.Class }}test.NewNopSettings({{ .Status.Class }}test.NopType)
@@ -185,7 +194,7 @@ func TestLogsBuilder(t *testing.T) {
 			{{- range $name, $event := .Events }}
 				{{ if $event.Enabled }}defaultEventsCount++{{ end }}
 				allEventsCount++
-				lb.Record{{ $name.Render }}Event(timestamp
+				lb.Record{{ $name.Render }}Event(ctx, timestamp
 				{{- range $event.Attributes -}}
 					, {{ if (attributeInfo .).Enum }}Attribute{{ .Render }}{{ (index (attributeInfo .).Enum 0) | publicVar }}{{ else }}{{ (attributeInfo .).TestValue }}{{ end }}
 				{{- end }})
@@ -231,6 +240,8 @@ func TestLogsBuilder(t *testing.T) {
 					validatedEvents["{{ $name }}"] = true
 					lr := lrs.At(i)
 					assert.Equal(t, timestamp, lr.Timestamp())
+					assert.Equal(t, pcommon.TraceID(traceID), lr.TraceID())
+					assert.Equal(t, pcommon.SpanID(spanID), lr.SpanID())
 
 					{{- range $i, $attr := $event.Attributes }}
 					attrVal, ok {{ if eq $i 0 }}:{{ end }}= lr.Attributes().Get("{{ (attributeInfo $attr).Name }}")

cmd/mdatagen/internal/templates/logs.go.tmpl

@@ -117,6 +117,28 @@ metrics:
     # Optional: array of attributes that were defined in the attributes section that are emitted by this metric.
     attributes: [string]
 
+# Optional: map of event names with the key being the event name and value
+# being described below.
+events:
+  <event.name>:
+    # Required: whether the event is collected by default.
+    enabled: bool
+    # Required: event description.
+    description:
+    # Optional: extended documentation of the event.
+    extended_documentation:
+    # Optional: warnings that will be shown to user under specified conditions.
+    warnings:
+      # A warning that will be displayed if the event is enabled in user config.
+      # Should be used for deprecated default events that will be removed soon.
+      if_enabled:
+      # A warning that will be displayed if `enabled` field is not set explicitly in user config.
+      if_enabled_not_set:
+      # A warning that will be displayed if the event is configured by user in any way.
+      if_configured:
+    # Optional: array of attributes that were defined in the attributes section that are emitted by this event.
+    attributes: [string]
+
 # Lifecycle tests generated for this component.
 tests:
   config: # {} by default, specific testing configuration for lifecycle tests.

cmd/mdatagen/internal/templates/logs_test.go.tmpl

@@ -39,7 +39,7 @@ require (
 	github.com/cenkalti/backoff/v5 v5.0.2 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/ebitengine/purego v0.8.4-0.20250520125605-a52bc8357ac9 // indirect
+	github.com/ebitengine/purego v0.8.4 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/foxboron/go-tpm-keyfiles v0.0.0-20250323135004-b31fac66206e // indirect
 	github.com/fsnotify/fsnotify v1.9.0 // indirect

cmd/mdatagen/metadata-schema.yaml

@@ -16,7 +16,7 @@ require (
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/ebitengine/purego v0.8.4-0.20250520125605-a52bc8357ac9 // indirect
+	github.com/ebitengine/purego v0.8.4 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect