Merge branch 'main' into fix/14307-aix-crash

EdgeN8v · web-flow · commit f94976d62d7d · 2026-01-13T22:21:45.000+08:00
diff --git a/.chloggen/extension-type-aliases.yaml b/.chloggen/extension-type-aliases.yaml
@@ -0,0 +1,36 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: enhancement
+
+# The name of the component, or a single word describing the area of concern, (e.g. receiver/otlp)
+component: extension/xextension
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Add deprecated type alias support for extensions via `xextension` module
+
+# (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: |
+  Extensions can now register deprecated type aliases using the experimental `xextension.WithDeprecatedTypeAlias` option.
+  ```go
+  return xextension.NewFactory(
+      metadata.Type,
+      createDefaultConfig,
+      createExtension,
+      metadata.Stability,
+      xextension.WithDeprecatedTypeAlias("old_extension_name"),
+  )
+  ```
+  When the alias is used in configuration, a deprecation warning will be automatically logged, and the extension will function normally using the original implementation.
+
+# One or more tracking issues or pull requests related to the change
+issues: [14208]
+
+# 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]
diff --git a/config/configauth/go.mod b/config/configauth/go.mod
@@ -20,6 +20,7 @@ require (
 	github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	go.opentelemetry.io/collector/featuregate v1.49.0 // indirect
+	go.opentelemetry.io/collector/internal/componentalias v0.0.0-00010101000000-000000000000 // indirect
 	go.opentelemetry.io/collector/pdata v1.49.0 // indirect
 	go.opentelemetry.io/otel v1.39.0 // indirect
 	go.opentelemetry.io/otel/metric v1.39.0 // indirect
@@ -44,3 +45,5 @@ replace go.opentelemetry.io/collector/extension/extensionauth/extensionauthtest
 replace go.opentelemetry.io/collector/featuregate => ../../featuregate
 
 replace go.opentelemetry.io/collector/internal/testutil => ../../internal/testutil
+
+replace go.opentelemetry.io/collector/internal/componentalias => ../../internal/componentalias
diff --git a/config/configgrpc/go.mod b/config/configgrpc/go.mod
@@ -55,6 +55,7 @@ require (
 	go.opentelemetry.io/collector/confmap v1.49.0 // indirect
 	go.opentelemetry.io/collector/confmap/xconfmap v0.143.0 // indirect
 	go.opentelemetry.io/collector/featuregate v1.49.0 // indirect
+	go.opentelemetry.io/collector/internal/componentalias v0.0.0-00010101000000-000000000000 // indirect
 	go.opentelemetry.io/collector/pdata/pprofile v0.143.0 // indirect
 	go.opentelemetry.io/otel/metric v1.39.0 // indirect
 	go.opentelemetry.io/otel/sdk v1.39.0 // indirect
@@ -117,3 +118,5 @@ replace go.opentelemetry.io/collector/confmap => ../../confmap
 replace go.opentelemetry.io/collector/confmap/xconfmap => ../../confmap/xconfmap
 
 replace go.opentelemetry.io/collector/internal/testutil => ../../internal/testutil
+
+replace go.opentelemetry.io/collector/internal/componentalias => ../../internal/componentalias
diff --git a/config/confighttp/go.mod b/config/confighttp/go.mod
@@ -31,7 +31,10 @@ require (
 	golang.org/x/net v0.48.0
 )
 
-require github.com/cespare/xxhash/v2 v2.3.0 // indirect
+require (
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	go.opentelemetry.io/collector/internal/componentalias v0.0.0-00010101000000-000000000000 // indirect
+)
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
@@ -112,3 +115,5 @@ replace go.opentelemetry.io/collector/confmap => ../../confmap
 replace go.opentelemetry.io/collector/confmap/xconfmap => ../../confmap/xconfmap
 
 replace go.opentelemetry.io/collector/internal/testutil => ../../internal/testutil
+
+replace go.opentelemetry.io/collector/internal/componentalias => ../../internal/componentalias
diff --git a/config/confighttp/xconfighttp/go.mod b/config/confighttp/xconfighttp/go.mod
@@ -109,3 +109,5 @@ replace go.opentelemetry.io/collector/confmap => ../../../confmap
 replace go.opentelemetry.io/collector/confmap/xconfmap => ../../../confmap/xconfmap
 
 replace go.opentelemetry.io/collector/internal/testutil => ../../../internal/testutil
+
+replace go.opentelemetry.io/collector/internal/componentalias => ../../../internal/componentalias
diff --git a/config/configmiddleware/go.mod b/config/configmiddleware/go.mod
@@ -20,6 +20,7 @@ require (
 	github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	go.opentelemetry.io/collector/featuregate v1.49.0 // indirect
+	go.opentelemetry.io/collector/internal/componentalias v0.0.0-00010101000000-000000000000 // indirect
 	go.opentelemetry.io/collector/pdata v1.49.0 // indirect
 	go.opentelemetry.io/otel v1.39.0 // indirect
 	go.opentelemetry.io/otel/metric v1.39.0 // indirect
@@ -47,3 +48,5 @@ replace go.opentelemetry.io/collector/featuregate => ../../featuregate
 replace go.opentelemetry.io/collector/extension => ../../extension
 
 replace go.opentelemetry.io/collector/internal/testutil => ../../internal/testutil
+
+replace go.opentelemetry.io/collector/internal/componentalias => ../../internal/componentalias
diff --git a/extension/extension.go b/extension/extension.go
@@ -5,9 +5,9 @@ package extension // import "go.opentelemetry.io/collector/extension"
 
 import (
 	"context"
-	"fmt"
 
 	"go.opentelemetry.io/collector/component"
+	"go.opentelemetry.io/collector/internal/componentalias"
 )
 
 // Extension is the interface for objects hosted by the OpenTelemetry Collector that
@@ -49,6 +49,7 @@ type Factory interface {
 type factory struct {
 	cfgType component.Type
 	component.CreateDefaultConfigFunc
+	componentalias.TypeAliasHolder
 	createFunc         CreateFunc
 	extensionStability component.StabilityLevel
 }
@@ -64,8 +65,8 @@ func (f *factory) Stability() component.StabilityLevel {
 }
 
 func (f *factory) Create(ctx context.Context, set Settings, cfg component.Config) (Extension, error) {
-	if set.ID.Type() != f.cfgType {
-		return nil, fmt.Errorf("component type mismatch: component ID %q does not have type %q", set.ID, f.cfgType)
+	if err := componentalias.ValidateComponentType(f, set.ID); err != nil {
+		return nil, err
 	}
 
 	return f.createFunc(ctx, set, cfg)
@@ -81,6 +82,7 @@ func NewFactory(
 	return &factory{
 		cfgType:                 cfgType,
 		CreateDefaultConfigFunc: createDefaultConfig,
+		TypeAliasHolder:         componentalias.NewTypeAliasHolder(),
 		createFunc:              createServiceExtension,
 		extensionStability:      sl,
 	}
diff --git a/extension/extensionauth/extensionauthtest/go.mod b/extension/extensionauth/extensionauthtest/go.mod
@@ -20,6 +20,7 @@ require (
 	github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	go.opentelemetry.io/collector/featuregate v1.49.0 // indirect
+	go.opentelemetry.io/collector/internal/componentalias v0.0.0-00010101000000-000000000000 // indirect
 	go.opentelemetry.io/collector/pdata v1.49.0 // indirect
 	go.opentelemetry.io/otel v1.39.0 // indirect
 	go.opentelemetry.io/otel/metric v1.39.0 // indirect
@@ -41,3 +42,5 @@ replace go.opentelemetry.io/collector/extension => ../..
 replace go.opentelemetry.io/collector/featuregate => ../../../featuregate
 
 replace go.opentelemetry.io/collector/internal/testutil => ../../../internal/testutil
+
+replace go.opentelemetry.io/collector/internal/componentalias => ../../../internal/componentalias
diff --git a/extension/extensioncapabilities/go.mod b/extension/extensioncapabilities/go.mod
@@ -22,6 +22,7 @@ require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
 	go.opentelemetry.io/collector/featuregate v1.49.0 // indirect
+	go.opentelemetry.io/collector/internal/componentalias v0.0.0-00010101000000-000000000000 // indirect
 	go.opentelemetry.io/collector/pdata v1.49.0 // indirect
 	go.opentelemetry.io/otel v1.39.0 // indirect
 	go.opentelemetry.io/otel/metric v1.39.0 // indirect
@@ -42,3 +43,5 @@ replace go.opentelemetry.io/collector/component => ../../component
 replace go.opentelemetry.io/collector/featuregate => ../../featuregate
 
 replace go.opentelemetry.io/collector/internal/testutil => ../../internal/testutil
+
+replace go.opentelemetry.io/collector/internal/componentalias => ../../internal/componentalias
diff --git a/extension/extensionmiddleware/extensionmiddlewaretest/go.mod b/extension/extensionmiddleware/extensionmiddlewaretest/go.mod
@@ -19,6 +19,7 @@ require (
 	github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	go.opentelemetry.io/collector/featuregate v1.49.0 // indirect
+	go.opentelemetry.io/collector/internal/componentalias v0.0.0-00010101000000-000000000000 // indirect
 	go.opentelemetry.io/collector/pdata v1.49.0 // indirect
 	go.opentelemetry.io/otel v1.39.0 // indirect
 	go.opentelemetry.io/otel/metric v1.39.0 // indirect
@@ -44,3 +45,5 @@ replace go.opentelemetry.io/collector/extension => ../..
 replace go.opentelemetry.io/collector/featuregate => ../../../featuregate
 
 replace go.opentelemetry.io/collector/internal/testutil => ../../../internal/testutil
+
+replace go.opentelemetry.io/collector/internal/componentalias => ../../../internal/componentalias
diff --git a/extension/extensiontest/go.mod b/extension/extensiontest/go.mod
@@ -24,6 +24,7 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
 	go.opentelemetry.io/collector/featuregate v1.49.0 // indirect
+	go.opentelemetry.io/collector/internal/componentalias v0.0.0-00010101000000-000000000000 // indirect
 	go.opentelemetry.io/collector/pdata v1.49.0 // indirect
 	go.opentelemetry.io/otel v1.39.0 // indirect
 	go.opentelemetry.io/otel/metric v1.39.0 // indirect
@@ -45,3 +46,5 @@ replace go.opentelemetry.io/collector/component/componenttest => ../../component
 replace go.opentelemetry.io/collector/featuregate => ../../featuregate
 
 replace go.opentelemetry.io/collector/internal/testutil => ../../internal/testutil
+
+replace go.opentelemetry.io/collector/internal/componentalias => ../../internal/componentalias
diff --git a/extension/go.mod b/extension/go.mod
@@ -5,6 +5,7 @@ go 1.24.0
 require (
 	github.com/stretchr/testify v1.11.1
 	go.opentelemetry.io/collector/component v1.49.0
+	go.opentelemetry.io/collector/internal/componentalias v0.0.0-00010101000000-000000000000
 	go.uber.org/goleak v1.3.0
 )
 
@@ -32,4 +33,6 @@ replace go.opentelemetry.io/collector/pdata => ../pdata
 
 replace go.opentelemetry.io/collector/featuregate => ../featuregate
 
+replace go.opentelemetry.io/collector/internal/componentalias => ../internal/componentalias
+
 replace go.opentelemetry.io/collector/internal/testutil => ../internal/testutil
diff --git a/extension/memorylimiterextension/go.mod b/extension/memorylimiterextension/go.mod
@@ -44,6 +44,7 @@ require (
 	github.com/yusufpapurcu/wmi v1.2.4 // indirect
 	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
 	go.opentelemetry.io/collector/featuregate v1.49.0 // indirect
+	go.opentelemetry.io/collector/internal/componentalias v0.0.0-00010101000000-000000000000 // indirect
 	go.opentelemetry.io/collector/pdata v1.49.0 // indirect
 	go.opentelemetry.io/otel v1.39.0 // indirect
 	go.opentelemetry.io/otel/metric v1.39.0 // indirect
@@ -79,3 +80,5 @@ replace go.opentelemetry.io/collector/featuregate => ../../featuregate
 replace go.opentelemetry.io/collector/internal/testutil => ../../internal/testutil
 
 replace go.opentelemetry.io/collector/extension/extensionmiddleware => ../../extension/extensionmiddleware
+
+replace go.opentelemetry.io/collector/internal/componentalias => ../../internal/componentalias
diff --git a/extension/xextension/extension.go b/extension/xextension/extension.go
@@ -0,0 +1,51 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+package xextension // import "go.opentelemetry.io/collector/extension/xextension"
+
+import (
+	"go.opentelemetry.io/collector/component"
+	"go.opentelemetry.io/collector/extension"
+	"go.opentelemetry.io/collector/internal/componentalias"
+)
+
+type Factory interface {
+	extension.Factory
+}
+
+type FactoryOption interface {
+	applyOption(o *factory)
+}
+
+type factoryOptionFunc func(*factory)
+
+func (f factoryOptionFunc) applyOption(o *factory) {
+	f(o)
+}
+
+type factory struct {
+	extension.Factory
+	componentalias.TypeAliasHolder
+}
+
+func WithDeprecatedTypeAlias(alias component.Type) FactoryOption {
+	return factoryOptionFunc(func(o *factory) {
+		o.SetDeprecatedAlias(alias)
+	})
+}
+
+func NewFactory(
+	cfgType component.Type,
+	createDefaultConfig component.CreateDefaultConfigFunc,
+	createServiceExtension extension.CreateFunc,
+	sl component.StabilityLevel,
+	options ...FactoryOption,
+) Factory {
+	f := &factory{TypeAliasHolder: componentalias.NewTypeAliasHolder()}
+	for _, opt := range options {
+		opt.applyOption(f)
+	}
+	f.Factory = extension.NewFactory(cfgType, createDefaultConfig, createServiceExtension, sl)
+	f.Factory.(componentalias.TypeAliasHolder).SetDeprecatedAlias(f.DeprecatedAlias())
+	return f
+}
diff --git a/extension/xextension/extension_test.go b/extension/xextension/extension_test.go
@@ -0,0 +1,60 @@
+// Copyright The OpenTelemetry Authors
+// SPDX-License-Identifier: Apache-2.0
+
+package xextension
+
+import (
+	"context"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
+	"go.opentelemetry.io/collector/component"
+	"go.opentelemetry.io/collector/component/componenttest"
+	"go.opentelemetry.io/collector/extension"
+)
+
+type nopExtension struct {
+	component.StartFunc
+	component.ShutdownFunc
+}
+
+func TestWithDeprecatedTypeAlias(t *testing.T) {
+	originalType := component.MustNewType("original")
+	aliasType := component.MustNewType("alias")
+	nopExtensionInstance := new(nopExtension)
+
+	factory := NewFactory(
+		originalType,
+		func() component.Config { return &struct{}{} },
+		func(context.Context, extension.Settings, component.Config) (extension.Extension, error) {
+			return nopExtensionInstance, nil
+		},
+		component.StabilityLevelAlpha,
+		WithDeprecatedTypeAlias(aliasType),
+	)
+
+	assert.Equal(t, originalType, factory.Type())
+
+	ext, err := factory.Create(context.Background(), extension.Settings{
+		ID:                component.NewID(originalType),
+		TelemetrySettings: componenttest.NewNopTelemetrySettings(),
+	}, factory.CreateDefaultConfig())
+	require.NoError(t, err)
+	require.NotNil(t, ext)
+
+	ext, err = factory.Create(context.Background(), extension.Settings{
+		ID:                component.NewID(aliasType),
+		TelemetrySettings: componenttest.NewNopTelemetrySettings(),
+	}, factory.CreateDefaultConfig())
+	require.NoError(t, err)
+	require.NotNil(t, ext)
+
+	ext, err = factory.Create(context.Background(), extension.Settings{
+		ID:                component.NewID(component.MustNewType("wrong")),
+		TelemetrySettings: componenttest.NewNopTelemetrySettings(),
+	}, factory.CreateDefaultConfig())
+	require.Error(t, err)
+	require.Nil(t, ext)
+}
diff --git a/extension/xextension/go.mod b/extension/xextension/go.mod
@@ -3,23 +3,36 @@ module go.opentelemetry.io/collector/extension/xextension
 go 1.24.0
 
 require (
+	github.com/stretchr/testify v1.11.1
 	go.opentelemetry.io/collector/component v1.49.0
+	go.opentelemetry.io/collector/component/componenttest v0.143.0
 	go.opentelemetry.io/collector/extension v1.49.0
+	go.opentelemetry.io/collector/internal/componentalias v0.0.0-00010101000000-000000000000
 )
 
 require (
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/go-logr/logr v1.4.3 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/hashicorp/go-version v1.8.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
 	go.opentelemetry.io/collector/featuregate v1.49.0 // indirect
 	go.opentelemetry.io/collector/pdata v1.49.0 // indirect
 	go.opentelemetry.io/otel v1.39.0 // indirect
 	go.opentelemetry.io/otel/metric v1.39.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.39.0 // indirect
+	go.opentelemetry.io/otel/sdk/metric v1.39.0 // indirect
 	go.opentelemetry.io/otel/trace v1.39.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.1 // indirect
+	golang.org/x/sys v0.39.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
 replace go.opentelemetry.io/collector/extension => ../
@@ -31,3 +44,7 @@ replace go.opentelemetry.io/collector/pdata => ../../pdata
 replace go.opentelemetry.io/collector/featuregate => ../../featuregate
 
 replace go.opentelemetry.io/collector/internal/testutil => ../../internal/testutil
+
+replace go.opentelemetry.io/collector/internal/componentalias => ../../internal/componentalias
+
+replace go.opentelemetry.io/collector/component/componenttest => ../../component/componenttest
diff --git a/extension/xextension/go.sum b/extension/xextension/go.sum
diff --git a/extension/zpagesextension/go.mod b/extension/zpagesextension/go.mod
diff --git a/scraper/scraperhelper/xscraperhelper/go.mod b/scraper/scraperhelper/xscraperhelper/go.mod
diff --git a/service/internal/builders/extension.go b/service/internal/builders/extension.go
