Skip to content

Commit

Permalink
Merge branch 'main' into filter_spans
Browse files Browse the repository at this point in the history
# Conflicts:
#	CHANGELOG.md
#	internal/coreinternal/processor/filterspan/filterspan.go
#	processor/filterprocessor/factory.go
#	processor/filterprocessor/factory_test.go
  • Loading branch information
boostchicken committed Jun 11, 2022
2 parents de40fe1 + 638ea45 commit 1d0456d
Show file tree
Hide file tree
Showing 3,361 changed files with 308,014 additions and 168,581 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
45 changes: 45 additions & 0 deletions .github/ALLOWLIST
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
#####################################################
#
# List of components in OpenTelemetry Collector Contrib
# waiting on owners to be assigned
#
#####################################################
#
# Learn about membership in OpenTelemetry community:
# https://github.com/open-telemetry/community/blob/main/community-membership.md
#
#
# Learn about CODEOWNERS file format:
# https://help.github.com/en/articles/about-code-owners
#

cmd/configschema
examples/demo/client
examples/demo/server
exporter/opencensusexporter
exporter/parquetexporter
extension/fluentbitextension
extension/httpforwarder
extension/sigv4authextension
extension/storage
internal/common
internal/containertest
internal/coreinternal
internal/sharedcomponent
internal/tools
pkg/batchperresourceattr
pkg/experimentalmetricmetadata
pkg/translator/jaeger
pkg/translator/opencensus
pkg/translator/prometheusremotewrite
pkg/translator/signalfx
pkg/translator/zipkin
pkg/winperfcounters
processor/deltatorateprocessor
processor/metricsgenerationprocessor
receiver/opencensusreceiver
receiver/podmanreceiver
receiver/simpleprometheusreceiver
receiver/simpleprometheusreceiver/examples/federation/prom-counter
testbed
testbed/mockdatareceivers/mockawsxrayreceiver
74 changes: 50 additions & 24 deletions .github/CODEOWNERS

Large diffs are not rendered by default.

14 changes: 10 additions & 4 deletions .github/ISSUE_TEMPLATE/new_component.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,28 @@ assignees: ''
---

## The purpose and use-cases of the new component
<!--
<!--
This information can be used later on to populate the README for the component. See an example overview [here](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/awsecscontainermetricsreceiver#overview).
-->

## Example configuration for the component
<!--
<!--
This will be used later on when creating `config.go` and added to README as well. See this receiver as an [example](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/jaegerreceiver#getting-started).
-->

## Telemetry data types supported
<!--
<!--
Any combination of traces, metrics and/or logs is valid here.
-->

## Is this a vendor-specific component? If so, are you proposing to contribute this as a representative of the vendor?
<!--
A vendor-specific component directly interfaces with a vendor-specific API and is expected to be maintained by a representative of the same vendor.
-->


## Sponsor (Optional)
<!--
<!--
A sponsor is an approver who will be in charge of being the official reviewer of the code. For vendor-specific components, it's good to have a volunteer sponsor. If you can't find one, we'll assign one in a round-robin fashion. For non-vendor components, having a sponsor means that your use case has been validated.
If there are no sponsors yet for the component, it's fine: use the issue as a means to try to find a sponsor for your component.
Expand Down
6 changes: 3 additions & 3 deletions .github/auto_assign.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ assigneeGroups:
approvers_maintainers:
# Approvers
- Aneurysm9
- anuraaga
- dashpole
- djaglowski
- dmitryax
- mx-psi
- pmm-sumo
- TylerHelmuth
# Maintainers
- codeboten
- bogdandrutu
- codeboten
- jpkrohling
- tigrannajaryan

# A number of assignees added to the pull request
# Set 0 to add all the assignees (default: 0)
Expand Down
55 changes: 40 additions & 15 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
# File generated by "make gendependabot"; DO NOT EDIT.

version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
- package-ecosystem: "docker"
directory: "/"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/"
schedule:
Expand Down Expand Up @@ -57,6 +62,10 @@ updates:
directory: "/exporter/carbonexporter"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/exporter/clickhouseexporter"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/exporter/coralogixexporter"
schedule:
Expand Down Expand Up @@ -130,15 +139,15 @@ updates:
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/exporter/newrelicexporter"
directory: "/exporter/observiqexporter"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/exporter/observiqexporter"
directory: "/exporter/opencensusexporter"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/exporter/opencensusexporter"
directory: "/exporter/parquetexporter"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
Expand Down Expand Up @@ -169,10 +178,6 @@ updates:
directory: "/exporter/splunkhecexporter"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/exporter/stackdriverexporter"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/exporter/sumologicexporter"
schedule:
Expand Down Expand Up @@ -269,6 +274,10 @@ updates:
directory: "/internal/aws/containerinsight"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/internal/aws/cwlogs"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/internal/aws/ecsutil"
schedule:
Expand Down Expand Up @@ -301,6 +310,10 @@ updates:
directory: "/internal/common"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/internal/containertest"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/internal/coreinternal"
schedule:
Expand Down Expand Up @@ -329,10 +342,6 @@ updates:
directory: "/internal/splunk"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/internal/stanza"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/internal/tools"
schedule:
Expand All @@ -353,6 +362,10 @@ updates:
directory: "/pkg/resourcetotelemetry"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/pkg/stanza"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/pkg/translator/jaeger"
schedule:
Expand All @@ -361,6 +374,14 @@ updates:
directory: "/pkg/translator/opencensus"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/pkg/translator/prometheusremotewrite"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/pkg/translator/signalfx"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/pkg/translator/zipkin"
schedule:
Expand Down Expand Up @@ -449,6 +470,10 @@ updates:
directory: "/receiver/awsecscontainermetricsreceiver"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/receiver/awsfirehosereceiver"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/receiver/awsxrayreceiver"
schedule:
Expand All @@ -465,10 +490,6 @@ updates:
directory: "/receiver/collectdreceiver"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/receiver/couchbasereceiver"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/receiver/couchdbreceiver"
schedule:
Expand Down Expand Up @@ -549,6 +570,10 @@ updates:
directory: "/receiver/mongodbatlasreceiver"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/receiver/mongodbreceiver"
schedule:
interval: "weekly"
- package-ecosystem: "gomod"
directory: "/receiver/mysqlreceiver"
schedule:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/auto-assign-owners.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
jobs:
add-owner:
runs-on: ubuntu-latest
if: ${{ github.actor != 'dependabot[bot]' }}
steps:
- name: run
uses: kentaro-m/auto-assign-action@v1.2.1
Expand Down
50 changes: 31 additions & 19 deletions .github/workflows/build-and-test-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,32 +9,44 @@ env:
TEST_RESULTS: testbed/tests/results/junit/results.xml

jobs:
windows-unittest:
windows-unittest-matrix:
strategy:
matrix:
group:
- receiver-0
- receiver-1
- processor
- exporter
- extension
- internal
- other
runs-on: windows-latest
if: ${{ github.actor != 'dependabot[bot]' }}
steps:
- name: Checkout Repo
uses: actions/checkout@v2
uses: actions/checkout@v3
- if: matrix.group == 'receiver-0'
name: install IIS
run: Install-WindowsFeature -name Web-Server -IncludeManagementTools
- if: matrix.group == 'receiver-0'
name: Install Active Directory DS
run: Install-WindowsFeature -name AD-Domain-Services -IncludeManagementTools
- name: Setup Go
uses: actions/setup-go@v2.1.5
uses: actions/setup-go@v3
with:
go-version: 1.17
- name: Setup Go Environment
run: |
echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV
echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
shell: bash
- name: Cache Go
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
\Users\runneradmin\go\pkg\mod
%LocalAppData%\go-build
key: v1-go-pkg-mod-${{ runner.os }}-${{ hashFiles('**/go.mod', '**/go.sum') }}
~\go\pkg\mod
~\AppData\Local\go-build
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
- name: Run Unit tests
# use default Go build tags from Makefile.common
run: go test --tags containers_image_openpgp,exclude_graphdriver_btrfs,exclude_graphdriver_devicemapper ./...
- name: GitHub Issue Generator
if: ${{ failure() && github.ref == 'ref/head/main' }}
run: |
cd internal/tools && go install go.opentelemetry.io/collector/cmd/issuegenerator
issuegenerator $TEST_RESULTS
run: make gotest GROUP=${{ matrix.group }}
windows-unittest:
runs-on: windows-latest
needs: [windows-unittest-matrix]
steps:
- name: Unit Tests Complete
run: echo "Windows unit tests complete"
Loading

0 comments on commit 1d0456d

Please sign in to comment.