Skip to content

Commit

Permalink
Merge branch 'main' into sili-queue-tiny-4
Browse files Browse the repository at this point in the history
  • Loading branch information
sfc-gh-sili authored Nov 5, 2024
2 parents 56d3cd1 + 3da496b commit 9025bba
Show file tree
Hide file tree
Showing 163 changed files with 1,335 additions and 1,758 deletions.
25 changes: 0 additions & 25 deletions .chloggen/add-otlp-distro.yaml

This file was deleted.

25 changes: 0 additions & 25 deletions .chloggen/add-pkg-processorhelperprofiles.yaml

This file was deleted.

25 changes: 0 additions & 25 deletions .chloggen/addNewTelemetrySettings.yaml

This file was deleted.

25 changes: 0 additions & 25 deletions .chloggen/codeboten_add-log-record-processor-config.yaml

This file was deleted.

25 changes: 0 additions & 25 deletions .chloggen/fanoutconsumer-module.yaml

This file was deleted.

25 changes: 0 additions & 25 deletions .chloggen/julianocosta89-debugexporter-profiles.yaml

This file was deleted.

25 changes: 0 additions & 25 deletions .chloggen/receivertest-module.yaml

This file was deleted.

25 changes: 0 additions & 25 deletions .chloggen/sharedcomponent-module.yaml

This file was deleted.

25 changes: 0 additions & 25 deletions .chloggen/stabilityunmarshal.yaml

This file was deleted.

61 changes: 61 additions & 0 deletions .github/ISSUE_TEMPLATE/vote.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
---
name: Vote
about: Vote to make a decision related to an RFC
title: '[Vote] RFC #XXXX:'
labels: "rfc:vote-needed"
assignees: ''
---

A [vote](https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/rfcs/README.md#voting) has been called for RFC #XXXX following the RFC process.

### Stakeholders

Any person in the community may vote. Votes of the stakeholders are binding. Stakeholders are
encouraged to consider the views from the wider community when casting their vote. As defined in the
RFC, there are N stakeholders for this RFC divided as follows:

| Stakeholders | As defined on date | Number of people |
|-------------------------------------|--------------------|------------------|
| @open-telemetry/collector-approvers | yyyy-mm-dd | N |

<!--Add additional rows if there are additional stakeholders for the RFC-->

For any stakeholder team, we consider the people that were part of the team at the time the vote is called.

### Voting options

| Option | Description | # Votes (stakeholders) | # Votes (total) |
|--------|-------------|------------------------|-----------------|
| Option 1 | Description of the option | 0 | 0 |

<!--Add additional rows if there are additional options for the RFC-->

### Result

The vote is in progress. A minimum of X votes is required to select an option.

<!--Uncomment the sentence below when the vote has been closed and the result is known.-->
<!--The vote has been closed. X stakeholders voted out of a total of Y. **Option N** has been selected with Z votes from the stakeholders.-->

### Vote process

Please **leave a comment** with your vote and any additional context you would like to provide.
Start your comment with "I vote for **Option N**." and then provide any additional context.

### Related links

Include here any links to the RFC, other PRs and resources that help make an informed vote.

### Checklists

When starting the vote:

- [ ] Announce the vote in the #otel-collector-dev CNCF Slack channel.
- [ ] Add an entry to announce the vote in the next Collector SIG meeting.

For closing the vote:

- [ ] At least five business days have passed since the vote was announced.
- [ ] At least one-third of the stakeholders have voted.
- [ ] The "Voting options" and "Result" sections have been updated reflecting the votes casted.
- [ ] The RFC has been updated reflecting the votes casted.
1 change: 1 addition & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ linters:
- unused
- unparam
- usestdlibvars
- whitespace

issues:
# Excluding configuration per-path, per-linter, per-text and per-source
Expand Down
17 changes: 17 additions & 0 deletions CHANGELOG-API.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,23 @@ If you are looking for user-facing changes, check out [CHANGELOG.md](./CHANGELOG

<!-- next version -->

## v1.19.0/v0.113.0

### 🛑 Breaking changes 🛑

- `builder`: Remove deprecated flags from Builder (#11576)
Here is the list of flags | --name, --description, --version, --otelcol-version, --go, --module

### 🚀 New components 🚀

- `processorhelperprofiles`: Add processorhelperprofiles to support profiles signal (#11556)

### 💡 Enhancements 💡

- `mdatagen`: Add newTelemetrySettings to be generated all the time even for pkg class (#11535)
- `debugexporter`: Add profiles support to debug exporter (#11155)
- `component`: Add UnmarshalText for StabilityLevel (#11520)

## v1.18.0/v0.112.0

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

<!-- next version -->

## v1.19.0/v0.113.0

### 🛑 Breaking changes 🛑

- `internal/fanoutconsumer`: Extract internal/fanoutconsumer as a separate go module (#11441)
- `builder`: Remove builder support to build old version, and the otelcol_version config (#11405)
User should remove this property from their config, to build older versions use older builders.
- `receiver`: Make receivertest into its own module (#11462)
- `builder`: Remove deprecated flags from Builder (#11576)
Here is the list of flags | --name, --description, --version, --otelcol-version, --go, --module
- `internal/sharedcomponent`: Extract internal/sharedcomponent as a separate go module (#11442)

### 💡 Enhancements 💡

- `mdatagen`: Add otlp as supported distribution (#11527)
- `batchprocessor`: Move single shard batcher creation to the constructor (#11594)
- `service`: add support for using the otelzap bridge and emit logs using the OTel Go SDK (#10544)

### 🧰 Bug fixes 🧰

- `service`: ensure traces and logs emitted by the otel go SDK use the same resource information (#11578)
- `config/configgrpc`: Patch for bug in the grpc-go NewClient that makes the way the hostname is resolved incompatible with the way proxy setting are applied. (#11537)
- `builder`: Update builder default providers to lastest stable releases (#11566)

## v1.18.0/v0.112.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.22.0

require (
github.com/stretchr/testify v1.9.0
go.opentelemetry.io/collector/consumer v0.112.0
go.opentelemetry.io/collector/pdata v1.18.0
go.opentelemetry.io/collector/consumer v0.113.0
go.opentelemetry.io/collector/pdata v1.19.0
go.uber.org/goleak v1.3.0
)

Expand Down
1 change: 0 additions & 1 deletion cmd/builder/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@ dist:
module: github.com/open-telemetry/opentelemetry-collector # the module name for the new distribution, following Go mod conventions. Optional, but recommended.
name: otelcol-custom # the binary name. Optional.
description: "Custom OpenTelemetry Collector distribution" # a long name for the application. Optional.
otelcol_version: "0.40.0" # the OpenTelemetry Collector version to use as base for the distribution. Optional.
output_path: /tmp/otelcol-distributionNNN # the path to write the output (sources and binary). Optional.
version: "1.0.0" # the version for your custom OpenTelemetry Collector. Optional.
go: "/usr/bin/go" # which Go binary to use to compile the generated sources. Optional.
Expand Down
Loading

0 comments on commit 9025bba

Please sign in to comment.