Skip to content

Commit ff5971d

Browse files
committed
Deprecate extension/experimental in favor of extension/xextension
Signed-off-by: Bogdan Drutu <[email protected]>
1 parent af09df1 commit ff5971d

File tree

31 files changed

+246
-70
lines changed

31 files changed

+246
-70
lines changed

.chloggen/experimental.yaml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: deprecation
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
7+
component: extension/experimental
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Deprecate extension/experimental in favor of extension/xextension
11+
12+
# One or more tracking issues or pull requests related to the change
13+
issues: [12010]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# Optional: The change log or logs in which this entry should be included.
21+
# e.g. '[user]' or '[user, api]'
22+
# Include 'user' if the change is relevant to end users.
23+
# Include 'api' if there is a change to a library API.
24+
# Default: '[user]'
25+
change_logs: [api]

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ exporter/nopexporter @open-telemetry/collector-approvers @evan-bradle
2525
pdata/ @open-telemetry/collector-approvers @BogdanDrutu @dmitryax
2626
receiver/nopreceiver @open-telemetry/collector-approvers @evan-bradley
2727
service/internal/graph @open-telemetry/collector-approvers @djaglowski
28-
extension/experimental/storage @open-telemetry/collector-approvers @swiatekm
28+
extension/xextension @open-telemetry/collector-approvers @swiatekm
2929

3030
# Profiling-related modules
3131
pdata/pprofile @open-telemetry/collector-approvers @mx-psi @dmathieu

cmd/builder/internal/builder/main_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@ var replaceModules = []string{
7777
"/extension",
7878
"/extension/auth",
7979
"/extension/auth/authtest",
80-
"/extension/experimental/storage",
8180
"/extension/extensioncapabilities",
8281
"/extension/extensiontest",
8382
"/extension/zpagesextension",
83+
"/extension/xextension",
8484
"/featuregate",
8585
"/internal/memorylimiter",
8686
"/internal/fanoutconsumer",

cmd/builder/test/core.builder.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ replaces:
4949
- go.opentelemetry.io/collector/extension => ${WORKSPACE_DIR}/extension
5050
- go.opentelemetry.io/collector/extension/auth => ${WORKSPACE_DIR}/extension/auth
5151
- go.opentelemetry.io/collector/extension/auth/authtest => ${WORKSPACE_DIR}/extension/auth/authtest
52-
- go.opentelemetry.io/collector/extension/experimental/storage => ${WORKSPACE_DIR}/extension/experimental/storage
5352
- go.opentelemetry.io/collector/extension/extensioncapabilities => ${WORKSPACE_DIR}/extension/extensioncapabilities
5453
- go.opentelemetry.io/collector/extension/extensiontest => ${WORKSPACE_DIR}/extension/extensiontest
5554
- go.opentelemetry.io/collector/extension/zpagesextension => ${WORKSPACE_DIR}/extension/zpagesextension
55+
- go.opentelemetry.io/collector/extension/xextension => ${WORKSPACE_DIR}/extension/xextension
5656
- go.opentelemetry.io/collector/featuregate => ${WORKSPACE_DIR}/featuregate
5757
- go.opentelemetry.io/collector/internal/memorylimiter => ${WORKSPACE_DIR}/internal/memorylimiter
5858
- go.opentelemetry.io/collector/internal/fanoutconsumer => ${WORKSPACE_DIR}/internal/fanoutconsumer

cmd/otelcorecol/builder-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@ replaces:
7777
- go.opentelemetry.io/collector/extension => ../../extension
7878
- go.opentelemetry.io/collector/extension/auth => ../../extension/auth
7979
- go.opentelemetry.io/collector/extension/auth/authtest => ../../extension/auth/authtest
80-
- go.opentelemetry.io/collector/extension/experimental/storage => ../../extension/experimental/storage
8180
- go.opentelemetry.io/collector/extension/extensioncapabilities => ../../extension/extensioncapabilities
8281
- go.opentelemetry.io/collector/extension/extensiontest => ../../extension/extensiontest
8382
- go.opentelemetry.io/collector/extension/memorylimiterextension => ../../extension/memorylimiterextension
83+
- go.opentelemetry.io/collector/extension/xextension => ../../extension/xextension
8484
- go.opentelemetry.io/collector/extension/zpagesextension => ../../extension/zpagesextension
8585
- go.opentelemetry.io/collector/featuregate => ../../featuregate
8686
- go.opentelemetry.io/collector/internal/memorylimiter => ../../internal/memorylimiter

cmd/otelcorecol/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,9 @@ require (
103103
go.opentelemetry.io/collector/exporter/exportertest v0.116.0 // indirect
104104
go.opentelemetry.io/collector/exporter/xexporter v0.116.0 // indirect
105105
go.opentelemetry.io/collector/extension/auth v0.116.0 // indirect
106-
go.opentelemetry.io/collector/extension/experimental/storage v0.116.0 // indirect
107106
go.opentelemetry.io/collector/extension/extensioncapabilities v0.116.0 // indirect
108107
go.opentelemetry.io/collector/extension/extensiontest v0.116.0 // indirect
108+
go.opentelemetry.io/collector/extension/xextension v0.116.0 // indirect
109109
go.opentelemetry.io/collector/featuregate v1.22.0 // indirect
110110
go.opentelemetry.io/collector/internal/fanoutconsumer v0.116.0 // indirect
111111
go.opentelemetry.io/collector/internal/memorylimiter v0.116.0 // indirect
@@ -238,14 +238,14 @@ replace go.opentelemetry.io/collector/extension/auth => ../../extension/auth
238238

239239
replace go.opentelemetry.io/collector/extension/auth/authtest => ../../extension/auth/authtest
240240

241-
replace go.opentelemetry.io/collector/extension/experimental/storage => ../../extension/experimental/storage
242-
243241
replace go.opentelemetry.io/collector/extension/extensioncapabilities => ../../extension/extensioncapabilities
244242

245243
replace go.opentelemetry.io/collector/extension/extensiontest => ../../extension/extensiontest
246244

247245
replace go.opentelemetry.io/collector/extension/memorylimiterextension => ../../extension/memorylimiterextension
248246

247+
replace go.opentelemetry.io/collector/extension/xextension => ../../extension/xextension
248+
249249
replace go.opentelemetry.io/collector/extension/zpagesextension => ../../extension/zpagesextension
250250

251251
replace go.opentelemetry.io/collector/featuregate => ../../featuregate

exporter/debugexporter/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ require (
4545
go.opentelemetry.io/collector/consumer/consumertest v0.116.0 // indirect
4646
go.opentelemetry.io/collector/consumer/xconsumer v0.116.0 // indirect
4747
go.opentelemetry.io/collector/extension v0.116.0 // indirect
48-
go.opentelemetry.io/collector/extension/experimental/storage v0.116.0 // indirect
48+
go.opentelemetry.io/collector/extension/xextension v0.116.0 // indirect
4949
go.opentelemetry.io/collector/featuregate v1.22.0 // indirect
5050
go.opentelemetry.io/collector/pipeline v0.116.0 // indirect
5151
go.opentelemetry.io/collector/pipeline/xpipeline v0.116.0 // indirect
@@ -88,8 +88,6 @@ replace go.opentelemetry.io/collector/receiver/receivertest => ../../receiver/re
8888

8989
replace go.opentelemetry.io/collector/extension => ../../extension
9090

91-
replace go.opentelemetry.io/collector/extension/experimental/storage => ../../extension/experimental/storage
92-
9391
replace go.opentelemetry.io/collector/config/configtelemetry => ../../config/configtelemetry
9492

9593
replace go.opentelemetry.io/collector/config/configretry => ../../config/configretry
@@ -121,3 +119,5 @@ replace go.opentelemetry.io/collector/scraper => ../../scraper
121119
replace go.opentelemetry.io/collector/featuregate => ../../featuregate
122120

123121
replace go.opentelemetry.io/collector/scraper/scraperhelper => ../../scraper/scraperhelper
122+
123+
replace go.opentelemetry.io/collector/extension/xextension => ../../extension/xextension

exporter/exporterhelper/xexporterhelper/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ require (
3838
github.com/pmezard/go-difflib v1.0.0 // indirect
3939
go.opentelemetry.io/collector/config/configtelemetry v0.116.0 // indirect
4040
go.opentelemetry.io/collector/extension v0.116.0 // indirect
41-
go.opentelemetry.io/collector/extension/experimental/storage v0.116.0 // indirect
41+
go.opentelemetry.io/collector/extension/xextension v0.116.0 // indirect
4242
go.opentelemetry.io/collector/featuregate v1.22.0 // indirect
4343
go.opentelemetry.io/collector/pdata v1.22.0 // indirect
4444
go.opentelemetry.io/collector/pipeline v0.116.0 // indirect
@@ -93,8 +93,6 @@ replace go.opentelemetry.io/collector/config/configretry => ../../../config/conf
9393

9494
replace go.opentelemetry.io/collector/pipeline/xpipeline => ../../../pipeline/xpipeline
9595

96-
replace go.opentelemetry.io/collector/extension/experimental/storage => ../../../extension/experimental/storage
97-
9896
replace go.opentelemetry.io/collector/pipeline => ../../../pipeline
9997

10098
replace go.opentelemetry.io/collector/exporter/exportertest => ../../exportertest
@@ -108,3 +106,5 @@ replace go.opentelemetry.io/collector/scraper => ../../../scraper
108106
replace go.opentelemetry.io/collector/featuregate => ../../../featuregate
109107

110108
replace go.opentelemetry.io/collector/scraper/scraperhelper => ../../../scraper/scraperhelper
109+
110+
replace go.opentelemetry.io/collector/extension/xextension => ../../../extension/xextension

exporter/exportertest/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ require (
3535
go.opentelemetry.io/collector/config/configtelemetry v0.116.0 // indirect
3636
go.opentelemetry.io/collector/consumer/xconsumer v0.116.0 // indirect
3737
go.opentelemetry.io/collector/extension v0.116.0 // indirect
38-
go.opentelemetry.io/collector/extension/experimental/storage v0.116.0 // indirect
38+
go.opentelemetry.io/collector/extension/xextension v0.116.0 // indirect
3939
go.opentelemetry.io/collector/featuregate v1.22.0 // indirect
4040
go.opentelemetry.io/collector/receiver/xreceiver v0.116.0 // indirect
4141
go.opentelemetry.io/otel v1.32.0 // indirect
@@ -55,8 +55,6 @@ require (
5555

5656
replace go.opentelemetry.io/collector/exporter => ../../exporter
5757

58-
replace go.opentelemetry.io/collector/extension/experimental/storage => ../../extension/experimental/storage
59-
6058
replace go.opentelemetry.io/collector/pdata/pprofile => ../../pdata/pprofile
6159

6260
replace go.opentelemetry.io/collector/receiver => ../../receiver
@@ -98,3 +96,5 @@ replace go.opentelemetry.io/collector/scraper => ../../scraper
9896
replace go.opentelemetry.io/collector/featuregate => ../../featuregate
9997

10098
replace go.opentelemetry.io/collector/scraper/scraperhelper => ../../scraper/scraperhelper
99+
100+
replace go.opentelemetry.io/collector/extension/xextension => ../../extension/xextension

exporter/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ require (
1313
go.opentelemetry.io/collector/consumer/consumererror v0.116.0
1414
go.opentelemetry.io/collector/consumer/consumertest v0.116.0
1515
go.opentelemetry.io/collector/exporter/exportertest v0.116.0
16-
go.opentelemetry.io/collector/extension/experimental/storage v0.116.0
1716
go.opentelemetry.io/collector/extension/extensiontest v0.116.0
17+
go.opentelemetry.io/collector/extension/xextension v0.116.0
1818
go.opentelemetry.io/collector/featuregate v1.22.0
1919
go.opentelemetry.io/collector/pdata v1.22.0
2020
go.opentelemetry.io/collector/pdata/pprofile v0.116.0
@@ -64,8 +64,6 @@ replace go.opentelemetry.io/collector/consumer => ../consumer
6464

6565
replace go.opentelemetry.io/collector/extension => ../extension
6666

67-
replace go.opentelemetry.io/collector/extension/experimental/storage => ../extension/experimental/storage
68-
6967
replace go.opentelemetry.io/collector/pdata => ../pdata
7068

7169
replace go.opentelemetry.io/collector/pdata/testdata => ../pdata/testdata
@@ -103,3 +101,5 @@ replace go.opentelemetry.io/collector/scraper => ../scraper
103101
replace go.opentelemetry.io/collector/featuregate => ../featuregate
104102

105103
replace go.opentelemetry.io/collector/scraper/scraperhelper => ../scraper/scraperhelper
104+
105+
replace go.opentelemetry.io/collector/extension/xextension => ../extension/xextension

0 commit comments

Comments
 (0)