Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
26 changes: 0 additions & 26 deletions .chloggen/mx-psi_bump-prometheus-0.59.1.yaml

This file was deleted.

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

<!-- next version -->

## v1.36.1/v0.130.1

<!-- previous-version -->

No API-only changes in this release.

## v1.36.0/v0.130.0

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

<!-- next version -->

## v1.36.1/v0.130.1

### 🧰 Bug fixes 🧰

- `service`: Fixes bug where internal metrics are emitted with an unexpected suffix in their names when users configure `service::telemetry::metrics::readers` with Prometheus. (#13449)
See more details on https://github.com/open-telemetry/opentelemetry-go/issues/7039

<!-- previous-version -->

## v1.36.0/v0.130.0

### 🛑 Breaking changes 🛑
Expand Down
4 changes: 2 additions & 2 deletions client/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ go 1.23.0

require (
github.com/stretchr/testify v1.10.0
go.opentelemetry.io/collector/consumer v1.36.0
go.opentelemetry.io/collector/pdata v1.36.0
go.opentelemetry.io/collector/consumer v1.36.1
go.opentelemetry.io/collector/pdata v1.36.1
go.uber.org/goleak v1.3.0
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/builder/internal/builder/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
)

const (
defaultBetaOtelColVersion = "v0.130.0"
defaultStableOtelColVersion = "v1.36.0"
defaultBetaOtelColVersion = "v0.130.1"
defaultStableOtelColVersion = "v1.36.1"
)

// errMissingGoMod indicates an empty gomod field
Expand Down
34 changes: 17 additions & 17 deletions cmd/builder/internal/config/default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,29 +10,29 @@ dist:
module: go.opentelemetry.io/collector/cmd/otelcorecol
name: otelcorecol
description: Local OpenTelemetry Collector binary, testing only.
version: 0.130.0-dev
version: 0.130.1-dev

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

providers:
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.36.0
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.36.0
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v1.36.0
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.36.0
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.36.0
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.36.1
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.36.1
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v1.36.1
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.36.1
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.36.1

6 changes: 3 additions & 3 deletions cmd/builder/test/core.builder.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ dist:
go: ${GOBIN}

extensions:
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.130.0
- gomod: go.opentelemetry.io/collector/extension/zpagesextension v0.130.1

receivers:
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.130.0
- gomod: go.opentelemetry.io/collector/receiver/otlpreceiver v0.130.1

exporters:
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.130.0
- gomod: go.opentelemetry.io/collector/exporter/debugexporter v0.130.1
58 changes: 29 additions & 29 deletions cmd/mdatagen/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@ require (
github.com/google/go-cmp v0.7.0
github.com/spf13/cobra v1.9.1
github.com/stretchr/testify v1.10.0
go.opentelemetry.io/collector/component v1.36.0
go.opentelemetry.io/collector/component/componenttest v0.130.0
go.opentelemetry.io/collector/confmap v1.36.0
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.36.0
go.opentelemetry.io/collector/connector v0.130.0
go.opentelemetry.io/collector/connector/connectortest v0.130.0
go.opentelemetry.io/collector/consumer v1.36.0
go.opentelemetry.io/collector/consumer/consumertest v0.130.0
go.opentelemetry.io/collector/filter v0.130.0
go.opentelemetry.io/collector/pdata v1.36.0
go.opentelemetry.io/collector/pipeline v0.130.0
go.opentelemetry.io/collector/processor v1.36.0
go.opentelemetry.io/collector/processor/processortest v0.130.0
go.opentelemetry.io/collector/receiver v1.36.0
go.opentelemetry.io/collector/receiver/receivertest v0.130.0
go.opentelemetry.io/collector/scraper v0.130.0
go.opentelemetry.io/collector/scraper/scrapertest v0.130.0
go.opentelemetry.io/collector/component v1.36.1
go.opentelemetry.io/collector/component/componenttest v0.130.1
go.opentelemetry.io/collector/confmap v1.36.1
go.opentelemetry.io/collector/confmap/provider/fileprovider v1.36.1
go.opentelemetry.io/collector/connector v0.130.1
go.opentelemetry.io/collector/connector/connectortest v0.130.1
go.opentelemetry.io/collector/consumer v1.36.1
go.opentelemetry.io/collector/consumer/consumertest v0.130.1
go.opentelemetry.io/collector/filter v0.130.1
go.opentelemetry.io/collector/pdata v1.36.1
go.opentelemetry.io/collector/pipeline v0.130.1
go.opentelemetry.io/collector/processor v1.36.1
go.opentelemetry.io/collector/processor/processortest v0.130.1
go.opentelemetry.io/collector/receiver v1.36.1
go.opentelemetry.io/collector/receiver/receivertest v0.130.1
go.opentelemetry.io/collector/scraper v0.130.1
go.opentelemetry.io/collector/scraper/scrapertest v0.130.1
go.opentelemetry.io/otel v1.37.0
go.opentelemetry.io/otel/metric v1.37.0
go.opentelemetry.io/otel/sdk/metric v1.37.0
Expand Down Expand Up @@ -53,18 +53,18 @@ require (
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/spf13/pflag v1.0.6 // indirect
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
go.opentelemetry.io/collector/component/componentstatus v0.130.0 // indirect
go.opentelemetry.io/collector/connector/xconnector v0.130.0 // indirect
go.opentelemetry.io/collector/consumer/consumererror v0.130.0 // indirect
go.opentelemetry.io/collector/consumer/xconsumer v0.130.0 // indirect
go.opentelemetry.io/collector/featuregate v1.36.0 // indirect
go.opentelemetry.io/collector/internal/fanoutconsumer v0.130.0 // indirect
go.opentelemetry.io/collector/internal/telemetry v0.130.0 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.130.0 // indirect
go.opentelemetry.io/collector/pdata/testdata v0.130.0 // indirect
go.opentelemetry.io/collector/pipeline/xpipeline v0.130.0 // indirect
go.opentelemetry.io/collector/processor/xprocessor v0.130.0 // indirect
go.opentelemetry.io/collector/receiver/xreceiver v0.130.0 // indirect
go.opentelemetry.io/collector/component/componentstatus v0.130.1 // indirect
go.opentelemetry.io/collector/connector/xconnector v0.130.1 // indirect
go.opentelemetry.io/collector/consumer/consumererror v0.130.1 // indirect
go.opentelemetry.io/collector/consumer/xconsumer v0.130.1 // indirect
go.opentelemetry.io/collector/featuregate v1.36.1 // indirect
go.opentelemetry.io/collector/internal/fanoutconsumer v0.130.1 // indirect
go.opentelemetry.io/collector/internal/telemetry v0.130.1 // indirect
go.opentelemetry.io/collector/pdata/pprofile v0.130.1 // indirect
go.opentelemetry.io/collector/pdata/testdata v0.130.1 // indirect
go.opentelemetry.io/collector/pipeline/xpipeline v0.130.1 // indirect
go.opentelemetry.io/collector/processor/xprocessor v0.130.1 // indirect
go.opentelemetry.io/collector/receiver/xreceiver v0.130.1 // indirect
go.opentelemetry.io/contrib/bridges/otelzap v0.12.0 // indirect
go.opentelemetry.io/otel/log v0.13.0 // indirect
go.opentelemetry.io/otel/sdk v1.37.0 // indirect
Expand Down
34 changes: 17 additions & 17 deletions cmd/otelcorecol/builder-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,31 +10,31 @@ dist:
module: go.opentelemetry.io/collector/cmd/otelcorecol
name: otelcorecol
description: Local OpenTelemetry Collector binary, testing only.
version: 0.130.0-dev
version: 0.130.1-dev

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

providers:
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.36.0
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.36.0
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v1.36.0
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.36.0
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.36.0
- gomod: go.opentelemetry.io/collector/confmap/provider/envprovider v1.36.1
- gomod: go.opentelemetry.io/collector/confmap/provider/fileprovider v1.36.1
- gomod: go.opentelemetry.io/collector/confmap/provider/httpprovider v1.36.1
- gomod: go.opentelemetry.io/collector/confmap/provider/httpsprovider v1.36.1
- gomod: go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.36.1

replaces:
- go.opentelemetry.io/collector => ../../
Expand Down
22 changes: 11 additions & 11 deletions cmd/otelcorecol/components.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading