Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[chore] Prepare release v1.7.0/v0.100.0 #10087

Merged
merged 8 commits into from
May 6, 2024
Merged

[chore] Prepare release v1.7.0/v0.100.0 #10087

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
23a369a
Changelog update v1.7.0/v0.100.0
opentelemetrybot May 6, 2024
641813a
prepare release 1.7.0
opentelemetrybot May 6, 2024
14e3003
Prepare stable for version v1.7.0
opentelemetrybot May 6, 2024
64b8e83
add multimod changes 1.7.0
opentelemetrybot May 6, 2024
53d1bce
prepare release 0.100.0
opentelemetrybot May 6, 2024
3af5bf4
Prepare beta for version v0.100.0
opentelemetrybot May 6, 2024
080b270
add multimod changes 0.100.0
opentelemetrybot May 6, 2024
cc20543
Revert changes to backwards compatibility (#10088)
bogdandrutu May 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 0 additions & 20 deletions .chloggen/batch-sender-fix-enabled-config.yaml
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions .chloggen/callconnectorwithrouter.yaml
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions .chloggen/codeboten_10072.yaml
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions .chloggen/codeboten_remove-ambiguous-import-code.yaml
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions .chloggen/configgrpc-add-newdefault-funcs.yaml
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions .chloggen/expose-err-queue-full.yaml
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions .chloggen/json-metric-metadata.yaml
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions .chloggen/revert-validate-pipeline-types.yaml
View file
Open in desktop

This file was deleted.

11 changes: 11 additions & 0 deletions CHANGELOG-API.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,17 @@ If you are looking for user-facing changes, check out [CHANGELOG.md](./CHANGELOG

<!-- next version -->

## v1.7.0/v0.100.0

### 💡 Enhancements 💡

- `configgrpc`: Adds `NewDefault*` functions for all the config structs. (#9654)
- `exporterqueue`: Expose ErrQueueIsFull so upstream components can retry or apply backpressure. (#10070)

### 🧰 Bug fixes 🧰

- `mdatagen`: Call connectors with routers to be the same as the service graph (#10079)

## v1.6.0/v0.99.0

### 🛑 Breaking changes 🛑
Expand Down
16 changes: 16 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,22 @@ If you are looking for developer-facing changes, check out [CHANGELOG-API.md](./

<!-- next version -->

## v1.7.0/v0.100.0

### 🛑 Breaking changes 🛑

- `service`: The `validate` sub-command no longer validates that each pipeline's type is the same as its component types (#10031)

### 💡 Enhancements 💡

- `semconv`: Add support for v1.25.0 semantic convention (#10072)
- `builder`: remove the need to go get a module to address ambiguous import paths (#10015)
- `pmetric`: Support parsing metric.metadata from OTLP JSON. (#10026)

### 🧰 Bug fixes 🧰

- `exporterhelper`: Fix enabled config option for batch sender (#10076)

## v1.6.0/v0.99.0

### 🛑 Breaking changes 🛑
Expand Down
6 changes: 3 additions & 3 deletions cmd/builder/internal/builder/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"go.uber.org/zap"
)

const defaultOtelColVersion = "0.99.0"
const defaultOtelColVersion = "0.100.0"

// ErrInvalidGoMod indicates an invalid gomod
var ErrInvalidGoMod = errors.New("invalid gomod specification for module")
Expand Down Expand Up @@ -54,7 +54,7 @@ type Distribution struct {
Description string `mapstructure:"description"`
OtelColVersion string `mapstructure:"otelcol_version"`
RequireOtelColModule bool `mapstructure:"-"` // required for backwards-compatibility with builds older than 0.86.0
SupportsConfmapFactories bool `mapstructure:"-"` // Required for backwards-compatibility with builds older than 0.99.0
SupportsConfmapFactories bool `mapstructure:"-"` // Required for backwards-compatibility with builds older than 0.100.0
bogdandrutu marked this conversation as resolved.
Show resolved Hide resolved
OutputPath string `mapstructure:"output_path"`
Version string `mapstructure:"version"`
BuildTags string `mapstructure:"build_tags"`
Expand Down Expand Up @@ -149,7 +149,7 @@ func (c *Config) SetBackwardsCompatibility() error {
c.Distribution.RequireOtelColModule = constraint.Check(otelColVersion)

// check whether confmap factories are supported
constraint, err = version.NewConstraint(">= 0.99.0")
constraint, err = version.NewConstraint(">= 0.100.0")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@codeboten, @evan-bradley not sure if you are aware of this bug, but the release action will mess with the backwards compatible constrains that are added at the latest version.

bogdandrutu marked this conversation as resolved.
Show resolved Hide resolved
if err != nil {
return err
}
Expand Down
41 changes: 21 additions & 20 deletions cmd/builder/internal/config/default.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,32 @@ dist:
module: go.opentelemetry.io/collector/cmd/otelcorecol
name: otelcorecol
description: Local OpenTelemetry Collector binary, testing only.
version: 0.99.0-dev
otelcol_version: 0.99.0
version: 0.100.0-dev
otelcol_version: 0.100.0

receivers:
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.99.0
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.99.0
- gomod: go.opentelemetry.io/collector/receiver/nopreceiver v0.100.0
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.100.0
exporters:
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.99.0
- gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.99.0
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.99.0
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.99.0
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.99.0
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.100.0
- gomod: go.opentelemetry.io/collector/exporter/loggingexporter v0.100.0
- gomod: go.opentelemetry.io/collector/exporter/nopexporter v0.100.0
- gomod: go.opentelemetry.io/collector/exporter/otlpexporter v0.100.0
- gomod: go.opentelemetry.io/collector/exporter/otlphttpexporter v0.100.0
extensions:
- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.99.0
- gomod: go.opentelemetry.io/collector/extension/memorylimiterextension v0.99.0
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.99.0
- gomod: go.opentelemetry.io/collector/extension/ballastextension v0.100.0
- gomod: go.opentelemetry.io/collector/extension/memorylimiterextension v0.100.0
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.100.0
processors:
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.99.0
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.99.0
- gomod: go.opentelemetry.io/collector/processor/batchprocessor v0.100.0
- gomod: go.opentelemetry.io/collector/processor/memorylimiterprocessor v0.100.0
connectors:
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.99.0
- gomod: go.opentelemetry.io/collector/connector/forwardconnector v0.100.0

providers:
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.99.0
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.99.0
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.99.0
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.99.0
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.99.0
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v0.100.0
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v0.100.0
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v0.100.0
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v0.100.0
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v0.100.0

8 changes: 4 additions & 4 deletions cmd/builder/test/core.builder.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
dist:
module: go.opentelemetry.io/collector/builder/test/core
otelcol_version: 0.99.0
otelcol_version: 0.100.0

extensions:
- import: go.opentelemetry.io/collector/extension/zpagesextension
gomod: go.opentelemetry.io/collector v0.99.0
gomod: go.opentelemetry.io/collector v0.100.0
path: ${WORKSPACE_DIR}

receivers:
- import: go.opentelemetry.io/collector/receiver/otlpreceiver
gomod: go.opentelemetry.io/collector v0.99.0
gomod: go.opentelemetry.io/collector v0.100.0
path: ${WORKSPACE_DIR}

exporters:
- import: go.opentelemetry.io/collector/exporter/debugexporter
gomod: go.opentelemetry.io/collector v0.99.0
gomod: go.opentelemetry.io/collector v0.100.0
path: ${WORKSPACE_DIR}

replaces:
Expand Down
18 changes: 9 additions & 9 deletions cmd/mdatagen/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ go 1.21
require (
github.com/google/go-cmp v0.6.0
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/component v0.99.0
go.opentelemetry.io/collector/confmap v0.99.0
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.99.0
go.opentelemetry.io/collector/consumer v0.99.0
go.opentelemetry.io/collector/filter v0.99.0
go.opentelemetry.io/collector/pdata v1.6.0
go.opentelemetry.io/collector/receiver v0.99.0
go.opentelemetry.io/collector/semconv v0.99.0
go.opentelemetry.io/collector/component v0.100.0
go.opentelemetry.io/collector/confmap v0.100.0
go.opentelemetry.io/collector/confmap/provider/fileprovider v0.100.0
go.opentelemetry.io/collector/consumer v0.100.0
go.opentelemetry.io/collector/filter v0.100.0
go.opentelemetry.io/collector/pdata v1.7.0
go.opentelemetry.io/collector/receiver v0.100.0
go.opentelemetry.io/collector/semconv v0.100.0
go.opentelemetry.io/otel/metric v1.26.0
go.opentelemetry.io/otel/trace v1.26.0
go.uber.org/goleak v1.3.0
Expand Down Expand Up @@ -42,7 +42,7 @@ require (
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.53.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.99.0 // indirect
go.opentelemetry.io/collector/config/configtelemetry v0.100.0 // indirect
go.opentelemetry.io/otel v1.26.0 // indirect
go.opentelemetry.io/otel/exporters/prometheus v0.48.0 // indirect
go.opentelemetry.io/otel/sdk v1.26.0 // indirect
Expand Down
Loading
Loading