[DRAFT] [DO NOT MERGE] Entities support prototype

Makefile

@@ -168,7 +168,7 @@ ocb:
 # Definitions for ProtoBuf generation.
 
 # The source directory for OTLP ProtoBufs.
-OPENTELEMETRY_PROTO_SRC_DIR=pdata/internal/opentelemetry-proto
+OPENTELEMETRY_PROTO_SRC_DIR?=pdata/internal/opentelemetry-proto
 
 # The branch matching the current version of the proto to use
 OPENTELEMETRY_PROTO_VERSION=v1.4.0
@@ -200,7 +200,7 @@ genproto: genproto-cleanup
 	# Call a sub-make to ensure OPENTELEMETRY_PROTO_FILES is populated
 	$(MAKE) genproto_sub
 	$(MAKE) fmt
-	$(MAKE) genproto-cleanup
+	# $(MAKE) genproto-cleanup
 
 genproto_sub:
 	@echo Generating code for the following files:
@@ -234,8 +234,8 @@ genproto_sub:
 	cp -R $(PROTO_INTERMEDIATE_DIR)/$(PROTO_PACKAGE)/* $(PROTO_TARGET_GEN_DIR)/
 	rm -rf $(PROTO_INTERMEDIATE_DIR)/go.opentelemetry.io
 
-	@rm -rf $(OPENTELEMETRY_PROTO_SRC_DIR)/*
-	@rm -rf $(OPENTELEMETRY_PROTO_SRC_DIR)/.* > /dev/null 2>&1 || true
+	#@rm -rf $(OPENTELEMETRY_PROTO_SRC_DIR)/*
+	#@rm -rf $(OPENTELEMETRY_PROTO_SRC_DIR)/.* > /dev/null 2>&1 || true
 
 # Generate structs, functions and tests for pdata package. Must be used after any changes
 # to proto and after running `make genproto`

cmd/builder/internal/builder/main_test.go

@@ -92,6 +92,7 @@ var replaceModules = []string{
 	"/processor/processortest",
 	"/processor/batchprocessor",
 	"/processor/memorylimiterprocessor",
+	"/processor/processorhelper/xprocessorhelper",
 	"/processor/xprocessor",
 	"/receiver",
 	"/receiver/nopreceiver",

cmd/builder/test/core.builder.yaml

@@ -67,6 +67,7 @@ replaces:
   - go.opentelemetry.io/collector/processor => ${WORKSPACE_DIR}/processor
   - go.opentelemetry.io/collector/processor/processortest => ${WORKSPACE_DIR}/processor/processortest
   - go.opentelemetry.io/collector/processor/xprocessor => ${WORKSPACE_DIR}/processor/xprocessor
+  - go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper => ${WORKSPACE_DIR}/processor/processorhelper/xprocessorhelper
   - go.opentelemetry.io/collector/receiver => ${WORKSPACE_DIR}/receiver
   - go.opentelemetry.io/collector/receiver/otlpreceiver => ${WORKSPACE_DIR}/receiver/otlpreceiver
   - go.opentelemetry.io/collector/receiver/xreceiver => ${WORKSPACE_DIR}/receiver/xreceiver

cmd/mdatagen/go.mod

@@ -116,3 +116,5 @@ replace go.opentelemetry.io/collector/processor => ../../processor
 replace go.opentelemetry.io/collector/consumer/consumererror => ../../consumer/consumererror
 
 replace go.opentelemetry.io/collector/scraper => ../../scraper
+
+replace go.opentelemetry.io/collector/pipeline/xpipeline => ../../pipeline/xpipeline

cmd/mdatagen/internal/metadata.go

@@ -29,6 +29,8 @@
 	SemConvVersion string `mapstructure:"sem_conv_version"`
 	// ResourceAttributes that can be emitted by the component.
 	ResourceAttributes map[AttributeName]Attribute `mapstructure:"resource_attributes"`
+	// Entities associated with the emitted resource attributes.
+	Entities []Entity `mapstructure:"entities"`
 	// Attributes emitted by one or more metrics.
 	Attributes map[AttributeName]Attribute `mapstructure:"attributes"`
 	// Metrics that can be emitted by the component.
@@ -65,6 +67,9 @@
 	if err := md.validateMetrics(); err != nil {
 		errs = errors.Join(errs, err)
 	}
+	if err := md.validateEntities(); err != nil {
+		errs = errors.Join(errs, err)
+	}
 	return errs
 }
 
@@ -114,6 +119,18 @@
 	return errs
 }
 
+func (md *Metadata) validateEntities() error {
+	var errs error
+	for _, entity := range md.Entities {
+		for _, attr := range append(entity.IDAttributes, entity.DescriptiveAttributes...) {
+			if _, ok := md.ResourceAttributes[attr]; !ok {
+				errs = errors.Join(errs, fmt.Errorf("undefined resource attribute: %v", attr))
+			}
+		}
+	}
+	return errs
+}
+
 func (md *Metadata) validateAttributes(usedAttrs map[AttributeName]bool) error {
 	var errs error
 	unusedAttrs := make([]AttributeName, 0, len(md.Attributes))
@@ -157,6 +174,15 @@
 	return errs
 }
 
+type Entity struct {
+	// Type of the entity.
+	Type string `mapstructure:"type"`
+	// Identifying attributes of the entity.
+	IDAttributes []AttributeName `mapstructure:"id_attributes"`
+	// Descriptive attributes of the entity.
+	DescriptiveAttributes []AttributeName `mapstructure:"descriptive_attributes"`
+}
+
 type AttributeName string
 
 func (mn AttributeName) Render() (string, error) {

cmd/mdatagen/internal/status.go

@@ -109,6 +109,7 @@ func (ms StabilityMap) Validate() error {
 				c != "traces" &&
 				c != "logs" &&
 				c != "profiles" &&
+				c != "entities" &&
 				c != "traces_to_traces" &&
 				c != "traces_to_metrics" &&
 				c != "traces_to_logs" &&

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

@@ -46,6 +46,22 @@ func (rb *ResourceBuilder) Set{{ $name.Render }}(val {{ $attr.Type.Primitive }})
 // Emit returns the built resource and resets the internal builder state.
 func (rb *ResourceBuilder) Emit() pcommon.Resource {
 	r := rb.res
+	{{- range $entity := .Entities }}
+	{{- range $attr := .IDAttributes }}
+	_, found{{ $attr.Render }} := r.Attributes().Get("{{ $attr }}")
+	{{- end }}
+	if {{ range $i, $attr := .IDAttributes }}{{ if $i }}&& {{ end }}found{{ $attr.Render }} {{ else }}true {{ end }}{
+		ref := pcommon.NewResourceEntityRef()
+		ref.SetType("{{ $entity.Type }}")
+		ref.IdAttrKeys().Append({{ range $i, $attr := .IDAttributes }}{{ if $i }}, {{ end }}"{{ $attr }}"{{ end }})
+		{{- range $attr := .DescriptiveAttributes }}
+		if _, ok := r.Attributes().Get("{{ $attr }}"); ok {
+			ref.DescrAttrKeys().Append("{{ $attr }}")
+		}
+		{{- end }}
+		ref.CopyTo(r.Entities().AppendEmpty())
+	}
+	{{- end }}
 	rb.res = pcommon.NewResource()
 	return r
 }

cmd/mdatagen/metadata-schema.yaml

@@ -59,6 +59,13 @@ resource_attributes:
       # Should be used for deprecated optional resource_attributes that will be removed soon.
       if_configured:
 
+# Optional: list of entities associated with the produced resource.
+entities:
+  - type: string
+    # Array of attribute names that are used to identify the entity.
+    id_attributes: [string]
+    # Optional: array of attribute names that are used to describe the entity.
+    descriptive_attributes: [string]
 
 # Optional: map of attribute definitions with the key being the attribute name and value
 # being described below.

cmd/otelcorecol/builder-config.yaml

@@ -97,6 +97,7 @@ replaces:
   - go.opentelemetry.io/collector/processor/batchprocessor => ../../processor/batchprocessor
   - go.opentelemetry.io/collector/processor/memorylimiterprocessor => ../../processor/memorylimiterprocessor
   - go.opentelemetry.io/collector/processor/xprocessor => ../../processor/xprocessor
+  - go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper => ../../processor/processorhelper/xprocessorhelper
   - go.opentelemetry.io/collector/receiver => ../../receiver
   - go.opentelemetry.io/collector/receiver/nopreceiver => ../../receiver/nopreceiver
   - go.opentelemetry.io/collector/receiver/otlpreceiver => ../../receiver/otlpreceiver

cmd/otelcorecol/go.mod

@@ -115,6 +115,7 @@ require (
 	go.opentelemetry.io/collector/pdata/testdata v0.116.0 // indirect
 	go.opentelemetry.io/collector/pipeline v0.116.0 // indirect
 	go.opentelemetry.io/collector/pipeline/xpipeline v0.116.0 // indirect
+	go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper v0.116.0 // indirect
 	go.opentelemetry.io/collector/processor/processortest v0.116.0 // indirect
 	go.opentelemetry.io/collector/processor/xprocessor v0.116.0 // indirect
 	go.opentelemetry.io/collector/receiver/receivertest v0.116.0 // indirect
@@ -278,6 +279,8 @@ replace go.opentelemetry.io/collector/processor/memorylimiterprocessor => ../../
 
 replace go.opentelemetry.io/collector/processor/xprocessor => ../../processor/xprocessor
 
+replace go.opentelemetry.io/collector/processor/processorhelper/xprocessorhelper => ../../processor/processorhelper/xprocessorhelper
+
 replace go.opentelemetry.io/collector/receiver => ../../receiver
 
 replace go.opentelemetry.io/collector/receiver/nopreceiver => ../../receiver/nopreceiver