Skip to content

Commit

Permalink
Merge branch 'main' into fix/16530-stop-removing-error-tags
Browse files Browse the repository at this point in the history
  • Loading branch information
SimunKaracic authored Jul 26, 2023
2 parents 39b2996 + 62c7b53 commit dc843fc
Show file tree
Hide file tree
Showing 19 changed files with 26 additions and 27 deletions.
18 changes: 9 additions & 9 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ confmap/provider/s3provider/ @open-telemetry/collect

connector/countconnector/ @open-telemetry/collector-contrib-approvers @djaglowski @jpkrohling
connector/exceptionsconnector/ @open-telemetry/collector-contrib-approvers @jpkrohling
connector/routingconnector/ @open-telemetry/collector-contrib-approvers @jpkrohling @kovrus @mwear
connector/routingconnector/ @open-telemetry/collector-contrib-approvers @jpkrohling @mwear
connector/servicegraphconnector/ @open-telemetry/collector-contrib-approvers @jpkrohling @mapno
connector/spanmetricsconnector/ @open-telemetry/collector-contrib-approvers @albertteoh @kovrus
connector/spanmetricsconnector/ @open-telemetry/collector-contrib-approvers @albertteoh

examples/demo/ @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers

Expand Down Expand Up @@ -68,7 +68,7 @@ exporter/kafkaexporter/ @open-telemetry/collect
exporter/loadbalancingexporter/ @open-telemetry/collector-contrib-approvers @jpkrohling
exporter/logicmonitorexporter/ @open-telemetry/collector-contrib-approvers @bogdandrutu @khyatigandhi6 @avadhut123pisal
exporter/logzioexporter/ @open-telemetry/collector-contrib-approvers @Doron-Bargo @yotamloe
exporter/lokiexporter/ @open-telemetry/collector-contrib-approvers @gramidt @gouthamve @jpkrohling @kovrus @mar4uk
exporter/lokiexporter/ @open-telemetry/collector-contrib-approvers @gramidt @gouthamve @jpkrohling @mar4uk
exporter/mezmoexporter/ @open-telemetry/collector-contrib-approvers @dashpole @billmeyer @gjanco
exporter/opencensusexporter/ @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers
exporter/opensearchexporter/ @open-telemetry/collector-contrib-approvers @Aneurysm9 @MitchellGale @MaxKsyunz @YANG-DB
Expand All @@ -92,7 +92,7 @@ extension/awsproxy/ @open-telemetry/collect
extension/basicauthextension/ @open-telemetry/collector-contrib-approvers @jpkrohling @svrakitin
extension/bearertokenauthextension/ @open-telemetry/collector-contrib-approvers @jpkrohling @pavankrish123 @frzifus
extension/encodingextension/ @open-telemetry/collector-contrib-approvers @MovieStoreGuy
extension/headerssetterextension/ @open-telemetry/collector-contrib-approvers @jpkrohling @kovrus
extension/headerssetterextension/ @open-telemetry/collector-contrib-approvers @jpkrohling
extension/healthcheckextension/ @open-telemetry/collector-contrib-approvers @jpkrohling
extension/httpforwarder/ @open-telemetry/collector-contrib-approvers @atoulme @rmfitzpatrick
extension/jaegerremotesampling/ @open-telemetry/collector-contrib-approvers @jpkrohling @frzifus
Expand Down Expand Up @@ -131,10 +131,10 @@ pkg/pdatautil/ @open-telemetry/collect
pkg/resourcetotelemetry/ @open-telemetry/collector-contrib-approvers @mx-psi
pkg/stanza/ @open-telemetry/collector-contrib-approvers @djaglowski
pkg/translator/jaeger/ @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers
pkg/translator/loki/ @open-telemetry/collector-contrib-approvers @gouthamve @jpkrohling @kovrus @mar4uk
pkg/translator/loki/ @open-telemetry/collector-contrib-approvers @gouthamve @jpkrohling @mar4uk
pkg/translator/opencensus/ @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers
pkg/translator/prometheus/ @open-telemetry/collector-contrib-approvers @dashpole @bertysentry
pkg/translator/prometheusremotewrite/ @open-telemetry/collector-contrib-approvers @Aneurysm9 @kovrus
pkg/translator/prometheusremotewrite/ @open-telemetry/collector-contrib-approvers @Aneurysm9
pkg/translator/signalfx/ @open-telemetry/collector-contrib-approvers @dmitryax
pkg/translator/zipkin/ @open-telemetry/collector-contrib-approvers @MovieStoreGuy @astencel-sumo @crobert-1
pkg/winperfcounters/ @open-telemetry/collector-contrib-approvers @dashpole @mrod1598 @binaryfissiongames
Expand All @@ -158,7 +158,7 @@ processor/resourcedetectionprocessor/internal/azure/ @open-telemetry/collect
processor/resourcedetectionprocessor/internal/heroku/ @open-telemetry/collector-contrib-approvers @atoulme
processor/resourcedetectionprocessor/internal/openshift/ @open-telemetry/collector-contrib-approvers @frzifus
processor/resourceprocessor/ @open-telemetry/collector-contrib-approvers @dmitryax
processor/routingprocessor/ @open-telemetry/collector-contrib-approvers @jpkrohling @kovrus
processor/routingprocessor/ @open-telemetry/collector-contrib-approvers @jpkrohling
processor/schemaprocessor/ @open-telemetry/collector-contrib-approvers @MovieStoreGuy
processor/servicegraphprocessor/ @open-telemetry/collector-contrib-approvers @jpkrohling @mapno
processor/spanmetricsprocessor/ @open-telemetry/collector-contrib-approvers @albertteoh
Expand All @@ -170,7 +170,7 @@ receiver/activedirectorydsreceiver/ @open-telemetry/collect
receiver/aerospikereceiver/ @open-telemetry/collector-contrib-approvers @djaglowski @antonblock
receiver/apachereceiver/ @open-telemetry/collector-contrib-approvers @djaglowski
receiver/apachesparkreceiver/ @open-telemetry/collector-contrib-approvers @djaglowski @Caleb-Hurshman @mrsillydog
receiver/awscloudwatchmetricsreceiver/ @open-telemetry/collector-contrib-approvers @jpkrohling @kovrus
receiver/awscloudwatchmetricsreceiver/ @open-telemetry/collector-contrib-approvers @jpkrohling
receiver/awscloudwatchreceiver/ @open-telemetry/collector-contrib-approvers @djaglowski @schmikei
receiver/awscontainerinsightreceiver/ @open-telemetry/collector-contrib-approvers @Aneurysm9 @pxaws
receiver/awsecscontainermetricsreceiver/ @open-telemetry/collector-contrib-approvers @Aneurysm9
Expand Down Expand Up @@ -211,7 +211,7 @@ receiver/k8sobjectsreceiver/ @open-telemetry/collect
receiver/kafkametricsreceiver/ @open-telemetry/collector-contrib-approvers @dmitryax
receiver/kafkareceiver/ @open-telemetry/collector-contrib-approvers @pavolloffay @MovieStoreGuy
receiver/kubeletstatsreceiver/ @open-telemetry/collector-contrib-approvers @dmitryax
receiver/lokireceiver/ @open-telemetry/collector-contrib-approvers @mar4uk @kovrus @jpkrohling
receiver/lokireceiver/ @open-telemetry/collector-contrib-approvers @mar4uk @jpkrohling
receiver/memcachedreceiver/ @open-telemetry/collector-contrib-approvers @djaglowski
receiver/mongodbatlasreceiver/ @open-telemetry/collector-contrib-approvers @djaglowski @schmikei
receiver/mongodbreceiver/ @open-telemetry/collector-contrib-approvers @djaglowski @schmikei
Expand Down
1 change: 0 additions & 1 deletion .github/auto_assign.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ assigneeGroups:
- atoulme
- dashpole
- fatsheep9146
- kovrus
# Maintainers
- bogdandrutu
- codeboten
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,13 @@ Approvers ([@open-telemetry/collector-contrib-approvers](https://github.com/orgs
- [Anthony Mirabella](https://github.com/Aneurysm9), AWS
- [Antoine Toulme](https://github.com/atoulme), Splunk
- [David Ashpole](https://github.com/dashpole), Google
- [Ruslan Kovalov](https://github.com/kovrus), Grafana Labs
- [Yang Song](https://github.com/songy23), DataDog
- [Ziqi Zhao](https://github.com/fatsheep9146), Alibaba

Emeritus Approvers:

- [Przemek Maciolek](https://github.com/pmm-sumo)
- [Ruslan Kovalov](https://github.com/kovrus)

Maintainers ([@open-telemetry/collector-contrib-maintainer](https://github.com/orgs/open-telemetry/teams/collector-contrib-maintainer)):

Expand Down
2 changes: 1 addition & 1 deletion connector/routingconnector/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
| ------------- |-----------|
| Distributions | [contrib] |
| Issues | ![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Aconnector%2Frouting%20&label=open&color=orange&logo=opentelemetry) ![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Aconnector%2Frouting%20&label=closed&color=blue&logo=opentelemetry) |
| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@jpkrohling](https://www.github.com/jpkrohling), [@kovrus](https://www.github.com/kovrus), [@mwear](https://www.github.com/mwear) |
| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@jpkrohling](https://www.github.com/jpkrohling), [@mwear](https://www.github.com/mwear) |

[development]: https://github.com/open-telemetry/opentelemetry-collector#development
[contrib]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib
Expand Down
2 changes: 1 addition & 1 deletion connector/routingconnector/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ status:
development: [traces_to_traces, metrics_to_metrics, logs_to_logs]
distributions: [contrib]
codeowners:
active: [jpkrohling, kovrus, mwear]
active: [jpkrohling, mwear]
2 changes: 1 addition & 1 deletion connector/spanmetricsconnector/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
| ------------- |-----------|
| Distributions | [contrib], [sumo] |
| Issues | ![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Aconnector%2Fspanmetrics%20&label=open&color=orange&logo=opentelemetry) ![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Aconnector%2Fspanmetrics%20&label=closed&color=blue&logo=opentelemetry) |
| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@albertteoh](https://www.github.com/albertteoh), [@kovrus](https://www.github.com/kovrus) |
| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@albertteoh](https://www.github.com/albertteoh) |

[alpha]: https://github.com/open-telemetry/opentelemetry-collector#alpha
[contrib]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib
Expand Down
2 changes: 1 addition & 1 deletion connector/spanmetricsconnector/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ status:
alpha: [traces_to_metrics]
distributions: [contrib, sumo]
codeowners:
active: [albertteoh, kovrus]
active: [albertteoh]
2 changes: 1 addition & 1 deletion exporter/lokiexporter/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
| Stability | [beta]: logs |
| Distributions | [contrib], [observiq] |
| Issues | ![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Aexporter%2Floki%20&label=open&color=orange&logo=opentelemetry) ![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Aexporter%2Floki%20&label=closed&color=blue&logo=opentelemetry) |
| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@gramidt](https://www.github.com/gramidt), [@gouthamve](https://www.github.com/gouthamve), [@jpkrohling](https://www.github.com/jpkrohling), [@kovrus](https://www.github.com/kovrus), [@mar4uk](https://www.github.com/mar4uk) |
| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@gramidt](https://www.github.com/gramidt), [@gouthamve](https://www.github.com/gouthamve), [@jpkrohling](https://www.github.com/jpkrohling), [@mar4uk](https://www.github.com/mar4uk) |

[beta]: https://github.com/open-telemetry/opentelemetry-collector#beta
[contrib]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib
Expand Down
2 changes: 1 addition & 1 deletion exporter/lokiexporter/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ status:
- contrib
- observiq
codeowners:
active: [gramidt, gouthamve, jpkrohling, kovrus, mar4uk]
active: [gramidt, gouthamve, jpkrohling, mar4uk]
2 changes: 1 addition & 1 deletion extension/headerssetterextension/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
| Stability | [alpha] |
| Distributions | [contrib], [grafana], [sumo] |
| Issues | ![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Aextension%2Fheaderssetter%20&label=open&color=orange&logo=opentelemetry) ![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Aextension%2Fheaderssetter%20&label=closed&color=blue&logo=opentelemetry) |
| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@jpkrohling](https://www.github.com/jpkrohling), [@kovrus](https://www.github.com/kovrus) |
| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@jpkrohling](https://www.github.com/jpkrohling) |

[alpha]: https://github.com/open-telemetry/opentelemetry-collector#alpha
[contrib]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib
Expand Down
2 changes: 1 addition & 1 deletion extension/headerssetterextension/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ status:
- grafana
- sumo
codeowners:
active: [jpkrohling, kovrus]
active: [jpkrohling]
2 changes: 1 addition & 1 deletion pkg/translator/loki/metadata.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
status:
codeowners:
active: [gouthamve, jpkrohling, kovrus, mar4uk]
active: [gouthamve, jpkrohling, mar4uk]
2 changes: 1 addition & 1 deletion pkg/translator/prometheusremotewrite/metadata.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
status:
codeowners:
active: [Aneurysm9, kovrus]
active: [Aneurysm9]
2 changes: 1 addition & 1 deletion processor/routingprocessor/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
| Stability | [beta]: traces, metrics, logs |
| Distributions | [contrib], [observiq], [redhat], [splunk], [sumo] |
| Issues | ![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Aprocessor%2Frouting%20&label=open&color=orange&logo=opentelemetry) ![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Aprocessor%2Frouting%20&label=closed&color=blue&logo=opentelemetry) |
| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@jpkrohling](https://www.github.com/jpkrohling), [@kovrus](https://www.github.com/kovrus) |
| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@jpkrohling](https://www.github.com/jpkrohling) |

[beta]: https://github.com/open-telemetry/opentelemetry-collector#beta
[contrib]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib
Expand Down
2 changes: 1 addition & 1 deletion processor/routingprocessor/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ status:
beta: [traces, metrics, logs]
distributions: [contrib, observiq, splunk, sumo, redhat]
codeowners:
active: [jpkrohling, kovrus]
active: [jpkrohling]
2 changes: 1 addition & 1 deletion receiver/awscloudwatchmetricsreceiver/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
| Stability | [development]: metrics |
| Distributions | [contrib] |
| Issues | ![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Areceiver%2Fawscloudwatchmetrics%20&label=open&color=orange&logo=opentelemetry) ![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Areceiver%2Fawscloudwatchmetrics%20&label=closed&color=blue&logo=opentelemetry) |
| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@jpkrohling](https://www.github.com/jpkrohling), [@kovrus](https://www.github.com/kovrus) |
| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@jpkrohling](https://www.github.com/jpkrohling) |

[development]: https://github.com/open-telemetry/opentelemetry-collector#development
[contrib]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib
Expand Down
2 changes: 1 addition & 1 deletion receiver/awscloudwatchmetricsreceiver/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ status:
development: [metrics]
distributions: [contrib]
codeowners:
active: [jpkrohling, kovrus]
active: [jpkrohling]
2 changes: 1 addition & 1 deletion receiver/lokireceiver/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
| Stability | [alpha]: logs |
| Distributions | [contrib], [sumo] |
| Issues | ![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Areceiver%2Floki%20&label=open&color=orange&logo=opentelemetry) ![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Areceiver%2Floki%20&label=closed&color=blue&logo=opentelemetry) |
| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@mar4uk](https://www.github.com/mar4uk), [@kovrus](https://www.github.com/kovrus), [@jpkrohling](https://www.github.com/jpkrohling) |
| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@mar4uk](https://www.github.com/mar4uk), [@jpkrohling](https://www.github.com/jpkrohling) |

[alpha]: https://github.com/open-telemetry/opentelemetry-collector#alpha
[contrib]: https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib
Expand Down
2 changes: 1 addition & 1 deletion receiver/lokireceiver/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ status:
- contrib
- sumo
codeowners:
active: [mar4uk, kovrus, jpkrohling]
active: [mar4uk, jpkrohling]

0 comments on commit dc843fc

Please sign in to comment.