Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: open-telemetry/opentelemetry-collector
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.121.0
Choose a base ref
...
head repository: open-telemetry/opentelemetry-collector
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v0.122.0
Choose a head ref
Loading
Showing 438 changed files with 11,969 additions and 5,499 deletions.
2 changes: 2 additions & 0 deletions .chloggen/config.yaml
Original file line number Diff line number Diff line change
@@ -12,6 +12,8 @@ entries_dir: .chloggen
# (Optional) Default: .chloggen/TEMPLATE.yaml
template_yaml: .chloggen/TEMPLATE.yaml

summary_template: .chloggen/summary.tmpl

# The CHANGELOG file or files to which 'chloggen update' will write new entries
# (Optional) Default filename: CHANGELOG.md
change_logs:
25 changes: 25 additions & 0 deletions .chloggen/fix_cmd_mdata-gen-metrics.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Use this changelog template to create an entry for release notes.

# 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: mdatagen

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Fix mdatagen generated_metrics for connectors

# One or more tracking issues or pull requests related to the change
issues: [12402]

# (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:

# Optional: The change log or logs in which this entry should be included.
# e.g. '[user]' or '[user, api]'
# Include 'user' if the change is relevant to end users.
# Include 'api' if there is a change to a library API.
# Default: '[user]'
change_logs: [api]
70 changes: 70 additions & 0 deletions .chloggen/summary.tmpl
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
{{- define "entry" -}}
- `{{ .Component }}`: {{ .Note }} (
{{- range $i, $issue := .Issues }}
{{- if $i }}, {{ end -}}
#{{ $issue }}
{{- end -}}
)

{{- if .SubText }}
{{ .SubText | indent 2 }}
{{- end }}
{{- end }}
## {{ .Version }}

{{- if .BreakingChanges }}

### 🛑 Breaking changes 🛑

{{- range $i, $change := .BreakingChanges }}
{{- if eq $i 0}}
{{end}}
{{ template "entry" $change }}
{{- end }}
{{- end }}

{{- if .Deprecations }}

### 🚩 Deprecations 🚩

{{- range $i, $change := .Deprecations }}
{{- if eq $i 0}}
{{end}}
{{ template "entry" $change }}
{{- end }}
{{- end }}

{{- if .NewComponents }}

### 🚀 New components 🚀

{{- range $i, $change := .NewComponents }}
{{- if eq $i 0}}
{{end}}
{{ template "entry" $change }}
{{- end }}
{{- end }}

{{- if .Enhancements }}

### 💡 Enhancements 💡

{{- range $i, $change := .Enhancements }}
{{- if eq $i 0}}
{{end}}
{{ template "entry" $change }}
{{- end }}
{{- end }}

{{- if .BugFixes }}

### 🧰 Bug fixes 🧰

{{- range $i, $change := .BugFixes }}
{{- if eq $i 0}}
{{end}}
{{ template "entry" $change }}
{{- end }}
{{- end }}

<!-- previous-version -->
6 changes: 6 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -18,11 +18,17 @@

# Start components list

cmd/builder/ @open-telemetry/collector-approvers
cmd/mdatagen/ @open-telemetry/collector-approvers @dmitryax
cmd/mdatagen/internal/sampleprocessor/ @open-telemetry/collector-approvers
cmd/mdatagen/internal/samplereceiver/ @open-telemetry/collector-approvers @dmitryax
cmd/mdatagen/internal/samplescraper/ @open-telemetry/collector-approvers @dmitryax
confmap/ @open-telemetry/collector-approvers @mx-psi @evan-bradley
confmap/provider/envprovider/ @open-telemetry/collector-approvers
confmap/provider/fileprovider/ @open-telemetry/collector-approvers
confmap/provider/httpprovider/ @open-telemetry/collector-approvers
confmap/provider/httpsprovider/ @open-telemetry/collector-approvers
confmap/provider/yamlprovider/ @open-telemetry/collector-approvers
connector/forwardconnector/ @open-telemetry/collector-approvers
connector/xconnector/ @open-telemetry/collector-approvers @mx-psi @dmathieu
consumer/xconsumer/ @open-telemetry/collector-approvers @mx-psi @dmathieu
6 changes: 6 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
@@ -18,11 +18,17 @@ body:
# NOTE: The list below is autogenerated using `make generate-gh-issue-templates`
# Do not manually edit it.
# Start components list
- cmd/builder
- cmd/mdatagen
- cmd/mdatagen/internal/sampleprocessor
- cmd/mdatagen/internal/samplereceiver
- cmd/mdatagen/internal/samplescraper
- confmap
- confmap/provider/envprovider
- confmap/provider/fileprovider
- confmap/provider/httpprovider
- confmap/provider/httpsprovider
- confmap/provider/yamlprovider
- connector/forward
- connector/x
- consumer/xconsumer
6 changes: 6 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yaml
Original file line number Diff line number Diff line change
@@ -12,11 +12,17 @@ body:
# NOTE: The list below is autogenerated using `make generate-gh-issue-templates`
# Do not manually edit it.
# Start components list
- cmd/builder
- cmd/mdatagen
- cmd/mdatagen/internal/sampleprocessor
- cmd/mdatagen/internal/samplereceiver
- cmd/mdatagen/internal/samplescraper
- confmap
- confmap/provider/envprovider
- confmap/provider/fileprovider
- confmap/provider/httpprovider
- confmap/provider/httpsprovider
- confmap/provider/yamlprovider
- connector/forward
- connector/x
- consumer/xconsumer
6 changes: 6 additions & 0 deletions .github/ISSUE_TEMPLATE/other.yaml
Original file line number Diff line number Diff line change
@@ -11,11 +11,17 @@ body:
# NOTE: The list below is autogenerated using `make generate-gh-issue-templates`
# Do not manually edit it.
# Start components list
- cmd/builder
- cmd/mdatagen
- cmd/mdatagen/internal/sampleprocessor
- cmd/mdatagen/internal/samplereceiver
- cmd/mdatagen/internal/samplescraper
- confmap
- confmap/provider/envprovider
- confmap/provider/fileprovider
- confmap/provider/httpprovider
- confmap/provider/httpsprovider
- confmap/provider/yamlprovider
- connector/forward
- connector/x
- consumer/xconsumer
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: 'Add code owners to a PR'
name: 'Add labels and code owners to PR'
on:
pull_request_target:
types:
@@ -8,7 +8,7 @@ on:
permissions: read-all

jobs:
add-owners-to-pr:
add-labels-and-owners:
permissions:
pull-requests: write
runs-on: ubuntu-24.04
@@ -17,7 +17,7 @@ jobs:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: Run add-codeowners-to-pr.sh
run: ./.github/workflows/scripts/add-codeowners-to-pr.sh
run: ./.github/workflows/scripts/add-labels-and-owners.sh
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
REPO: ${{ github.repository }}
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ on:
permissions: read-all

jobs:
add-labels:
add-labels-command:
if: ${{ !github.event.issue.pull_request && startsWith(github.event.comment.body, '/label') && github.repository_owner == 'open-telemetry' }}
permissions:
issues: write
@@ -15,8 +15,8 @@ jobs:
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

- name: Run add-labels.sh
run: ./.github/workflows/scripts/add-labels.sh
- name: Run add-labels-command.sh
run: ./.github/workflows/scripts/add-labels-command.sh
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
ISSUE: ${{ github.event.issue.number }}
2 changes: 1 addition & 1 deletion .github/workflows/api-compatibility.yml
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
with:
go-version: ~1.23.6
go-version: ~1.23.7

# Generate apidiff states of Main
- name: Generate-States
4 changes: 2 additions & 2 deletions .github/workflows/build-and-test-arm.yml
Original file line number Diff line number Diff line change
@@ -31,12 +31,12 @@ jobs:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
with:
go-version: ~1.23.6
go-version: ~1.23.7
cache: false
- name: Cache Go
id: go-cache
timeout-minutes: 5
uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
with:
path: |
~/go/bin
8 changes: 4 additions & 4 deletions .github/workflows/build-and-test-windows.yaml
Original file line number Diff line number Diff line change
@@ -27,10 +27,10 @@ jobs:
- name: Setup Go
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
with:
go-version: ~1.23.6
go-version: ~1.23.7
cache: false
- name: Cache Go
uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
env:
cache-name: cache-go-modules
with:
@@ -56,10 +56,10 @@ jobs:
- name: Setup Go
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
with:
go-version: ~1.23.6
go-version: ~1.23.7
cache: false
- name: Cache Go
uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
env:
cache-name: cache-go-modules
with:
32 changes: 16 additions & 16 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
@@ -23,11 +23,11 @@ jobs:
- name: Setup Go
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
with:
go-version: ~1.23.6
go-version: ~1.23.7
cache: false
- name: Cache Go
id: go-cache
uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
with:
path: |
~/go/bin
@@ -46,11 +46,11 @@ jobs:
- name: Setup Go
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
with:
go-version: ~1.23.6
go-version: ~1.23.7
cache: false
- name: Cache Go
id: go-cache
uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
with:
path: |
~/go/bin
@@ -70,11 +70,11 @@ jobs:
- name: Setup Go
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
with:
go-version: ~1.23.6
go-version: ~1.23.7
cache: false
- name: Cache Go
id: go-cache
uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
with:
path: |
~/go/bin
@@ -95,11 +95,11 @@ jobs:
- name: Setup Go
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
with:
go-version: ~1.23.6
go-version: ~1.23.7
cache: false
- name: Cache Go
id: go-cache
uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
with:
path: |
~/go/bin
@@ -155,14 +155,14 @@ jobs:
cache: false
- name: Cache Go
id: go-cache
uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
with:
path: |
~/go/bin
~/go/pkg/mod
key: go-cache-${{ runner.os }}-${{ matrix.runner }}-${{ hashFiles('**/go.sum') }}
- name: Cache Build
uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
with:
path: ~/.cache/go-build
key: unittest-${{ runner.os }}-${{ matrix.runner }}-go-build-${{ matrix.go-version }}-${{ hashFiles('**/go.sum') }}
@@ -200,25 +200,25 @@ jobs:
- name: Setup Go
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
with:
go-version: ~1.23.6
go-version: ~1.23.7
cache: false
- name: Cache Go
id: go-cache
uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
with:
path: |
~/go/bin
~/go/pkg/mod
key: go-cache-${{ runner.os }}-${{ hashFiles('**/go.sum') }}
- name: Cache Build
uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
with:
path: ~/.cache/go-build
key: coverage-${{ runner.os }}-go-build-${{ hashFiles('**/go.sum') }}
- name: Run Unit Tests With Coverage
run: make gotest-with-cover
- name: Upload coverage report
uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # 5.3.1
uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574 # 5.4.0
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

@@ -264,11 +264,11 @@ jobs:
- name: Setup Go
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
with:
go-version: ~1.23.6
go-version: ~1.23.7
cache: false
- name: Cache Go
id: go-cache
uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
uses: actions/cache@d4323d4df104b026a6aa633fdb11d772146be0bf # v4.2.2
with:
path: |
~/go/bin
2 changes: 1 addition & 1 deletion .github/workflows/builder-integration-test.yaml
Original file line number Diff line number Diff line change
@@ -35,6 +35,6 @@ jobs:
- name: Setup Go
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
with:
go-version: ~1.23.6
go-version: ~1.23.7
- name: Test
run: make builder-integration-test
Loading