[chore] repo: Sync fork with current upstream main

.chloggen/config.yaml

@@ -101,6 +101,7 @@ components:
     - extension/healthcheckv2
     - extension/host_observer
     - extension/http_forwarder
+    - extension/inmemorystorage
     - extension/jaeger_encoding
     - extension/jaegerremotesampling
     - extension/json_log_encoding

.codecov.yml

@@ -425,6 +425,10 @@ component_management:
     name: extension_storage_filestorage
     paths:
     - extension/storage/filestorage/**
+  - component_id: extension_storage_inmemorystorage
+    name: extension_storage_inmemorystorage
+    paths:
+    - extension/storage/inmemorystorage/**
   - component_id: extension_storage_redisstorage
     name: extension_storage_redisstorage
     paths:

.github/ISSUE_TEMPLATE/beta_stability.yaml

@@ -132,6 +132,7 @@ body:
       - extension/storage
       - extension/storage/dbstorage
       - extension/storage/filestorage
+      - extension/storage/inmemorystorage
       - extension/storage/redisstorage
       - extension/sumologic
       - internal/aws

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -135,6 +135,7 @@ body:
       - extension/storage
       - extension/storage/dbstorage
       - extension/storage/filestorage
+      - extension/storage/inmemorystorage
       - extension/storage/redisstorage
       - extension/sumologic
       - internal/aws

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -129,6 +129,7 @@ body:
       - extension/storage
       - extension/storage/dbstorage
       - extension/storage/filestorage
+      - extension/storage/inmemorystorage
       - extension/storage/redisstorage
       - extension/sumologic
       - internal/aws

.github/ISSUE_TEMPLATE/other.yaml

@@ -129,6 +129,7 @@ body:
       - extension/storage
       - extension/storage/dbstorage
       - extension/storage/filestorage
+      - extension/storage/inmemorystorage
       - extension/storage/redisstorage
       - extension/sumologic
       - internal/aws

.github/ISSUE_TEMPLATE/unmaintained.yaml

@@ -134,6 +134,7 @@ body:
       - extension/storage
       - extension/storage/dbstorage
       - extension/storage/filestorage
+      - extension/storage/inmemorystorage
       - extension/storage/redisstorage
       - extension/sumologic
       - internal/aws

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

@@ -173,6 +173,12 @@ jobs:
         run: |
           make generate
           if [[ -n $(git status -s) ]]; then
+            echo "::group::git status"
+            git status -s
+            echo "::endgroup::"
+            echo "::group::git diff --name-only"
+            git diff --name-only
+            echo "::endgroup::"
             echo 'Generated code is out of date, please run "make generate" and commit the changes in this PR.'
             exit 1
           fi

.github/workflows/scripts/approve-workflows.sh

@@ -11,7 +11,7 @@ if [[ -z "${PR_NUMBER:-}" || -z "${COMMENT:-}" || -z "${SENDER:-}" || -z "${ORG_
     exit 0
 fi
 
-if [[ ${COMMENT:0:18} != "/workflow-approve" ]]; then
+if [[ ${COMMENT:0:17} != "/workflow-approve" ]]; then
     echo "Not a workflow-approve command"
     exit 0
 fi

.github/workflows/scripts/check-disk-space.sh

@@ -6,6 +6,7 @@
 declare BASELINE_SPACE
 
 free_space=$(df -BM --output=avail / | sed '1d;s/[^0-9]//g')
+BASELINE_SPACE=${BASELINE_SPACE:-$free_space}
 used_space=$((BASELINE_SPACE - free_space))
 echo "Job used $used_space MiB of disk space, $free_space MiB remain."
 if [ "$used_space" -gt 14336 ]; then

.github/workflows/scripts/generate-codeowners-activity.js

@@ -295,13 +295,6 @@ async function computePrStats(octokit, prs, labelToOwners, componentLabels, peri
  * Per-code-owner target is 75% / (number of code owners for that component).
  */
 function formatTable(byCodeOwnerAndComponent, kind) {
-  const codeOwnerCountByComponent = {};
-  for (const [, byComponent] of Object.entries(byCodeOwnerAndComponent)) {
-    for (const component of Object.keys(byComponent)) {
-      codeOwnerCountByComponent[component] = (codeOwnerCountByComponent[component] || 0) + 1;
-    }
-  }
-
   const rows = [];
   for (const [login, byComponent] of Object.entries(byCodeOwnerAndComponent)) {
     for (const [component, v] of Object.entries(byComponent)) {
@@ -329,13 +322,7 @@ function formatTable(byCodeOwnerAndComponent, kind) {
 /**
  * Per-component summary: % of the component's PRs that received at least one code-owner review (target ≥75%).
  */
-function formatComponentSummaryTable(byCodeOwnerAndComponent, componentPrStats) {
-  const codeOwnerCountByComponent = {};
-  for (const [login, components] of Object.entries(byCodeOwnerAndComponent)) {
-    for (const component of Object.keys(components)) {
-      codeOwnerCountByComponent[component] = (codeOwnerCountByComponent[component] || 0) + 1;
-    }
-  }
+function formatComponentSummaryTable(codeOwnerCountByComponent, componentPrStats) {
   const rows = Object.entries(componentPrStats || {})
     .filter(([, v]) => v.prsTotal > 0)
     .map(([component, v]) => {
@@ -355,6 +342,14 @@ function formatComponentSummaryTable(byCodeOwnerAndComponent, componentPrStats)
   return `${header}\n${sep}\n${body}\n`;
 }
 
+function countCodeOwnersByComponent(labelToOwners) {
+  const counts = {};
+  for (const [component, owners] of Object.entries(labelToOwners)) {
+    counts[component] = owners.length;
+  }
+  return counts;
+}
+
 function collapsibleSection(title, content) {
   return `<details>
 <summary>${title}</summary>
@@ -363,7 +358,7 @@ ${content}
 </details>`;
 }
 
-function generateReport(prStats, componentPrStats, lookbackData) {
+function generateReport(prStats, componentPrStats, codeOwnerCountByComponent, lookbackData) {
   const startStr = lookbackData.periodStart.toISOString().slice(0, 10);
   const endStr = lookbackData.periodEnd.toISOString().slice(0, 10);
   const out = [
@@ -375,7 +370,7 @@ function generateReport(prStats, componentPrStats, lookbackData) {
     ``,
     `### Component PR review rate (${COMPONENT_TARGET_PCT}% target)`,
     ``,
-    formatComponentSummaryTable(prStats, componentPrStats),
+    formatComponentSummaryTable(codeOwnerCountByComponent, componentPrStats),
     ``,
     collapsibleSection('PRs (per code owner)', formatTable(prStats, 'PRs')),
   ];
@@ -409,6 +404,7 @@ async function main({ github, context }) {
   const pathToOwners = parseCodeowners(codeownersPath);
   const { pathToLabel, allLabels } = parseComponentLabels(labelsPath);
   const labelToOwners = buildLabelToCodeOwners(pathToOwners, pathToLabel);
+  const codeOwnerCountByComponent = countCodeOwnersByComponent(labelToOwners);
   // Only consider PRs/issues that have at least one of the focus component labels
   const componentLabels = new Set([...allLabels].filter(isAllowedLabel));
 
@@ -417,7 +413,7 @@ async function main({ github, context }) {
 
   const { byCodeOwnerAndComponent: prStats, componentPrStats } = await computePrStats(octokit, prs30, labelToOwners, componentLabels, lookbackData.periodStart, lookbackData.periodEnd);
 
-  const report = generateReport(prStats, componentPrStats, lookbackData);
+  const report = generateReport(prStats, componentPrStats, codeOwnerCountByComponent, lookbackData);
 
   // Dry run: set DRY_RUN=true or DRY_RUN=1 to print the report without creating an issue.
   const dryRun = process.env.DRY_RUN === 'true' || process.env.DRY_RUN === '1';

cmd/otelcontribcol/builder-config.yaml

@@ -43,6 +43,7 @@ extensions:
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/solarwindsapmsettingsextension v0.148.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/dbstorage v0.148.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage v0.148.0
+  - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/inmemorystorage v0.148.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/redisstorageextension v0.148.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/sumologicextension v0.148.0
   - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/awscloudwatchmetricstreamsencodingextension v0.148.0

exporter/loadbalancingexporter/README.md

@@ -257,7 +257,7 @@ exporters:
       payload_compression: zstd
 ```
 
-`sending_queue.compress_in_memory` is currently not supported by this exporter helper version. If set, config validation fails instead of silently ignoring it.
+`sending_queue.compress_in_memory` is retained for compatibility. It requires `sending_queue` to be configured and a non-`none` `sending_queue.payload_compression` value. When enabled, the exporter uses an internal in-memory storage backend so the queue payload codec still applies.
 
 Kubernetes resolver example (For a more specific example: [example/k8s-resolver](./example/k8s-resolver/README.md))
 > [!IMPORTANT]

exporter/loadbalancingexporter/config.go

@@ -74,17 +74,21 @@ func (q *QueueSettings) Unmarshal(conf *confmap.Conf) error {
 		return nil
 	}
 
-	// QueueBatchConfig has its own Unmarshal implementation that rejects unknown fields.
-	// Parse the queue payload compression fields separately so they can coexist with queue settings.
 	queueCfg := conf.ToStringMap()
 	payloadRaw, hasPayload := queueCfg["payload_compression"]
 	compressRaw, hasCompressInMemory := queueCfg["compress_in_memory"]
+	enabledRaw, hasEnabled := queueCfg["enabled"]
 	delete(queueCfg, "payload_compression")
 	delete(queueCfg, "compress_in_memory")
+	delete(queueCfg, "enabled")
 
-	queueConf := confmap.NewFromStringMap(queueCfg)
-	if err := queueConf.Unmarshal(&q.QueueConfig); err != nil {
-		return err
+	enabled := hasPayload || hasCompressInMemory || len(queueCfg) > 0
+	if hasEnabled {
+		enabledVal, ok := enabledRaw.(bool)
+		if !ok {
+			return errors.New("sending_queue.enabled must be a bool")
+		}
+		enabled = enabledVal
 	}
 
 	if hasPayload {
@@ -103,6 +107,18 @@ func (q *QueueSettings) Unmarshal(conf *confmap.Conf) error {
 		q.CompressInMemory = compressInMemory
 	}
 
+	if !enabled {
+		q.QueueConfig = configoptional.None[exporterhelper.QueueBatchConfig]()
+		return nil
+	}
+
+	queueConf := confmap.NewFromStringMap(queueCfg)
+	queueConfig := exporterhelper.NewDefaultQueueConfig()
+	if err := queueConf.Unmarshal(&queueConfig); err != nil {
+		return err
+	}
+	q.QueueConfig = configoptional.Some(queueConfig)
+
 	return nil
 }
 
@@ -116,7 +132,11 @@ const (
 
 func (q QueueSettings) Validate() error {
 	if q.QueueConfig.HasValue() {
-		if err := q.QueueConfig.Get().Validate(); err != nil {
+		queueCfg := *q.QueueConfig.Get()
+		if q.CompressInMemory && queueCfg.StorageID == nil {
+			queueCfg.StorageID = &inMemoryQueueStorageID
+		}
+		if err := queueCfg.Validate(); err != nil {
 			return err
 		}
 	}

exporter/loadbalancingexporter/config_test.go

@@ -37,6 +37,7 @@ func TestConfigValidatePayloadCompression(t *testing.T) {
 	cfg.QueueSettings.QueueConfig = configoptional.Some(exporterhelper.NewDefaultQueueConfig())
 	cfg.QueueSettings.PayloadCompression = QueuePayloadCompressionSnappy
 	require.NoError(t, cfg.Validate())
+	require.Nil(t, cfg.QueueSettings.QueueConfig.Get().StorageID)
 
 	cfg.QueueSettings.PayloadCompression = QueuePayloadCompressionZstd
 	require.NoError(t, cfg.Validate())
@@ -61,6 +62,12 @@ func TestConfigValidateCompressInMemory(t *testing.T) {
 
 	cfg.QueueSettings.PayloadCompression = QueuePayloadCompressionZstd
 	require.NoError(t, cfg.Validate())
+
+	queueCfg := exporterhelper.NewDefaultQueueConfig()
+	queueCfg.WaitForResult = true
+	cfg.QueueSettings.QueueConfig = configoptional.Some(queueCfg)
+	cfg.QueueSettings.PayloadCompression = QueuePayloadCompressionSnappy
+	require.ErrorContains(t, cfg.Validate(), "`wait_for_result` is not supported with a persistent queue configured with `storage`")
 }
 
 func TestConfigValidateLogBatcher(t *testing.T) {
@@ -110,6 +117,8 @@ func TestLoadConfigWithQueueCompression(t *testing.T) {
 
 	require.NoError(t, conf.Unmarshal(cfg))
 	require.True(t, cfg.QueueSettings.QueueConfig.HasValue())
+	require.Equal(t, int64(1000), cfg.QueueSettings.QueueConfig.Get().QueueSize)
+	require.Equal(t, 2, cfg.QueueSettings.QueueConfig.Get().NumConsumers)
 	require.Equal(t, QueuePayloadCompressionZstd, cfg.QueueSettings.PayloadCompression)
 	require.True(t, cfg.QueueSettings.CompressInMemory)
 }

exporter/loadbalancingexporter/factory.go

@@ -21,12 +21,15 @@ import (
 	"go.uber.org/zap"
 
 	"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter/internal/metadata"
+	"github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/inmemorystorage"
 )
 
 const (
 	zapEndpointKey = "endpoint"
 )
 
+var inMemoryQueueStorageID = component.NewID(inmemorystorage.Type)
+
 // NewFactory creates a factory for the exporter.
 func NewFactory() exporter.Factory {
 	return exporter.NewFactory(
@@ -42,7 +45,6 @@ func createDefaultConfig() component.Config {
 	otlpFactory := otlpexporter.NewFactory()
 	otlpDefaultCfg := otlpFactory.CreateDefaultConfig().(*otlpexporter.Config)
 	otlpDefaultCfg.ClientConfig.Endpoint = "placeholder:4317"
-	queueCfg := exporterhelper.NewDefaultQueueConfig()
 
 	return &Config{
 		// By default we disable resilience options on loadbalancing exporter level
@@ -51,7 +53,7 @@ func createDefaultConfig() component.Config {
 			OTLP: *otlpDefaultCfg,
 		},
 		QueueSettings: QueueSettings{
-			QueueConfig:        configoptional.Default(queueCfg),
+			QueueConfig:        configoptional.None[exporterhelper.QueueBatchConfig](),
 			PayloadCompression: QueuePayloadCompressionNone,
 		},
 		LogBatcher: LogBatcherConfig{
@@ -94,14 +96,14 @@ func buildExporterResilienceOptions(
 	if cfg.TimeoutSettings.Timeout > 0 {
 		options = append(options, exporterhelper.WithTimeout(cfg.TimeoutSettings))
 	}
-	if cfg.QueueSettings.QueueConfig.HasValue() {
+	if queueCfg, ok := queueConfigForExport(cfg); ok {
 		if payloadCodec != nil && qbs.Encoding != nil {
 			qbs.Encoding = payloadCodecEncoding{
 				encoding: qbs.Encoding,
 				codec:    payloadCodec,
 			}
 		}
-		options = append(options, xexporterhelper.WithQueueBatch(cfg.QueueSettings.QueueConfig, qbs))
+		options = append(options, xexporterhelper.WithQueueBatch(queueCfg, qbs))
 	}
 	if cfg.Enabled {
 		options = append(options, exporterhelper.WithRetry(cfg.BackOffConfig))
@@ -201,3 +203,16 @@ func shutdownWithCodec(shutdown component.ShutdownFunc, codec *queuePayloadCodec
 		return multierr.Append(shutdown.Shutdown(ctx), codec.Close())
 	}
 }
+
+func queueConfigForExport(cfg *Config) (configoptional.Optional[exporterhelper.QueueBatchConfig], bool) {
+	if !cfg.QueueSettings.QueueConfig.HasValue() {
+		return configoptional.None[exporterhelper.QueueBatchConfig](), false
+	}
+
+	queueCfg := *cfg.QueueSettings.QueueConfig.Get()
+	if cfg.QueueSettings.CompressInMemory && queueCfg.StorageID == nil {
+		queueCfg.StorageID = &inMemoryQueueStorageID
+	}
+
+	return configoptional.Some(queueCfg), true
+}

exporter/loadbalancingexporter/factory_test.go

@@ -232,9 +232,9 @@ func TestBuildExporterResilienceOptions(t *testing.T) {
 		cfg.TimeoutSettings = exporterhelper.NewDefaultTimeoutConfig()
 		cfg.QueueSettings.QueueConfig = configoptional.Some(exporterhelper.NewDefaultQueueConfig())
 
-		assert.Len(t, buildExporterResilienceOptions(o, cfg, newQueuePayloadCodecIfEnabled(cfg), newSettings()), 2)
+		assert.Len(t, buildExporterResilienceOptions(o, cfg, nil, newSettings()), 2)
 	})
-	t.Run("Should have timeout, queue and compression options when compression is enabled", func(t *testing.T) {
+	t.Run("Should have timeout, queue and payload codec options when compression is enabled", func(t *testing.T) {
 		o := []exporterhelper.Option{}
 		cfg := createDefaultConfig().(*Config)
 		cfg.TimeoutSettings = exporterhelper.NewDefaultTimeoutConfig()
@@ -269,3 +269,15 @@ func TestNewQueuePayloadCodecIfEnabled(t *testing.T) {
 		assert.NotNil(t, newQueuePayloadCodecIfEnabled(cfg))
 	})
 }
+
+func TestQueueConfigForExportUsesInMemoryStorageWhenRequested(t *testing.T) {
+	cfg := createDefaultConfig().(*Config)
+	cfg.QueueSettings.QueueConfig = configoptional.Some(exporterhelper.NewDefaultQueueConfig())
+	cfg.QueueSettings.CompressInMemory = true
+
+	queueCfg, ok := queueConfigForExport(cfg)
+	require.True(t, ok)
+	require.True(t, queueCfg.HasValue())
+	require.NotNil(t, queueCfg.Get().StorageID)
+	assert.Equal(t, inMemoryQueueStorageID, *queueCfg.Get().StorageID)
+}