diff --git a/.chloggen/connector-factory-map.yaml b/.chloggen/connector-factory-map.yaml deleted file mode 100755 index 47061053302..00000000000 --- a/.chloggen/connector-factory-map.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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. otlpreceiver) -component: connector - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Add MakeFactoryMap - -# One or more tracking issues or pull requests related to the change -issues: [6889] - -# (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: diff --git a/.chloggen/opaque-fixed-length.yaml b/.chloggen/opaque-fixed-length.yaml deleted file mode 100644 index 4e80ba575cf..00000000000 --- a/.chloggen/opaque-fixed-length.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: bug_fix - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: config - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: use [REDACTED] when marshaling to text a configopaque.String, instead of disclosing secret length. - -# One or more tracking issues or pull requests related to the change -issues: [6868] - -# (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: diff --git a/.chloggen/rm-deprecated-exporter.yaml b/.chloggen/rm-deprecated-exporter.yaml deleted file mode 100755 index c924e98775e..00000000000 --- a/.chloggen/rm-deprecated-exporter.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: breaking - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: component - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Remove deprecated Exporter types - -# One or more tracking issues or pull requests related to the change -issues: [6880] - -# (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: diff --git a/.chloggen/rm-deprecated-extension.yaml b/.chloggen/rm-deprecated-extension.yaml deleted file mode 100755 index 467ee9c6edc..00000000000 --- a/.chloggen/rm-deprecated-extension.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: breaking - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: component - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Remove deprecated Extension types - -# One or more tracking issues or pull requests related to the change -issues: [6865] - -# (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: diff --git a/.chloggen/rm-deprecated-processor.yaml b/.chloggen/rm-deprecated-processor.yaml deleted file mode 100755 index d4a5722480a..00000000000 --- a/.chloggen/rm-deprecated-processor.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: breaking - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: component - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Remove deprecated ProcessorFactoryOptions - -# One or more tracking issues or pull requests related to the change -issues: [6881] - -# (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: diff --git a/.chloggen/rm-deprecated-receiver.yaml b/.chloggen/rm-deprecated-receiver.yaml deleted file mode 100755 index 9db0d54539c..00000000000 --- a/.chloggen/rm-deprecated-receiver.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: breaking - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: component - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Remove deprecated Receiver types - -# One or more tracking issues or pull requests related to the change -issues: [6882] - -# (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: diff --git a/.chloggen/rmcomptest.yaml b/.chloggen/rmcomptest.yaml deleted file mode 100755 index 460272dbc13..00000000000 --- a/.chloggen/rmcomptest.yaml +++ /dev/null @@ -1,11 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: breaking - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: componenttest - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Remove deprecated funcs from componenttest - -# One or more tracking issues or pull requests related to the change -issues: [6836] diff --git a/.chloggen/rmdepbatch.yaml b/.chloggen/rmdepbatch.yaml deleted file mode 100644 index 80bb935e1de..00000000000 --- a/.chloggen/rmdepbatch.yaml +++ /dev/null @@ -1,11 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: breaking - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: batchprocessor - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Remove deprecated batchprocessor.MetricViews and batchprocessor.OtelMetricViews - -# One or more tracking issues or pull requests related to the change -issues: [6861] diff --git a/.chloggen/rmdepcompfact.yaml b/.chloggen/rmdepcompfact.yaml deleted file mode 100755 index 88c40635a74..00000000000 --- a/.chloggen/rmdepcompfact.yaml +++ /dev/null @@ -1,11 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: breaking - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: component - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Remove deprecated component.[Factories|MakePorcessorFactoryMap] and componenttest.NewNopFactories - -# One or more tracking issues or pull requests related to the change -issues: [6835] diff --git a/.chloggen/rmdepconfig.yaml b/.chloggen/rmdepconfig.yaml deleted file mode 100755 index f1313b3d2a0..00000000000 --- a/.chloggen/rmdepconfig.yaml +++ /dev/null @@ -1,11 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: breaking - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: config - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Remove deprecated cofig.*Settings - -# One or more tracking issues or pull requests related to the change -issues: [6837] diff --git a/.chloggen/rmdepobsreptest.yaml b/.chloggen/rmdepobsreptest.yaml deleted file mode 100755 index 9a24deee689..00000000000 --- a/.chloggen/rmdepobsreptest.yaml +++ /dev/null @@ -1,11 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: breaking - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: obsereporttest - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Remove deprecated obsereporttest.SetupTelemetryWithID - -# One or more tracking issues or pull requests related to the change -issues: [6861] diff --git a/.chloggen/rmdepprocs.yaml b/.chloggen/rmdepprocs.yaml deleted file mode 100755 index a811fd43e46..00000000000 --- a/.chloggen/rmdepprocs.yaml +++ /dev/null @@ -1,11 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: breaking - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: component - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Remove deprecated component [Traces|Metrics|Logs]Processor and ProcessorFactory - -# One or more tracking issues or pull requests related to the change -issues: [6884] \ No newline at end of file diff --git a/.chloggen/rmdepservcfg.yaml b/.chloggen/rmdepservcfg.yaml deleted file mode 100755 index 81c3e2b9599..00000000000 --- a/.chloggen/rmdepservcfg.yaml +++ /dev/null @@ -1,11 +0,0 @@ -# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix' -change_type: breaking - -# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver) -component: service - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Remove deprecated service service.ConfigService and service.ConfigServicePipeline - -# One or more tracking issues or pull requests related to the change -issues: [6859] diff --git a/.chloggen/semconv_v1.16.0.yaml b/.chloggen/semconv_v1.16.0.yaml deleted file mode 100755 index f6492546aa9..00000000000 --- a/.chloggen/semconv_v1.16.0.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# 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. otlpreceiver) -component: semconv - -# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`). -note: Add semantic conventions for specification v1.16.0 - -# One or more tracking issues or pull requests related to the change -issues: [6714] - -# (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: diff --git a/CHANGELOG.md b/CHANGELOG.md index ef0bc69e837..a78151f99b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,31 @@ +## v1.0.0-RC3/v0.69.0 + +### 🛑 Breaking changes 🛑 + +- `component`: Remove deprecated Exporter types (#6880) +- `component`: Remove deprecated Extension types (#6865) +- `component`: Remove deprecated ProcessorFactoryOptions (#6881) +- `component`: Remove deprecated Receiver types (#6882) +- `componenttest`: Remove deprecated funcs from componenttest (#6836) +- `batchprocessor`: Remove deprecated batchprocessor.MetricViews and batchprocessor.OtelMetricViews (#6861) +- `component`: Remove deprecated component.[Factories|MakePorcessorFactoryMap] and componenttest.NewNopFactories (#6835) +- `config`: Remove deprecated cofig.*Settings (#6837) +- `obsereporttest`: Remove deprecated obsereporttest.SetupTelemetryWithID (#6861) +- `component`: Remove deprecated component [Traces|Metrics|Logs]Processor and ProcessorFactory (#6884) +- `service`: Remove deprecated service service.ConfigService and service.ConfigServicePipeline (#6859) + +### 💡 Enhancements 💡 + +- `connector`: Add MakeFactoryMap (#6889) +- `semconv`: Add semantic conventions for specification v1.16.0 (#6714) + +### 🧰 Bug fixes 🧰 + +- `config`: use [REDACTED] when marshaling to text a configopaque.String, instead of disclosing secret length. (#6868) + ## v1.0.0-RC2/v0.68.0 ### 🛑 Breaking changes 🛑 diff --git a/cmd/builder/internal/builder/config.go b/cmd/builder/internal/builder/config.go index 5b64543f064..c515660c72b 100644 --- a/cmd/builder/internal/builder/config.go +++ b/cmd/builder/internal/builder/config.go @@ -26,7 +26,7 @@ import ( "go.uber.org/zap" ) -const defaultOtelColVersion = "0.68.0" +const defaultOtelColVersion = "0.69.0" // ErrInvalidGoMod indicates an invalid gomod var ErrInvalidGoMod = errors.New("invalid gomod specification for module") diff --git a/cmd/builder/internal/config/default.yaml b/cmd/builder/internal/config/default.yaml index 742db41d1d2..371a8f5db3b 100644 --- a/cmd/builder/internal/config/default.yaml +++ b/cmd/builder/internal/config/default.yaml @@ -2,19 +2,19 @@ dist: module: go.opentelemetry.io/collector/cmd/otelcorecol name: otelcorecol description: Local OpenTelemetry Collector binary, testing only. - version: 0.68.0-dev - otelcol_version: 0.68.0 + version: 0.69.0-dev + otelcol_version: 0.69.0 receivers: - - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.68.0 + - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.69.0 exporters: - - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.68.0 - - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.68.0 - - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.68.0 + - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.69.0 + - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.69.0 + - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.69.0 extensions: - - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.68.0 - - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.68.0 + - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.69.0 + - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.69.0 processors: - - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.68.0 - - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.68.0 + - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.69.0 + - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.69.0 diff --git a/cmd/builder/test/core.builder.yaml b/cmd/builder/test/core.builder.yaml index 81b8854f9fd..d2fe306b690 100644 --- a/cmd/builder/test/core.builder.yaml +++ b/cmd/builder/test/core.builder.yaml @@ -1,20 +1,20 @@ dist: module: go.opentelemetry.io/collector/builder/test/core - otelcol_version: 0.68.0 + otelcol_version: 0.69.0 extensions: - import: go.opentelemetry.io/collector/extension/zpagesextension - gomod: go.opentelemetry.io/collector v0.68.0 + gomod: go.opentelemetry.io/collector v0.69.0 path: ${WORKSPACE_DIR} receivers: - import: go.opentelemetry.io/collector/receiver/otlpreceiver - gomod: go.opentelemetry.io/collector v0.68.0 + gomod: go.opentelemetry.io/collector v0.69.0 path: ${WORKSPACE_DIR} exporters: - import: go.opentelemetry.io/collector/exporter/loggingexporter - gomod: go.opentelemetry.io/collector v0.68.0 + gomod: go.opentelemetry.io/collector v0.69.0 path: ${WORKSPACE_DIR} replaces: diff --git a/cmd/otelcorecol/builder-config.yaml b/cmd/otelcorecol/builder-config.yaml index 4e1949ebf49..dbd96eda34d 100644 --- a/cmd/otelcorecol/builder-config.yaml +++ b/cmd/otelcorecol/builder-config.yaml @@ -2,21 +2,21 @@ dist: module: go.opentelemetry.io/collector/cmd/otelcorecol name: otelcorecol description: Local OpenTelemetry Collector binary, testing only. - version: 0.68.0-dev - otelcol_version: 0.68.0 + version: 0.69.0-dev + otelcol_version: 0.69.0 receivers: - - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.68.0 + - gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.69.0 exporters: - - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.68.0 - - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.68.0 - - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.68.0 + - gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.69.0 + - gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.69.0 + - gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.69.0 extensions: - - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.68.0 - - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.68.0 + - gomod: go.opentelemetry.io/collector/extension/ballastextension v0.69.0 + - gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.69.0 processors: - - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.68.0 - - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.68.0 + - gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.69.0 + - gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.69.0 replaces: - go.opentelemetry.io/collector => ../../ diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod index ac77d2119e4..3a4a2129027 100644 --- a/cmd/otelcorecol/go.mod +++ b/cmd/otelcorecol/go.mod @@ -6,16 +6,16 @@ go 1.18 require ( github.com/stretchr/testify v1.8.1 - go.opentelemetry.io/collector v0.68.0 + go.opentelemetry.io/collector v0.69.0 go.opentelemetry.io/collector/component v0.68.0 - go.opentelemetry.io/collector/exporter/loggingexporter v0.68.0 - go.opentelemetry.io/collector/exporter/otlpexporter v0.68.0 - go.opentelemetry.io/collector/exporter/otlphttpexporter v0.68.0 - go.opentelemetry.io/collector/extension/ballastextension v0.68.0 - go.opentelemetry.io/collector/extension/zpagesextension v0.68.0 - go.opentelemetry.io/collector/processor/batchprocessor v0.68.0 - go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.68.0 - go.opentelemetry.io/collector/receiver/otlpreceiver v0.68.0 + go.opentelemetry.io/collector/exporter/loggingexporter v0.69.0 + go.opentelemetry.io/collector/exporter/otlpexporter v0.69.0 + go.opentelemetry.io/collector/exporter/otlphttpexporter v0.69.0 + go.opentelemetry.io/collector/extension/ballastextension v0.69.0 + go.opentelemetry.io/collector/extension/zpagesextension v0.69.0 + go.opentelemetry.io/collector/processor/batchprocessor v0.69.0 + go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.69.0 + go.opentelemetry.io/collector/receiver/otlpreceiver v0.69.0 golang.org/x/sys v0.3.0 ) diff --git a/cmd/otelcorecol/main.go b/cmd/otelcorecol/main.go index d23c222c130..55e39ddca3c 100644 --- a/cmd/otelcorecol/main.go +++ b/cmd/otelcorecol/main.go @@ -19,7 +19,7 @@ func main() { info := component.BuildInfo{ Command: "otelcorecol", Description: "Local OpenTelemetry Collector binary, testing only.", - Version: "0.68.0-dev", + Version: "0.69.0-dev", } if err := run(otelcol.CollectorSettings{BuildInfo: info, Factories: factories}); err != nil { diff --git a/versions.yaml b/versions.yaml index d37cce359ca..b66e7a08f01 100644 --- a/versions.yaml +++ b/versions.yaml @@ -14,11 +14,11 @@ module-sets: stable: - version: v1.0.0-rc2 + version: v1.0.0-rc3 modules: - go.opentelemetry.io/collector/pdata beta: - version: v0.68.0 + version: v0.69.0 modules: - go.opentelemetry.io/collector - go.opentelemetry.io/collector/component