Add retry dropped item metrics and an exhausted retry error marker for exporter helper retries

Signed-off-by: Israel Blancas <[email protected]>

Author: iblancasa

.chloggen/mdatagen_add_semconv_ref.yaml renamed to .chloggen/13956.yaml

@@ -4,18 +4,19 @@
 change_type: enhancement
 
 # The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
-component: cmd/mdatagen
+component: pkg/exporterhelper
 
 # A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
-note: Add semconv reference for metrics
+note: Add retry dropped item metrics and an exhausted retry error marker for exporter helper retries.
 
 # One or more tracking issues or pull requests related to the change
-issues: [13920]
+issues: [13956]
 
 # (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:
+subtext: |-
+  New counters `otelcol_exporter_retry_dropped_{spans,metric_points,log_records}` capture items discarded after exhausting retries while `IsRetriesExhaustedErr` detects the terminal retry outcome.
 
 # Optional: The change log or logs in which this entry should be included.
 # e.g. '[user]' or '[user, api]'

.chloggen/mx-psi_mark-configoptional-gate-as-beta.yaml

@@ -93,7 +93,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
         with:
-          go-version: stable
+          go-version: oldstable
           cache: false
       - name: Cache Go
         id: go-cache

.chloggen/otelcol-factoriestelemetry-required.yaml

@@ -16,7 +16,6 @@
       "CHACHA",
       "CODEOWNERS",
       "Chao",
-      "Chrs",
       "Confmap",
       "DOLLARSIGN",
       "Distro",
@@ -168,7 +167,6 @@
       "coreinternal",
       "cpus",
       "cpuscraper",
-      "crobert",
       "crosslink",
       "cumulativetodeltaprocessor",
       "customname",

.github/workflows/build-and-test.yml

@@ -172,7 +172,6 @@ For more information about the maintainer role, see the [community repository](h
 
 ### Approvers
 
-- [Andrew Wilkins](https://github.com/axw), Elastic
 - [Antoine Toulme](https://github.com/atoulme), Splunk
 - [Damien Mathieu](https://github.com/dmathieu), Elastic
 - [Evan Bradley](https://github.com/evan-bradley), Dynatrace
@@ -188,6 +187,7 @@ the role of the [release manager](./docs/release.md#release-manager).
 
 ### Triagers
 
+- [Andrew Wilkins](https://github.com/axw), Elastic
 - [Andrzej Stencel](https://github.com/andrzej-stencel), Elastic
 - [Chao Weng](https://github.com/sincejune), AppDynamics
 - [Vihas Makwana](https://github.com/VihasMakwana), Elastic

.github/workflows/utils/cspell.json

@@ -92,7 +92,6 @@ var replaceModules = []string{
 	"/internal/fanoutconsumer",
 	"/internal/sharedcomponent",
 	"/internal/telemetry",
-	"/internal/testutil",
 	"/otelcol",
 	"/pdata",
 	"/pdata/testdata",

README.md

@@ -190,12 +190,12 @@ replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/con
 
 replace go.opentelemetry.io/collector/config/confighttp => ../../config/confighttp
 
+replace go.opentelemetry.io/collector => ../..
+
 replace go.opentelemetry.io/collector/extension/extensioncapabilities => ../../extension/extensioncapabilities
 
 replace go.opentelemetry.io/collector/pdata/xpdata => ../../pdata/xpdata
 
 replace go.opentelemetry.io/collector/exporter/exporterhelper => ../../exporter/exporterhelper
 
 replace go.opentelemetry.io/collector/service/telemetry/telemetrytest => ../../service/telemetry/telemetrytest
-
-replace go.opentelemetry.io/collector/internal/testutil => ../../internal/testutil

cmd/builder/internal/builder/main_test.go

@@ -47,7 +47,7 @@ func TestLoadMetadata(t *testing.T) {
 				GithubProject:        "open-telemetry/opentelemetry-collector",
 				GeneratedPackageName: "metadata",
 				Type:                 "sample",
-				SemConvVersion:       "1.37.0",
+				SemConvVersion:       "1.9.0",
 				PackageName:          "go.opentelemetry.io/collector/cmd/mdatagen/internal/samplereceiver",
 				Status: &Status{
 					DisableCodeCov: true,
@@ -261,21 +261,6 @@ func TestLoadMetadata(t *testing.T) {
 							Mono:                   Mono{Monotonic: true},
 						},
 					},
-					"system.cpu.time": {
-						Signal: Signal{
-							Enabled:               true,
-							Stability:             Stability{Level: component.StabilityLevelBeta},
-							SemanticConvention:    &SemanticConvention{SemanticConventionRef: "https://github.com/open-telemetry/semantic-conventions/blob/v1.37.0/docs/system/system-metrics.md#metric-systemcputime"},
-							Description:           "Monotonic cumulative sum int metric enabled by default.",
-							ExtendedDocumentation: "The metric will be become optional soon.",
-						},
-						Unit: strPtr("s"),
-						Sum: &Sum{
-							MetricValueType:        MetricValueType{pmetric.NumberDataPointValueTypeInt},
-							AggregationTemporality: AggregationTemporality{Aggregation: pmetric.AggregationTemporalityCumulative},
-							Mono:                   Mono{Monotonic: true},
-						},
-					},
 					"optional.metric": {
 						Signal: Signal{
 							Enabled:     false,
@@ -539,11 +524,6 @@ func TestLoadMetadata(t *testing.T) {
 			want:    Metadata{},
 			wantErr: "decoding failed due to the following error(s):\n\n'metrics[default.metric]' decoding failed due to the following error(s):\n\n'stability' decoding failed due to the following error(s):\n\n'level' unsupported stability level: \"development42\"",
 		},
-		{
-			name:    "testdata/invalid_metric_semconvref.yaml",
-			want:    Metadata{},
-			wantErr: "metric \"default.metric\": invalid semantic-conventions URL: want https://github.com/open-telemetry/semantic-conventions/blob/v1.37.2/*#metric-defaultmetric, got \"https://github.com/open-telemetry/semantic-conventions/blob/v1.38.0/docs/system/system-metrics.md#metric-systemcputime\"",
-		},
 		{
 			name:    "testdata/no_metric_stability.yaml",
 			want:    Metadata{},

cmd/mdatagen/go.mod

@@ -181,8 +181,8 @@ func (md *Metadata) validateMetricsAndEvents() error {
 	var errs error
 	usedAttrs := map[AttributeName]bool{}
 	errs = errors.Join(errs,
-		validateMetrics(md.Metrics, md.Attributes, usedAttrs, md.SemConvVersion),
-		validateMetrics(md.Telemetry.Metrics, md.Attributes, usedAttrs, md.SemConvVersion),
+		validateMetrics(md.Metrics, md.Attributes, usedAttrs),
+		validateMetrics(md.Telemetry.Metrics, md.Attributes, usedAttrs),
 		validateEvents(md.Events, md.Attributes, usedAttrs),
 		md.validateAttributes(usedAttrs))
 	return errs
@@ -226,10 +226,10 @@ func (md *Metadata) supportsSignal(signal string) bool {
 	return false
 }
 
-func validateMetrics(metrics map[MetricName]Metric, attributes map[AttributeName]Attribute, usedAttrs map[AttributeName]bool, semConvVersion string) error {
+func validateMetrics(metrics map[MetricName]Metric, attributes map[AttributeName]Attribute, usedAttrs map[AttributeName]bool) error {
 	var errs error
 	for mn, m := range metrics {
-		if err := m.validate(mn, semConvVersion); err != nil {
+		if err := m.validate(); err != nil {
 			errs = errors.Join(errs, fmt.Errorf(`metric "%v": %w`, mn, err))
 			continue
 		}
@@ -367,10 +367,6 @@ func (mvt ValueType) Primitive() string {
 	}
 }
 
-type SemanticConvention struct {
-	SemanticConventionRef string `mapstructure:"ref"`
-}
-
 type Warnings struct {
 	// A warning that will be displayed if the field is enabled in user config.
 	IfEnabled string `mapstructure:"if_enabled"`
@@ -482,9 +478,6 @@ type Signal struct {
 	// Description of the signal.
 	Description string `mapstructure:"description"`
 
-	// The semantic convention reference of the signal.
-	SemanticConvention *SemanticConvention `mapstructure:"semantic_convention"`
-
 	// The stability level of the signal.
 	Stability Stability `mapstructure:"stability"`