Merge branch 'main' into custom_receiverhelper

Author: gizas

.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]

.github/workflows/utils/cspell.json

@@ -38,7 +38,6 @@
       "Helmuth",
       "Hostfeature",
       "Islamov",
-      "Jaegar",
       "Jaglowski",
       "Janotti",
       "Juraci",
@@ -63,7 +62,6 @@
       "Punya",
       "RCPC",
       "Rahul",
-      "Reques",
       "SASL",
       "SPECPATH",
       "SPECTAG",
@@ -110,9 +108,7 @@
       "cmux",
       "codeboten",
       "codeowners",
-      "cofig",
       "componenterror",
-      "componentest",
       "componenthelper",
       "componentprofiles",
       "componentstatus",
@@ -143,7 +139,6 @@
       "connectorprofiles",
       "connectortest",
       "consumerdata",
-      "consumereerrorprofiles",
       "consumererror",
       "consumererrorprofiles",
       "consumerfanout",
@@ -169,7 +164,6 @@
       "dmathieu",
       "dmitryax",
       "dokey",
-      "enadled",
       "envmapprovider",
       "envprovider",
       "exampleexporter",
@@ -208,7 +202,6 @@
       "filterset",
       "fluentbit",
       "fluentforward",
-      "fluentfoward",
       "forwardconnector",
       "fsnotify",
       "funcs",
@@ -242,8 +235,6 @@
       "httpprovider",
       "httpsprovider",
       "httptest",
-      "htttp",
-      "identfier",
       "illumos",
       "incorrectclass",
       "incorrectcomponent",
@@ -254,7 +245,6 @@
       "invalidaggregation",
       "invalidtype",
       "iruntime",
-      "jaegar",
       "jaegerexporter",
       "jaegerreceiver",
       "jmacd",
@@ -265,7 +255,6 @@
       "kafkareceiver",
       "keepalive",
       "koanf",
-      "lables",
       "ldflags",
       "limitermiddleware",
       "localhostgate",
@@ -286,7 +275,6 @@
       "metricsgenerationprocessor",
       "metricstransformprocessor",
       "middleware",
-      "mininum",
       "mostynb",
       "muehle",
       "multiclient",
@@ -305,8 +293,6 @@
       "nopreceiver",
       "nosuchprocessor",
       "notls",
-      "obsereporttest",
-      "obserporttest",
       "obsreceiver",
       "obsreport",
       "obsreporttest",
@@ -376,7 +362,6 @@
       "receiverhelper",
       "receiverprofiles",
       "receivertest",
-      "repeate",
       "resourcedetection",
       "resourcedetectionprocessor",
       "resourceprocessor",

CHANGELOG-API.md

@@ -288,7 +288,7 @@ If you are looking for user-facing changes, check out [CHANGELOG.md](./CHANGELOG
 
 ### 💡 Enhancements 💡
 
-- `componenttest`: Add helper to get a metric for componentest.Telemetry (#12215)
+- `componenttest`: Add helper to get a metric for componenttest.Telemetry (#12215)
 - `componenttest`: Extract componenttest.Telemetry as generic struct for telemetry testing (#12151)
 - `mdatagen`: Generate assert function for each metric in mdatagen (#12179)
 - `metadatatest`: Generate NewSettings that accepts componenttest.Telemetry (#12216)
@@ -461,14 +461,14 @@ If you are looking for user-facing changes, check out [CHANGELOG.md](./CHANGELOG
   Factory.CreateExtension -> Factory.Create |
   Factory.ExtensionStability -> Factory.Stability
 
-- `exporter`: Deprecate funcs that repeate exporter in name (#11370)
+- `exporter`: Deprecate funcs that repeat exporter in name (#11370)
   Factory.Create[Traces|Metrics|Logs|Profiles]Exporter -> Factory.Create[Traces|Metrics|Logs|Profiles] |
   Factory.[Traces|Metrics|Logs|Profiles]ExporterStability -> Factory.[Traces|Metrics|Logs|Profiles]Stability
 
 
 ### 🚀 New components 🚀
 
-- `consumererrorprofiles`: Add new module consumereerrorprofiles for consumer error profiles. (#11131)
+- `consumererrorprofiles`: Add new module consumererrorprofiles for consumer error profiles. (#11131)
 
 ### 💡 Enhancements 💡
 
@@ -995,7 +995,7 @@ Use the `ProviderFactories` and `ConverterFactories` fields instead.
   - obsreporttest.TestTelemetry -> componenttest.TestTelemetry
   - obsreporttest.SetupTelemetry -> componenttest.SetupTelemetry
   - obsreporttest.CheckScraperMetrics -> TestTelemetry.CheckScraperMetrics
-  - obserporttest.TestTelemetry.TelemetrySettings -> componenttest.TestTelemetry.TelemetrySettings()
+  - obsreporttest.TestTelemetry.TelemetrySettings -> componenttest.TestTelemetry.TelemetrySettings()
 
 - `confignet`: Deprecates `DialContext` and `ListenContext` functions. Use `Dial` and `Listen` instead. (#9258)
   Unlike the previous `Dial` and `Listen` functions, the new `Dial` and `Listen` functions take a `context.Context` like `DialContext` and `ListenContext`.

CHANGELOG.md

@@ -1056,7 +1056,7 @@ This release includes 2 very important breaking changes.
 - `configcompression`: Mark module as Stable. (#9571)
 - `cmd/mdatagen`: Use go package name for the scope name by default and add an option to provide the scope name in metadata.yaml. (#9693)
 - `cmd/mdatagen`: Generate the lifecycle tests for components by default. (#9683)
-  It's encouraged to have lifecycle tests for all components enadled, but they can be disabled if needed 
+  It's encouraged to have lifecycle tests for all components enabled, but they can be disabled if needed 
   in metadata.yaml with `skip_lifecycle: true` and `skip_shutdown: true` under `tests` section.
 
 - `cmd/mdatagen`: optimize the mdatagen for the case like batchprocessor which use a common struct to implement consumer.Traces, consumer.Metrics, consumer.Logs in the meantime. (#9688)
@@ -1714,8 +1714,8 @@ This release includes 2 very important breaking changes.
 - `componenttest`: Remove deprecated funcs from componenttest (#6836)
 - `batchprocessor`: Remove deprecated batchprocessor.MetricViews and batchprocessor.OtelMetricViews (#6861)
 - `component`: Remove deprecated component.[Factories|MakeProcessorFactoryMap] and componenttest.NewNopFactories (#6835)
-- `config`: Remove deprecated cofig.*Settings (#6837)
-- `obsereporttest`: Remove deprecated obsereporttest.SetupTelemetryWithID (#6861)
+- `config`: Remove deprecated config.*Settings (#6837)
+- `obsreporttest`: Remove deprecated obsreporttest.SetupTelemetryWithID (#6861)
 - `component`: Remove deprecated component [Traces|Metrics|Logs]Processor and ProcessorFactory (#6884)
 - `service`: Remove deprecated service service.ConfigService and service.ConfigServicePipeline (#6859)
 
@@ -2651,7 +2651,7 @@ There isn't a valid core binary for this release. Use v0.57.2 instead.
 - Update OTLP to v0.17.0 (#5335)
 - Add optional min/max fields to histograms (#5399)
 - User-defined Resource attributes can be specified under `service.telemetry.resource`
-  configuration key and will be included as metric lables for own telemetry.
+  configuration key and will be included as metric labels for own telemetry.
   If `service.instance.id` is not specified it will be auto-generated. Previously
   `service.instance.id` was always auto-generated, so the default of the new
   behavior matches the old behavior. (#5402)
@@ -2799,9 +2799,9 @@ There isn't a valid core binary for this release. Use v0.57.2 instead.
 - Deprecate global flag in `featuregates` (#5060)
 - Deprecate last funcs/structs in componenthelper (#5069)
 - Change structs in otlpgrpc to follow standard go encoding interfaces (#5062)
-  - Deprecate `UnmarshalJSON[Traces|Metrics|Logs][Reques|Response]` in favor of `UnmarshalJSON`.
-  - Deprecate `[Traces|Metrics|Logs][Reques|Response].Marshal` in favor of `MarshalProto`.
-  - Deprecate `UnmarshalJSON[Traces|Metrics|Logs][Reques|Response]` in favor of `UnmarshalProto`.
+  - Deprecate `UnmarshalJSON[Traces|Metrics|Logs][Request|Response]` in favor of `UnmarshalJSON`.
+  - Deprecate `[Traces|Metrics|Logs][Request|Response].Marshal` in favor of `MarshalProto`.
+  - Deprecate `UnmarshalJSON[Traces|Metrics|Logs][Request|Response]` in favor of `UnmarshalProto`.
 - Deprecating following pdata methods/types following OTLP v0.15.0 upgrade (#5076):
       - InstrumentationLibrary is now InstrumentationScope
       - NewInstrumentationLibrary is now NewInstrumentationScope
@@ -3047,7 +3047,7 @@ There isn't a valid core binary for this release. Use v0.57.2 instead.
 
 - Remove reference to `defaultcomponents` in core and deprecate `include_core` flag (#4087)
 - Remove `config.NewConfigMapFrom[File|Buffer]`, add testonly version (#4502)
-- `configtls`: TLS 1.2 is the new default mininum version (#4503)
+- `configtls`: TLS 1.2 is the new default minimum version (#4503)
 - `confighttp`: `ToServer` now accepts a `component.Host`, in line with gRPC's counterpart (#4514)
 - CORS configuration for OTLP/HTTP receivers has been moved into a `cors:` block, instead of individual `cors_allowed_origins` and `cors_allowed_headers` settings (#4492)
 
@@ -3841,7 +3841,7 @@ This release is marked as "bad" since the metrics pipelines will produce bad dat
 - Add `CustomRoundTripper` function to httpclientconfig (#2085)
 - Allow for more logging options to be passed to `service` (#2132)
 - Add config parameters for `jaeger` receiver (#2068)
-- Map unset status code for `jaegar` translator as per spec (#2134)
+- Map unset status code for `jaeger` translator as per spec (#2134)
 - Add more trace annotations to the queue-retry logic (#2136)
 - Add config settings for component telemetry (#2148)
 - Use net.SplitHostPort for IPv6 support in `prometheus` receiver (#2154)
@@ -4091,7 +4091,7 @@ This release is marked as "bad" since the metrics pipelines will produce bad dat
 ### 🚀 New components 🚀
 
 - Receivers
-  - `fluentfoward` runs a TCP server that accepts events via the [Fluent Forward protocol](https://github.com/fluent/fluentd/wiki/Forward-Protocol-Specification-v1) (#1173)
+  - `fluentforward` runs a TCP server that accepts events via the [Fluent Forward protocol](https://github.com/fluent/fluentd/wiki/Forward-Protocol-Specification-v1) (#1173)
 - Exporters
   - `kafka` exports traces to Kafka (#1439)
 - Extensions
@@ -4162,7 +4162,7 @@ This release is marked as "bad" since the metrics pipelines will produce bad dat
   of different versions
 - Make "--new-metrics" command line flag the default (#1148)
 - Change `endpoint` to `url` in Zipkin exporter config (#1186)
-- Change `tls_credentials` to `tls_settings` in Jaegar receiver config (#1233)
+- Change `tls_credentials` to `tls_settings` in Jaeger receiver config (#1233)
 - OTLP receiver config change for `protocols` to support mTLS (#1223)
 - Remove `export_resource_labels` flag from Zipkin exporter (#1163)
 

cmd/mdatagen/metadata-schema.yaml

@@ -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.

exporter/exporterhelper/README.md

@@ -26,7 +26,7 @@ The following configuration options can be modified:
   - `batch` disabled by default if not defined
     - `flush_timeout`: time after which a batch will be sent regardless of its size. Must be a non-zero value
     - `min_size`: the minimum size of a batch.
-    - `max_size`: the maximum size of a batch, enables batch splitting. The maximum size of a batch should be greater than or equal to the mininum size of a batch.
+    - `max_size`: the maximum size of a batch, enables batch splitting. The maximum size of a batch should be greater than or equal to the minimum size of a batch.
 - `timeout` (default = 5s): Time to wait per individual attempt to send data to a backend
 
 The `initial_interval`, `max_interval`, `max_elapsed_time`, and `timeout` options accept 

pdata/pprofile/attributes.go

@@ -17,7 +17,7 @@ type attributable interface {
 
 // FromAttributeIndices builds a [pcommon.Map] containing the attributes of a
 // record.
-// The record can by any struct that implements an `AttributeIndices` method.
+// The record can be any struct that implements an `AttributeIndices` method.
 // Updates made to the return map will not be applied back to the record.
 func FromAttributeIndices(table AttributeTableSlice, record attributable) pcommon.Map {
 	m := pcommon.NewMap()
@@ -31,9 +31,7 @@ func FromAttributeIndices(table AttributeTableSlice, record attributable) pcommo
 	return m
 }
 
-// AddAttribute updates an AttributeTable and a record's AttributeIndices to
-// add a new attribute.
-// The record can by any struct that implements an `AttributeIndices` method.
+// Deprecated: [v0.126.0] Use PutAttribute instead.
 func AddAttribute(table AttributeTableSlice, record attributable, key string, value pcommon.Value) error {
 	for i := range table.Len() {
 		a := table.At(i)
@@ -66,3 +64,80 @@ func AddAttribute(table AttributeTableSlice, record attributable, key string, va
 
 	return nil
 }
+
+var errTooManyTableEntries = errors.New("too many entries in AttributeTable")
+
+// PutAttribute updates an AttributeTable and a record's AttributeIndices to
+// add or update an attribute.
+// The assumption is that attributes are a map as for other signals (metrics, logs, etc.), thus
+// the same key must not appear twice in a list of attributes / attribute indices.
+// The record can be any struct that implements an `AttributeIndices` method.
+func PutAttribute(table AttributeTableSlice, record attributable, key string, value pcommon.Value) error {
+	for i := range record.AttributeIndices().Len() {
+		idx := int(record.AttributeIndices().At(i))
+		if idx < 0 || idx >= table.Len() {
+			return fmt.Errorf("index value %d out of range in AttributeIndices[%d]", idx, i)
+		}
+		attr := table.At(idx)
+		if attr.Key() == key {
+			if attr.Value().Equal(value) {
+				// Attribute already exists, nothing to do.
+				return nil
+			}
+
+			// If the attribute table already contains the key/value pair, just update the index.
+			for j := range table.Len() {
+				a := table.At(j)
+				if a.Key() == key && a.Value().Equal(value) {
+					if j > math.MaxInt32 {
+						return errTooManyTableEntries
+					}
+					record.AttributeIndices().SetAt(i, int32(j)) //nolint:gosec // overflow checked
+					return nil
+				}
+			}
+
+			if table.Len() >= math.MaxInt32 {
+				return errTooManyTableEntries
+			}
+
+			// Add the key/value pair as a new attribute to the table...
+			entry := table.AppendEmpty()
+			entry.SetKey(key)
+			value.CopyTo(entry.Value())
+
+			// ...and update the existing index.
+			record.AttributeIndices().SetAt(i, int32(table.Len()-1)) //nolint:gosec // overflow checked
+			return nil
+		}
+	}
+
+	if record.AttributeIndices().Len() >= math.MaxInt32 {
+		return errors.New("too many entries in AttributeIndices")
+	}
+
+	for j := range table.Len() {
+		a := table.At(j)
+		if a.Key() == key && a.Value().Equal(value) {
+			if j > math.MaxInt32 {
+				return errTooManyTableEntries
+			}
+			// Add the index of the existing attribute to the indices.
+			record.AttributeIndices().Append(int32(j)) //nolint:gosec // overflow checked
+			return nil
+		}
+	}
+
+	if table.Len() >= math.MaxInt32 {
+		return errTooManyTableEntries
+	}
+
+	// Add the key/value pair as a new attribute to the table...
+	entry := table.AppendEmpty()
+	entry.SetKey(key)
+	value.CopyTo(entry.Value())
+
+	// ...and add a new index to the indices.
+	record.AttributeIndices().Append(int32(table.Len() - 1)) //nolint:gosec // overflow checked
+	return nil
+}