Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/release/0.99.x' into release/0…
Browse files Browse the repository at this point in the history
….99.x
  • Loading branch information
lokesh.balla committed Apr 25, 2024
2 parents 0b4eea2 + 90603af commit 6fa0e16
Show file tree
Hide file tree
Showing 1,592 changed files with 33,330 additions and 26,347 deletions.
19 changes: 9 additions & 10 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ exporter/clickhouseexporter/ @open-telemetry/collect
exporter/coralogixexporter/ @open-telemetry/collector-contrib-approvers @povilasv @matej-g
exporter/datadogexporter/ @open-telemetry/collector-contrib-approvers @mx-psi @dineshg13 @liustanley @songy23 @mackjmr
exporter/datasetexporter/ @open-telemetry/collector-contrib-approvers @atoulme @martin-majlis-s1 @zdaratom-s1 @tomaz-s1
exporter/dynatraceexporter/ @open-telemetry/collector-contrib-approvers @dyladan @arminru @evan-bradley
exporter/elasticsearchexporter/ @open-telemetry/collector-contrib-approvers @JaredTan95 @ycombinator
exporter/fileexporter/ @open-telemetry/collector-contrib-approvers @atingchen
exporter/googlecloudexporter/ @open-telemetry/collector-contrib-approvers @aabmass @dashpole @jsuereth @punya @damemi @psx95
Expand All @@ -78,10 +77,10 @@ exporter/sapmexporter/ @open-telemetry/collect
exporter/sentryexporter/ @open-telemetry/collector-contrib-approvers @AbhiPrasad
exporter/signalfxexporter/ @open-telemetry/collector-contrib-approvers @dmitryax @crobert-1
exporter/splunkhecexporter/ @open-telemetry/collector-contrib-approvers @atoulme @dmitryax
exporter/sumologicexporter/ @open-telemetry/collector-contrib-approvers @sumo-drosiek
exporter/syslogexporter/ @open-telemetry/collector-contrib-approvers @kkujawa-sumo @rnishtala-sumo @astencel-sumo
exporter/sumologicexporter/ @open-telemetry/collector-contrib-approvers @aboguszewski-sumo @kkujawa-sumo @mat-rumian @rnishtala-sumo @sumo-drosiek @swiatekm-sumo
exporter/syslogexporter/ @open-telemetry/collector-contrib-approvers @kkujawa-sumo @rnishtala-sumo @andrzej-stencel
exporter/tencentcloudlogserviceexporter/ @open-telemetry/collector-contrib-approvers @wgliang @yiyang5055
exporter/zipkinexporter/ @open-telemetry/collector-contrib-approvers @MovieStoreGuy @astencel-sumo @crobert-1
exporter/zipkinexporter/ @open-telemetry/collector-contrib-approvers @MovieStoreGuy @andrzej-stencel @crobert-1

extension/ackextension/ @open-telemetry/collector-contrib-approvers @zpzhuSplunk @splunkericl
extension/asapauthextension/ @open-telemetry/collector-contrib-approvers @jamesmoessis @MovieStoreGuy
Expand Down Expand Up @@ -116,7 +115,7 @@ extension/solarwindsapmsettingsextension/ @open-telemetry/collect
extension/storage/ @open-telemetry/collector-contrib-approvers @dmitryax @atoulme @djaglowski
extension/storage/dbstorage/ @open-telemetry/collector-contrib-approvers @dmitryax @atoulme
extension/storage/filestorage/ @open-telemetry/collector-contrib-approvers @djaglowski
extension/sumologicextension/ @open-telemetry/collector-contrib-approvers @astencel-sumo @sumo-drosiek @swiatekm-sumo
extension/sumologicextension/ @open-telemetry/collector-contrib-approvers @aboguszewski-sumo @kkujawa-sumo @mat-rumian @rnishtala-sumo @sumo-drosiek @swiatekm-sumo

internal/aws/ @open-telemetry/collector-contrib-approvers @Aneurysm9 @mxiamxia
internal/collectd/ @open-telemetry/collector-contrib-approvers @atoulme
Expand Down Expand Up @@ -153,7 +152,7 @@ pkg/translator/prometheus/ @open-telemetry/collect
pkg/translator/prometheusremotewrite/ @open-telemetry/collector-contrib-approvers @Aneurysm9
pkg/translator/signalfx/ @open-telemetry/collector-contrib-approvers @dmitryax
pkg/translator/skywalking/ @open-telemetry/collector-contrib-approvers @JaredTan95
pkg/translator/zipkin/ @open-telemetry/collector-contrib-approvers @MovieStoreGuy @astencel-sumo @crobert-1
pkg/translator/zipkin/ @open-telemetry/collector-contrib-approvers @MovieStoreGuy @andrzej-stencel @crobert-1
pkg/winperfcounters/ @open-telemetry/collector-contrib-approvers @dashpole @Mrod1598 @BinaryFissionGames

processor/attributesprocessor/ @open-telemetry/collector-contrib-approvers @boostchicken
Expand All @@ -168,7 +167,7 @@ processor/k8sattributesprocessor/ @open-telemetry/collect
processor/logstransformprocessor/ @open-telemetry/collector-contrib-approvers @djaglowski @dehaansa
processor/metricsgenerationprocessor/ @open-telemetry/collector-contrib-approvers @Aneurysm9
processor/metricstransformprocessor/ @open-telemetry/collector-contrib-approvers @dmitryax
processor/probabilisticsamplerprocessor/ @open-telemetry/collector-contrib-approvers @jpkrohling
processor/probabilisticsamplerprocessor/ @open-telemetry/collector-contrib-approvers @jpkrohling @jmacd
processor/redactionprocessor/ @open-telemetry/collector-contrib-approvers @dmitryax @mx-psi @TylerHelmuth
processor/remotetapprocessor/ @open-telemetry/collector-contrib-approvers @atoulme
processor/resourcedetectionprocessor/ @open-telemetry/collector-contrib-approvers @Aneurysm9 @dashpole
Expand All @@ -179,7 +178,7 @@ processor/resourceprocessor/ @open-telemetry/collect
processor/routingprocessor/ @open-telemetry/collector-contrib-approvers @jpkrohling
processor/schemaprocessor/ @open-telemetry/collector-contrib-approvers @MovieStoreGuy
processor/spanprocessor/ @open-telemetry/collector-contrib-approvers @boostchicken
processor/sumologicprocessor/ @open-telemetry/collector-contrib-approvers @aboguszewski-sumo @astencel-sumo @sumo-drosiek
processor/sumologicprocessor/ @open-telemetry/collector-contrib-approvers @aboguszewski-sumo @andrzej-stencel @sumo-drosiek
processor/tailsamplingprocessor/ @open-telemetry/collector-contrib-approvers @jpkrohling
processor/transformprocessor/ @open-telemetry/collector-contrib-approvers @TylerHelmuth @kentquirk @bogdandrutu @evan-bradley

Expand Down Expand Up @@ -212,7 +211,7 @@ receiver/filelogreceiver/ @open-telemetry/collect
receiver/filestatsreceiver/ @open-telemetry/collector-contrib-approvers @atoulme
receiver/flinkmetricsreceiver/ @open-telemetry/collector-contrib-approvers @JonathanWamsley @djaglowski
receiver/fluentforwardreceiver/ @open-telemetry/collector-contrib-approvers @dmitryax
receiver/gitproviderreceiver/ @open-telemetry/collector-contrib-approvers @adrielp @astencel-sumo
receiver/gitproviderreceiver/ @open-telemetry/collector-contrib-approvers @adrielp @andrzej-stencel
receiver/googlecloudpubsubreceiver/ @open-telemetry/collector-contrib-approvers @alexvanboxel
receiver/googlecloudspannerreceiver/ @open-telemetry/collector-contrib-approvers @varunraiko
receiver/haproxyreceiver/ @open-telemetry/collector-contrib-approvers @atoulme @MovieStoreGuy
Expand Down Expand Up @@ -274,7 +273,7 @@ receiver/wavefrontreceiver/ @open-telemetry/collect
receiver/webhookeventreceiver/ @open-telemetry/collector-contrib-approvers @atoulme @shalper2
receiver/windowseventlogreceiver/ @open-telemetry/collector-contrib-approvers @djaglowski @armstrmi @pjanotti
receiver/windowsperfcountersreceiver/ @open-telemetry/collector-contrib-approvers @dashpole
receiver/zipkinreceiver/ @open-telemetry/collector-contrib-approvers @MovieStoreGuy @astencel-sumo @crobert-1
receiver/zipkinreceiver/ @open-telemetry/collector-contrib-approvers @MovieStoreGuy @andrzej-stencel @crobert-1
receiver/zookeeperreceiver/ @open-telemetry/collector-contrib-approvers @djaglowski

testbed/ @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers
Expand Down
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ body:
- exporter/coralogix
- exporter/datadog
- exporter/dataset
- exporter/dynatrace
- exporter/elasticsearch
- exporter/file
- exporter/googlecloud
Expand Down
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/feature_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ body:
- exporter/coralogix
- exporter/datadog
- exporter/dataset
- exporter/dynatrace
- exporter/elasticsearch
- exporter/file
- exporter/googlecloud
Expand Down
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/other.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ body:
- exporter/coralogix
- exporter/datadog
- exporter/dataset
- exporter/dynatrace
- exporter/elasticsearch
- exporter/file
- exporter/googlecloud
Expand Down
2 changes: 1 addition & 1 deletion .github/auto_assign.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ assigneeGroups:
- songy23
- fatsheep9146
# Maintainers
- astencel-sumo
- andrzej-stencel
- bogdandrutu
- codeboten
- djaglowski
Expand Down
16 changes: 9 additions & 7 deletions .github/workflows/build-and-test-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,22 @@ concurrency:
jobs:
windows-unittest-matrix:
strategy:
fail-fast: false
matrix:
group:
- receiver-0
- receiver-1
- receiver-2
- receiver-3
- processor
- exporter
- exporter-0
- exporter-1
- extension
- connector
- internal
- pkg
- cmd
- cmd-0
- cmd-1
- other
runs-on: windows-latest
if: ${{ github.actor != 'dependabot[bot]' && (contains(github.event.pull_request.labels.*.name, 'Run Windows') || github.event_name == 'push' || github.event_name == 'merge_group') }}
Expand All @@ -45,8 +51,7 @@ jobs:
GOMEMLIMIT: 2GiB
steps:
- uses: actions/checkout@v4
- if: matrix.group == 'receiver-0'
name: install IIS
- name: install IIS
run: Install-WindowsFeature -name Web-Server -IncludeManagementTools
- uses: actions/setup-go@v5
with:
Expand All @@ -61,9 +66,6 @@ jobs:
~\go\pkg\mod
~\AppData\Local\go-build
key: go-build-cache-${{ runner.os }}-${{ matrix.group }}-go-${{ hashFiles('**/go.sum') }}
- if: matrix.group == 'cmd'
name: Increasing GOTEST_TIMEOUT for group 'cmd'
run: echo "GOTEST_TIMEOUT=1200s" >> $Env:GITHUB_ENV
- name: Run Unit tests
run: make -j2 gotest GROUP=${{ matrix.group }}
windows-unittest:
Expand Down
17 changes: 9 additions & 8 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
pull_request:
env:
TEST_RESULTS: testbed/tests/results/junit/results.xml
GOPROXY: https://goproxy.cncf.actuated.dev,direct
# Make sure to exit early if cache segment download times out after 2 minutes.
# We limit cache download as a whole to 5 minutes.
SEGMENT_DOWNLOAD_TIMEOUT_MINS: 2
Expand Down Expand Up @@ -63,6 +64,7 @@ jobs:
run: ./.github/workflows/scripts/check-codeowners.sh check_entries_in_allowlist
lint-matrix:
strategy:
fail-fast: false
matrix:
test:
- windows
Expand Down Expand Up @@ -241,9 +243,13 @@ jobs:
git diff --exit-code '.github/ISSUE_TEMPLATE' || (echo 'Dropdowns in issue templates are out of date, please run "make generate-gh-issue-templates" and commit the changes in this PR.' && exit 1)
unittest-matrix:
strategy:
fail-fast: false
matrix:
go-version: ["1.22.2", "1.21.9"] # 1.20 is interpreted as 1.2 without quotes
runner: [ubuntu-latest, actuated-arm64-4cpu-4gb]
exclude:
- go-version: "1.21.9"
runner: actuated-arm64-4cpu-4gb
group:
- receiver-0
- receiver-1
Expand All @@ -262,13 +268,6 @@ jobs:
runs-on: ${{ matrix.runner }}
needs: [setup-environment]
steps:
- name: Set up arkade
uses: alexellis/setup-arkade@v3
- name: Install vmmeter
run: |
sudo -E arkade oci install ghcr.io/openfaasltd/vmmeter:latest --path /usr/local/bin/
- name: Run vmmeter
uses: self-actuated/vmmeter-action@v1
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
Expand Down Expand Up @@ -331,7 +330,7 @@ jobs:
merge-multiple: true
pattern: coverage-artifacts-*
- name: Upload coverage report
uses: Wandalen/wretry.action@v3.2.0
uses: Wandalen/wretry.action@v3.4.0
with:
action: codecov/codecov-action@v4
with: |
Expand All @@ -343,6 +342,7 @@ jobs:

integration-tests-matrix:
strategy:
fail-fast: false
matrix:
group:
- receiver-0
Expand Down Expand Up @@ -460,6 +460,7 @@ jobs:
runs-on: ubuntu-latest
needs: [setup-environment]
strategy:
fail-fast: false
matrix:
os:
- darwin
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ name: "CodeQL Analysis"
on:
push:
branches: [main]
paths-ignore:
- '**/README.md'

jobs:
CodeQL-Build:
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@ on:
- main
tags:
- 'v[0-9]+.[0-9]+.[0-9]+*'
paths-ignore:
- '**/README.md'
pull_request:
paths-ignore:
- '**/README.md'
merge_group:

env:
Expand Down Expand Up @@ -113,6 +117,7 @@ jobs:
env:
KUBECONFIG: /tmp/kube-config-otelcol-e2e-testing
strategy:
fail-fast: false
matrix:
k8s-version:
- "v1.26.0"
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/load-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ on:
branches: [ main ]
tags:
- 'v[0-9]+.[0-9]+.[0-9]+*'
paths-ignore:
- '**/README.md'

# Do not cancel this workflow on main. See https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/16616
concurrency:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/prometheus-compliance-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@ on:
branches: [ main ]
tags:
- 'v[0-9]+.[0-9]+.[0-9]+*'
paths-ignore:
- '**/README.md'
pull_request:
paths-ignore:
- '**/README.md'
merge_group:

# Do not cancel this workflow on main. See https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/16616
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/telemetrygen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@ on:
branches: [ main ]
tags:
- 'v[0-9]+.[0-9]+.[0-9]+*'
paths-ignore:
- '**/README.md'
merge_group:
pull_request:
paths-ignore:
- '**/README.md'
env:
# Make sure to exit early if cache segment download times out after 2 minutes.
# We limit cache download as a whole to 5 minutes.
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG-API.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@ If you are looking for user-facing changes, check out [CHANGELOG.md](./CHANGELOG

<!-- next version -->

## v0.99.0

### 💡 Enhancements 💡

- `prometheusremotewrite`: Optimize the prometheusremotewrite.FromMetrics function, based around more performant metric identifier hashing. (#31385)
- `pkg/pdatatest/plogtest`: Add an option to ignore log timestamp (#32540)
- `filelogreceiver`: Add `exclude_older_than` configuration setting (#31053)

## v0.98.0

### 💡 Enhancements 💡
Expand Down
Loading

0 comments on commit 6fa0e16

Please sign in to comment.