diff --git a/.github/ALLOWLIST b/.github/ALLOWLIST
index 10f7f9d51107..8f73237079b1 100644
--- a/.github/ALLOWLIST
+++ b/.github/ALLOWLIST
@@ -15,7 +15,7 @@
 #
 
 ## 
-# NOTE: New components MUST have a codeowner. Add new components to the CODEOWNERS file instead of here.
+# NOTE: New components MUST have one or more codeowners. Add codeowners to the component metadata.yaml and run make gengithub
 ##
 
 ## COMMON & SHARED components
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index ac38b84a6bad..5570b6902d18 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,7 +1,7 @@
 # Code generated by githubgen. DO NOT EDIT.
 #####################################################
 #
-# List of approvers for OpenTelemetry Collector Contrib
+# List of codeowners for OpenTelemetry Collector Contrib
 #
 #####################################################
 #
@@ -12,272 +12,265 @@
 # Learn about CODEOWNERS file format:
 # https://help.github.com/en/articles/about-code-owners
 #
-# NOTE: Lines should be entered in the following format:
-# <component_path_relative_from_project_root>/<min_1_space><owner_1><space><owner_2><space>..<owner_n>
-# extension/oauth2clientauthextension/                 @open-telemetry/collector-contrib-approvers @pavankrish123 @jpkrohling
-# Path separator and minimum of 1 space between component path and owners is
-# important for validation steps
-#
 
 * @open-telemetry/collector-contrib-approvers
 
-cmd/configschema/                                                       @open-telemetry/collector-contrib-approvers @mx-psi @dmitryax @pmcollins
-cmd/githubgen/                                                          @open-telemetry/collector-contrib-approvers @atoulme
-cmd/mdatagen/                                                           @open-telemetry/collector-contrib-approvers @dmitryax
-cmd/opampsupervisor/                                                    @open-telemetry/collector-contrib-approvers @evan-bradley @atoulme @tigrannajaryan
-cmd/otelcontribcol/                                                     @open-telemetry/collector-contrib-approvers
-cmd/oteltestbedcol/                                                     @open-telemetry/collector-contrib-approvers
-cmd/telemetrygen/                                                       @open-telemetry/collector-contrib-approvers @mx-psi @codeboten
+cmd/configschema/                                        @open-telemetry/collector-contrib-approvers @mx-psi @dmitryax @pmcollins
+cmd/githubgen/                                           @open-telemetry/collector-contrib-approvers @atoulme
+cmd/mdatagen/                                            @open-telemetry/collector-contrib-approvers @dmitryax
+cmd/opampsupervisor/                                     @open-telemetry/collector-contrib-approvers @evan-bradley @atoulme @tigrannajaryan
+cmd/otelcontribcol/                                      @open-telemetry/collector-contrib-approvers
+cmd/oteltestbedcol/                                      @open-telemetry/collector-contrib-approvers
+cmd/telemetrygen/                                        @open-telemetry/collector-contrib-approvers @mx-psi @codeboten
 
-confmap/provider/s3provider/                                            @open-telemetry/collector-contrib-approvers @Aneurysm9
+confmap/provider/s3provider/                             @open-telemetry/collector-contrib-approvers @Aneurysm9
 
-connector/countconnector/                                               @open-telemetry/collector-contrib-approvers @djaglowski @jpkrohling
-connector/datadogconnector/                                             @open-telemetry/collector-contrib-approvers @mx-psi @gbbr @dineshg13
-connector/exceptionsconnector/                                          @open-telemetry/collector-contrib-approvers @jpkrohling @marctc
-connector/failoverconnector/                                            @open-telemetry/collector-contrib-approvers @djaglowski @fatsheep9146
-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
+connector/countconnector/                                @open-telemetry/collector-contrib-approvers @djaglowski @jpkrohling
+connector/datadogconnector/                              @open-telemetry/collector-contrib-approvers @mx-psi @gbbr @dineshg13
+connector/exceptionsconnector/                           @open-telemetry/collector-contrib-approvers @jpkrohling @marctc
+connector/failoverconnector/                             @open-telemetry/collector-contrib-approvers @djaglowski @fatsheep9146
+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
 
-examples/demo/                                                          @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers
+examples/demo/                                           @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers
 
-exporter/alertmanagerexporter/                                          @open-telemetry/collector-contrib-approvers @jpkrohling @sokoide @mcube8
-exporter/alibabacloudlogserviceexporter/                                @open-telemetry/collector-contrib-approvers @shabicheng @kongluoxing @qiansheng91
-exporter/awscloudwatchlogsexporter/                                     @open-telemetry/collector-contrib-approvers @boostchicken @bryan-aguilar @rapphil
-exporter/awsemfexporter/                                                @open-telemetry/collector-contrib-approvers @Aneurysm9 @shaochengwang @mxiamxia @bryan-aguilar
-exporter/awskinesisexporter/                                            @open-telemetry/collector-contrib-approvers @Aneurysm9 @MovieStoreGuy
-exporter/awss3exporter/                                                 @open-telemetry/collector-contrib-approvers @atoulme @pdelewski
-exporter/awsxrayexporter/                                               @open-telemetry/collector-contrib-approvers @wangzlei @srprash
-exporter/azuredataexplorerexporter/                                     @open-telemetry/collector-contrib-approvers @asaharn @ag-ramachandran
-exporter/azuremonitorexporter/                                          @open-telemetry/collector-contrib-approvers @pcwiese
-exporter/carbonexporter/                                                @open-telemetry/collector-contrib-approvers @aboguszewski-sumo
-exporter/cassandraexporter/                                             @open-telemetry/collector-contrib-approvers @atoulme @emreyalvac
-exporter/clickhouseexporter/                                            @open-telemetry/collector-contrib-approvers @hanjm @dmitryax @Frapschen
-exporter/coralogixexporter/                                             @open-telemetry/collector-contrib-approvers @povilasv @matej-g
-exporter/datadogexporter/                                               @open-telemetry/collector-contrib-approvers @mx-psi @gbbr @dineshg13 @liustanley @songy23 @mackjmr
-exporter/datasetexporter/                                               @open-telemetry/collector-contrib-approvers @atoulme @martin-majlis-s1 @zdaratom @tomaz-s1
-exporter/dynatraceexporter/                                             @open-telemetry/collector-contrib-approvers @dyladan @arminru @evan-bradley
-exporter/elasticsearchexporter/                                         @open-telemetry/collector-contrib-approvers @JaredTan95
-exporter/f5cloudexporter/                                               @open-telemetry/collector-contrib-approvers @gramidt
-exporter/fileexporter/                                                  @open-telemetry/collector-contrib-approvers @atingchen
-exporter/googlecloudexporter/                                           @open-telemetry/collector-contrib-approvers @aabmass @dashpole @jsuereth @punya @damemi @psx95
-exporter/googlecloudpubsubexporter/                                     @open-telemetry/collector-contrib-approvers @alexvanboxel
-exporter/googlemanagedprometheusexporter/                               @open-telemetry/collector-contrib-approvers @aabmass @dashpole @jsuereth @punya @damemi @psx95
-exporter/honeycombmarkerexporter/                                       @open-telemetry/collector-contrib-approvers @TylerHelmuth @fchikwekwe
-exporter/influxdbexporter/                                              @open-telemetry/collector-contrib-approvers @jacobmarble
-exporter/instanaexporter/                                               @open-telemetry/collector-contrib-approvers @jpkrohling @hickeyma
-exporter/kafkaexporter/                                                 @open-telemetry/collector-contrib-approvers @pavolloffay @MovieStoreGuy
-exporter/kineticaexporter/                                              @open-telemetry/collector-contrib-approvers @am-kinetica @TylerHelmuth
-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 @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
-exporter/prometheusexporter/                                            @open-telemetry/collector-contrib-approvers @Aneurysm9
-exporter/prometheusremotewriteexporter/                                 @open-telemetry/collector-contrib-approvers @Aneurysm9 @rapphil
-exporter/pulsarexporter/                                                @open-telemetry/collector-contrib-approvers @dmitryax @dao-jun
-exporter/sapmexporter/                                                  @open-telemetry/collector-contrib-approvers @dmitryax @atoulme
-exporter/sentryexporter/                                                @open-telemetry/collector-contrib-approvers @AbhiPrasad
-exporter/signalfxexporter/                                              @open-telemetry/collector-contrib-approvers @dmitryax @crobert-1
-exporter/skywalkingexporter/                                            @open-telemetry/collector-contrib-approvers @liqiangz
-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/tanzuobservabilityexporter/                                    @open-telemetry/collector-contrib-approvers @oppegard @thepeterstone @keep94
-exporter/tencentcloudlogserviceexporter/                                @open-telemetry/collector-contrib-approvers @wgliang @yiyang5055
-exporter/zipkinexporter/                                                @open-telemetry/collector-contrib-approvers @MovieStoreGuy @astencel-sumo @crobert-1
+exporter/alertmanagerexporter/                           @open-telemetry/collector-contrib-approvers @jpkrohling @sokoide @mcube8
+exporter/alibabacloudlogserviceexporter/                 @open-telemetry/collector-contrib-approvers @shabicheng @kongluoxing @qiansheng91
+exporter/awscloudwatchlogsexporter/                      @open-telemetry/collector-contrib-approvers @boostchicken @bryan-aguilar @rapphil
+exporter/awsemfexporter/                                 @open-telemetry/collector-contrib-approvers @Aneurysm9 @shaochengwang @mxiamxia @bryan-aguilar
+exporter/awskinesisexporter/                             @open-telemetry/collector-contrib-approvers @Aneurysm9 @MovieStoreGuy
+exporter/awss3exporter/                                  @open-telemetry/collector-contrib-approvers @atoulme @pdelewski
+exporter/awsxrayexporter/                                @open-telemetry/collector-contrib-approvers @wangzlei @srprash
+exporter/azuredataexplorerexporter/                      @open-telemetry/collector-contrib-approvers @asaharn @ag-ramachandran
+exporter/azuremonitorexporter/                           @open-telemetry/collector-contrib-approvers @pcwiese
+exporter/carbonexporter/                                 @open-telemetry/collector-contrib-approvers @aboguszewski-sumo
+exporter/cassandraexporter/                              @open-telemetry/collector-contrib-approvers @atoulme @emreyalvac
+exporter/clickhouseexporter/                             @open-telemetry/collector-contrib-approvers @hanjm @dmitryax @Frapschen
+exporter/coralogixexporter/                              @open-telemetry/collector-contrib-approvers @povilasv @matej-g
+exporter/datadogexporter/                                @open-telemetry/collector-contrib-approvers @mx-psi @gbbr @dineshg13 @liustanley @songy23 @mackjmr
+exporter/datasetexporter/                                @open-telemetry/collector-contrib-approvers @atoulme @martin-majlis-s1 @zdaratom @tomaz-s1
+exporter/dynatraceexporter/                              @open-telemetry/collector-contrib-approvers @dyladan @arminru @evan-bradley
+exporter/elasticsearchexporter/                          @open-telemetry/collector-contrib-approvers @JaredTan95
+exporter/f5cloudexporter/                                @open-telemetry/collector-contrib-approvers @gramidt
+exporter/fileexporter/                                   @open-telemetry/collector-contrib-approvers @atingchen
+exporter/googlecloudexporter/                            @open-telemetry/collector-contrib-approvers @aabmass @dashpole @jsuereth @punya @damemi @psx95
+exporter/googlecloudpubsubexporter/                      @open-telemetry/collector-contrib-approvers @alexvanboxel
+exporter/googlemanagedprometheusexporter/                @open-telemetry/collector-contrib-approvers @aabmass @dashpole @jsuereth @punya @damemi @psx95
+exporter/honeycombmarkerexporter/                        @open-telemetry/collector-contrib-approvers @TylerHelmuth @fchikwekwe
+exporter/influxdbexporter/                               @open-telemetry/collector-contrib-approvers @jacobmarble
+exporter/instanaexporter/                                @open-telemetry/collector-contrib-approvers @jpkrohling @hickeyma
+exporter/kafkaexporter/                                  @open-telemetry/collector-contrib-approvers @pavolloffay @MovieStoreGuy
+exporter/kineticaexporter/                               @open-telemetry/collector-contrib-approvers @am-kinetica @TylerHelmuth
+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 @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
+exporter/prometheusexporter/                             @open-telemetry/collector-contrib-approvers @Aneurysm9
+exporter/prometheusremotewriteexporter/                  @open-telemetry/collector-contrib-approvers @Aneurysm9 @rapphil
+exporter/pulsarexporter/                                 @open-telemetry/collector-contrib-approvers @dmitryax @dao-jun
+exporter/sapmexporter/                                   @open-telemetry/collector-contrib-approvers @dmitryax @atoulme
+exporter/sentryexporter/                                 @open-telemetry/collector-contrib-approvers @AbhiPrasad
+exporter/signalfxexporter/                               @open-telemetry/collector-contrib-approvers @dmitryax @crobert-1
+exporter/skywalkingexporter/                             @open-telemetry/collector-contrib-approvers @liqiangz
+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/tanzuobservabilityexporter/                     @open-telemetry/collector-contrib-approvers @oppegard @thepeterstone @keep94
+exporter/tencentcloudlogserviceexporter/                 @open-telemetry/collector-contrib-approvers @wgliang @yiyang5055
+exporter/zipkinexporter/                                 @open-telemetry/collector-contrib-approvers @MovieStoreGuy @astencel-sumo @crobert-1
 
-extension/asapauthextension/                                            @open-telemetry/collector-contrib-approvers @jamesmoessis @MovieStoreGuy
-extension/awsproxy/                                                     @open-telemetry/collector-contrib-approvers @Aneurysm9 @mxiamxia
-extension/basicauthextension/                                           @open-telemetry/collector-contrib-approvers @jpkrohling @svrakitin @frzifus
-extension/bearertokenauthextension/                                     @open-telemetry/collector-contrib-approvers @jpkrohling @frzifus
-extension/encoding/                                                     @open-telemetry/collector-contrib-approvers @atoulme @dao-jun @dmitryax @MovieStoreGuy @VihasMakwana
-extension/encoding/jaegerencodingextension/                             @open-telemetry/collector-contrib-approvers @MovieStoreGuy @atoulme
-extension/encoding/jsonlogencodingextension/                            @open-telemetry/collector-contrib-approvers @VihasMakwana @atoulme
-extension/encoding/otlpencodingextension/                               @open-telemetry/collector-contrib-approvers @dao-jun @VihasMakwana
-extension/encoding/textencodingextension/                               @open-telemetry/collector-contrib-approvers @MovieStoreGuy @atoulme
-extension/encoding/zipkinencodingextension/                             @open-telemetry/collector-contrib-approvers @MovieStoreGuy @dao-jun
-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 @yurishkuro @frzifus
-extension/oauth2clientauthextension/                                    @open-telemetry/collector-contrib-approvers @pavankrish123 @jpkrohling
-extension/observer/                                                     @open-telemetry/collector-contrib-approvers @dmitryax @rmfitzpatrick
-extension/observer/dockerobserver/                                      @open-telemetry/collector-contrib-approvers @MovieStoreGuy
-extension/observer/ecsobserver/                                         @open-telemetry/collector-contrib-approvers @dmitryax @rmfitzpatrick
-extension/observer/ecstaskobserver/                                     @open-telemetry/collector-contrib-approvers @rmfitzpatrick
-extension/observer/hostobserver/                                        @open-telemetry/collector-contrib-approvers @MovieStoreGuy
-extension/observer/k8sobserver/                                         @open-telemetry/collector-contrib-approvers @rmfitzpatrick @dmitryax
-extension/oidcauthextension/                                            @open-telemetry/collector-contrib-approvers @jpkrohling
-extension/opampextension/                                               @open-telemetry/collector-contrib-approvers @portertech @evan-bradley @tigrannajaryan
-extension/pprofextension/                                               @open-telemetry/collector-contrib-approvers @MovieStoreGuy
-extension/remotetapextension/                                           @open-telemetry/collector-contrib-approvers @atoulme
-extension/sigv4authextension/                                           @open-telemetry/collector-contrib-approvers @Aneurysm9 @erichsueh3
-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/asapauthextension/                             @open-telemetry/collector-contrib-approvers @jamesmoessis @MovieStoreGuy
+extension/awsproxy/                                      @open-telemetry/collector-contrib-approvers @Aneurysm9 @mxiamxia
+extension/basicauthextension/                            @open-telemetry/collector-contrib-approvers @jpkrohling @svrakitin @frzifus
+extension/bearertokenauthextension/                      @open-telemetry/collector-contrib-approvers @jpkrohling @frzifus
+extension/encoding/                                      @open-telemetry/collector-contrib-approvers @atoulme @dao-jun @dmitryax @MovieStoreGuy @VihasMakwana
+extension/encoding/jaegerencodingextension/              @open-telemetry/collector-contrib-approvers @MovieStoreGuy @atoulme
+extension/encoding/jsonlogencodingextension/             @open-telemetry/collector-contrib-approvers @VihasMakwana @atoulme
+extension/encoding/otlpencodingextension/                @open-telemetry/collector-contrib-approvers @dao-jun @VihasMakwana
+extension/encoding/textencodingextension/                @open-telemetry/collector-contrib-approvers @MovieStoreGuy @atoulme
+extension/encoding/zipkinencodingextension/              @open-telemetry/collector-contrib-approvers @MovieStoreGuy @dao-jun
+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 @yurishkuro @frzifus
+extension/oauth2clientauthextension/                     @open-telemetry/collector-contrib-approvers @pavankrish123 @jpkrohling
+extension/observer/                                      @open-telemetry/collector-contrib-approvers @dmitryax @rmfitzpatrick
+extension/observer/dockerobserver/                       @open-telemetry/collector-contrib-approvers @MovieStoreGuy
+extension/observer/ecsobserver/                          @open-telemetry/collector-contrib-approvers @dmitryax @rmfitzpatrick
+extension/observer/ecstaskobserver/                      @open-telemetry/collector-contrib-approvers @rmfitzpatrick
+extension/observer/hostobserver/                         @open-telemetry/collector-contrib-approvers @MovieStoreGuy
+extension/observer/k8sobserver/                          @open-telemetry/collector-contrib-approvers @rmfitzpatrick @dmitryax
+extension/oidcauthextension/                             @open-telemetry/collector-contrib-approvers @jpkrohling
+extension/opampextension/                                @open-telemetry/collector-contrib-approvers @portertech @evan-bradley @tigrannajaryan
+extension/pprofextension/                                @open-telemetry/collector-contrib-approvers @MovieStoreGuy
+extension/remotetapextension/                            @open-telemetry/collector-contrib-approvers @atoulme
+extension/sigv4authextension/                            @open-telemetry/collector-contrib-approvers @Aneurysm9 @erichsueh3
+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
 
-internal/aws/                                                           @open-telemetry/collector-contrib-approvers @Aneurysm9 @mxiamxia
-internal/collectd/                                                      @open-telemetry/collector-contrib-approvers @atoulme
-internal/coreinternal/                                                  @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers
-internal/datadog/                                                       @open-telemetry/collector-contrib-approvers @mx-psi @gbbr @dineshg13
-internal/docker/                                                        @open-telemetry/collector-contrib-approvers @rmfitzpatrick @jamesmoessis
-internal/filter/                                                        @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers
-internal/k8sconfig/                                                     @open-telemetry/collector-contrib-approvers @dmitryax
-internal/k8stest/                                                       @open-telemetry/collector-contrib-approvers @crobert-1
-internal/kafka/                                                         @open-telemetry/collector-contrib-approvers @pavolloffay @MovieStoreGuy
-internal/kubelet/                                                       @open-telemetry/collector-contrib-approvers @dmitryax
-internal/metadataproviders/                                             @open-telemetry/collector-contrib-approvers @Aneurysm9 @dashpole
-internal/sharedcomponent/                                               @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers
-internal/splunk/                                                        @open-telemetry/collector-contrib-approvers @dmitryax
-internal/tools/                                                         @open-telemetry/collector-contrib-approvers
+internal/aws/                                            @open-telemetry/collector-contrib-approvers @Aneurysm9 @mxiamxia
+internal/collectd/                                       @open-telemetry/collector-contrib-approvers @atoulme
+internal/coreinternal/                                   @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers
+internal/datadog/                                        @open-telemetry/collector-contrib-approvers @mx-psi @gbbr @dineshg13
+internal/docker/                                         @open-telemetry/collector-contrib-approvers @rmfitzpatrick @jamesmoessis
+internal/filter/                                         @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers
+internal/k8sconfig/                                      @open-telemetry/collector-contrib-approvers @dmitryax
+internal/k8stest/                                        @open-telemetry/collector-contrib-approvers @crobert-1
+internal/kafka/                                          @open-telemetry/collector-contrib-approvers @pavolloffay @MovieStoreGuy
+internal/kubelet/                                        @open-telemetry/collector-contrib-approvers @dmitryax
+internal/metadataproviders/                              @open-telemetry/collector-contrib-approvers @Aneurysm9 @dashpole
+internal/sharedcomponent/                                @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers
+internal/splunk/                                         @open-telemetry/collector-contrib-approvers @dmitryax
+internal/tools/                                          @open-telemetry/collector-contrib-approvers
 
-pkg/batchperresourceattr/                                               @open-telemetry/collector-contrib-approvers @atoulme @dmitryax
-pkg/batchpersignal/                                                     @open-telemetry/collector-contrib-approvers @jpkrohling
-pkg/experimentalmetricmetadata/                                         @open-telemetry/collector-contrib-approvers @rmfitzpatrick
-pkg/golden/                                                             @open-telemetry/collector-contrib-approvers @djaglowski @atoulme
-pkg/ottl/                                                               @open-telemetry/collector-contrib-approvers @TylerHelmuth @kentquirk @bogdandrutu @evan-bradley
-pkg/pdatatest/                                                          @open-telemetry/collector-contrib-approvers @djaglowski @fatsheep9146
-pkg/pdatautil/                                                          @open-telemetry/collector-contrib-approvers @dmitryax
-pkg/resourcetotelemetry/                                                @open-telemetry/collector-contrib-approvers @mx-psi
-pkg/stanza/                                                             @open-telemetry/collector-contrib-approvers @djaglowski
-pkg/translator/azure/                                                   @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers @atoulme @cparkins
-pkg/translator/jaeger/                                                  @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers @frzifus
-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
-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/winperfcounters/                                                    @open-telemetry/collector-contrib-approvers @dashpole @Mrod1598 @BinaryFissionGames
+pkg/batchperresourceattr/                                @open-telemetry/collector-contrib-approvers @atoulme @dmitryax
+pkg/batchpersignal/                                      @open-telemetry/collector-contrib-approvers @jpkrohling
+pkg/experimentalmetricmetadata/                          @open-telemetry/collector-contrib-approvers @rmfitzpatrick
+pkg/golden/                                              @open-telemetry/collector-contrib-approvers @djaglowski @atoulme
+pkg/ottl/                                                @open-telemetry/collector-contrib-approvers @TylerHelmuth @kentquirk @bogdandrutu @evan-bradley
+pkg/pdatatest/                                           @open-telemetry/collector-contrib-approvers @djaglowski @fatsheep9146
+pkg/pdatautil/                                           @open-telemetry/collector-contrib-approvers @dmitryax
+pkg/resourcetotelemetry/                                 @open-telemetry/collector-contrib-approvers @mx-psi
+pkg/stanza/                                              @open-telemetry/collector-contrib-approvers @djaglowski
+pkg/translator/azure/                                    @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers @atoulme @cparkins
+pkg/translator/jaeger/                                   @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers @frzifus
+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
+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/winperfcounters/                                     @open-telemetry/collector-contrib-approvers @dashpole @Mrod1598 @BinaryFissionGames
 
-processor/attributesprocessor/                                          @open-telemetry/collector-contrib-approvers @boostchicken
-processor/cumulativetodeltaprocessor/                                   @open-telemetry/collector-contrib-approvers @TylerHelmuth
-processor/datadogprocessor/                                             @open-telemetry/collector-contrib-approvers @mx-psi @gbbr @dineshg13
-processor/deltatorateprocessor/                                         @open-telemetry/collector-contrib-approvers @Aneurysm9
-processor/filterprocessor/                                              @open-telemetry/collector-contrib-approvers @TylerHelmuth @boostchicken
-processor/groupbyattrsprocessor/                                        @open-telemetry/collector-contrib-approvers @rnishtala-sumo
-processor/groupbytraceprocessor/                                        @open-telemetry/collector-contrib-approvers @jpkrohling
-processor/k8sattributesprocessor/                                       @open-telemetry/collector-contrib-approvers @dmitryax @rmfitzpatrick @fatsheep9146 @TylerHelmuth
-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/redactionprocessor/                                           @open-telemetry/collector-contrib-approvers @leonsp-ai @dmitryax @mx-psi @TylerHelmuth
-processor/remotetapprocessor/                                           @open-telemetry/collector-contrib-approvers @pmcollins
-processor/resourcedetectionprocessor/                                   @open-telemetry/collector-contrib-approvers @Aneurysm9 @dashpole
-processor/resourcedetectionprocessor/internal/azure/                    @open-telemetry/collector-contrib-approvers @mx-psi
-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
-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
-processor/spanprocessor/                                                @open-telemetry/collector-contrib-approvers @boostchicken
-processor/sumologicprocessor/                                           @open-telemetry/collector-contrib-approvers @aboguszewski-sumo @astencel-sumo @sumo-drosiek
-processor/tailsamplingprocessor/                                        @open-telemetry/collector-contrib-approvers @jpkrohling
-processor/transformprocessor/                                           @open-telemetry/collector-contrib-approvers @TylerHelmuth @kentquirk @bogdandrutu @evan-bradley
+processor/attributesprocessor/                           @open-telemetry/collector-contrib-approvers @boostchicken
+processor/cumulativetodeltaprocessor/                    @open-telemetry/collector-contrib-approvers @TylerHelmuth
+processor/datadogprocessor/                              @open-telemetry/collector-contrib-approvers @mx-psi @gbbr @dineshg13
+processor/deltatorateprocessor/                          @open-telemetry/collector-contrib-approvers @Aneurysm9
+processor/filterprocessor/                               @open-telemetry/collector-contrib-approvers @TylerHelmuth @boostchicken
+processor/groupbyattrsprocessor/                         @open-telemetry/collector-contrib-approvers @rnishtala-sumo
+processor/groupbytraceprocessor/                         @open-telemetry/collector-contrib-approvers @jpkrohling
+processor/k8sattributesprocessor/                        @open-telemetry/collector-contrib-approvers @dmitryax @rmfitzpatrick @fatsheep9146 @TylerHelmuth
+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/redactionprocessor/                            @open-telemetry/collector-contrib-approvers @leonsp-ai @dmitryax @mx-psi @TylerHelmuth
+processor/remotetapprocessor/                            @open-telemetry/collector-contrib-approvers @pmcollins
+processor/resourcedetectionprocessor/                    @open-telemetry/collector-contrib-approvers @Aneurysm9 @dashpole
+processor/resourcedetectionprocessor/internal/azure/     @open-telemetry/collector-contrib-approvers @mx-psi
+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
+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
+processor/spanprocessor/                                 @open-telemetry/collector-contrib-approvers @boostchicken
+processor/sumologicprocessor/                            @open-telemetry/collector-contrib-approvers @aboguszewski-sumo @astencel-sumo @sumo-drosiek
+processor/tailsamplingprocessor/                         @open-telemetry/collector-contrib-approvers @jpkrohling
+processor/transformprocessor/                            @open-telemetry/collector-contrib-approvers @TylerHelmuth @kentquirk @bogdandrutu @evan-bradley
 
-receiver/activedirectorydsreceiver/                                     @open-telemetry/collector-contrib-approvers @djaglowski @BinaryFissionGames
-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
-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
-receiver/awsfirehosereceiver/                                           @open-telemetry/collector-contrib-approvers @Aneurysm9
-receiver/awsxrayreceiver/                                               @open-telemetry/collector-contrib-approvers @wangzlei @srprash
-receiver/azureblobreceiver/                                             @open-telemetry/collector-contrib-approvers @eedorenko @mx-psi
-receiver/azureeventhubreceiver/                                         @open-telemetry/collector-contrib-approvers @atoulme @djaglowski
-receiver/azuremonitorreceiver/                                          @open-telemetry/collector-contrib-approvers @altuner @codeboten
-receiver/bigipreceiver/                                                 @open-telemetry/collector-contrib-approvers @djaglowski @StefanKurek
-receiver/carbonreceiver/                                                @open-telemetry/collector-contrib-approvers @aboguszewski-sumo
-receiver/chronyreceiver/                                                @open-telemetry/collector-contrib-approvers @MovieStoreGuy @jamesmoessis
-receiver/cloudflarereceiver/                                            @open-telemetry/collector-contrib-approvers @dehaansa @djaglowski
-receiver/cloudfoundryreceiver/                                          @open-telemetry/collector-contrib-approvers @agoallikmaa @pellared @crobert-1
-receiver/collectdreceiver/                                              @open-telemetry/collector-contrib-approvers @atoulme
-receiver/couchdbreceiver/                                               @open-telemetry/collector-contrib-approvers @djaglowski
-receiver/datadogreceiver/                                               @open-telemetry/collector-contrib-approvers @boostchicken @gouthamve @jpkrohling @MovieStoreGuy
-receiver/dockerstatsreceiver/                                           @open-telemetry/collector-contrib-approvers @rmfitzpatrick @jamesmoessis
-receiver/elasticsearchreceiver/                                         @open-telemetry/collector-contrib-approvers @djaglowski @BinaryFissionGames
-receiver/expvarreceiver/                                                @open-telemetry/collector-contrib-approvers @jamesmoessis @MovieStoreGuy
-receiver/filelogreceiver/                                               @open-telemetry/collector-contrib-approvers @djaglowski
-receiver/filereceiver/                                                  @open-telemetry/collector-contrib-approvers @pmcollins @djaglowski
-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/googlecloudpubsubreceiver/                                     @open-telemetry/collector-contrib-approvers @alexvanboxel
-receiver/googlecloudspannerreceiver/                                    @open-telemetry/collector-contrib-approvers @architjugran @varunraiko @kiranmayib
-receiver/haproxyreceiver/                                               @open-telemetry/collector-contrib-approvers @atoulme @MovieStoreGuy
-receiver/hostmetricsreceiver/                                           @open-telemetry/collector-contrib-approvers @dmitryax @braydonk
-receiver/httpcheckreceiver/                                             @open-telemetry/collector-contrib-approvers @codeboten
-receiver/iisreceiver/                                                   @open-telemetry/collector-contrib-approvers @Mrod1598 @djaglowski
-receiver/influxdbreceiver/                                              @open-telemetry/collector-contrib-approvers @jacobmarble
-receiver/jaegerreceiver/                                                @open-telemetry/collector-contrib-approvers @yurishkuro
-receiver/jmxreceiver/                                                   @open-telemetry/collector-contrib-approvers @rmfitzpatrick
-receiver/journaldreceiver/                                              @open-telemetry/collector-contrib-approvers @sumo-drosiek @djaglowski
-receiver/k8sclusterreceiver/                                            @open-telemetry/collector-contrib-approvers @dmitryax @TylerHelmuth @povilasv
-receiver/k8seventsreceiver/                                             @open-telemetry/collector-contrib-approvers @dmitryax @TylerHelmuth
-receiver/k8sobjectsreceiver/                                            @open-telemetry/collector-contrib-approvers @dmitryax @hvaghani221 @TylerHelmuth
-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 @TylerHelmuth
-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
-receiver/mysqlreceiver/                                                 @open-telemetry/collector-contrib-approvers @djaglowski
-receiver/nginxreceiver/                                                 @open-telemetry/collector-contrib-approvers @djaglowski
-receiver/nsxtreceiver/                                                  @open-telemetry/collector-contrib-approvers @dashpole @schmikei
-receiver/opencensusreceiver/                                            @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers
-receiver/oracledbreceiver/                                              @open-telemetry/collector-contrib-approvers @dmitryax @crobert-1 @atoulme
-receiver/otlpjsonfilereceiver/                                          @open-telemetry/collector-contrib-approvers @djaglowski @atoulme
-receiver/podmanreceiver/                                                @open-telemetry/collector-contrib-approvers @rogercoll
-receiver/postgresqlreceiver/                                            @open-telemetry/collector-contrib-approvers @djaglowski
-receiver/prometheusreceiver/                                            @open-telemetry/collector-contrib-approvers @Aneurysm9 @dashpole
-receiver/pulsarreceiver/                                                @open-telemetry/collector-contrib-approvers @dmitryax @dao-jun
-receiver/purefareceiver/                                                @open-telemetry/collector-contrib-approvers @jpkrohling @dgoscn @chrroberts-pure
-receiver/purefbreceiver/                                                @open-telemetry/collector-contrib-approvers @jpkrohling @dgoscn @chrroberts-pure
-receiver/rabbitmqreceiver/                                              @open-telemetry/collector-contrib-approvers @djaglowski @cpheps
-receiver/receivercreator/                                               @open-telemetry/collector-contrib-approvers @rmfitzpatrick
-receiver/redisreceiver/                                                 @open-telemetry/collector-contrib-approvers @dmitryax @hughesjj
-receiver/riakreceiver/                                                  @open-telemetry/collector-contrib-approvers @djaglowski @armstrmi
-receiver/saphanareceiver/                                               @open-telemetry/collector-contrib-approvers @dehaansa
-receiver/sapmreceiver/                                                  @open-telemetry/collector-contrib-approvers @atoulme
-receiver/signalfxreceiver/                                              @open-telemetry/collector-contrib-approvers @dmitryax
-receiver/simpleprometheusreceiver/                                      @open-telemetry/collector-contrib-approvers @fatsheep9146
-receiver/skywalkingreceiver/                                            @open-telemetry/collector-contrib-approvers @JaredTan95
-receiver/snmpreceiver/                                                  @open-telemetry/collector-contrib-approvers @djaglowski @StefanKurek @tamir-michaeli
-receiver/snowflakereceiver/                                             @open-telemetry/collector-contrib-approvers @dmitryax @shalper2
-receiver/solacereceiver/                                                @open-telemetry/collector-contrib-approvers @djaglowski @mcardy
-receiver/splunkenterprisereceiver/                                      @open-telemetry/collector-contrib-approvers @shalper2 @MovieStoreGuy @greatestusername
-receiver/splunkhecreceiver/                                             @open-telemetry/collector-contrib-approvers @atoulme
-receiver/sqlqueryreceiver/                                              @open-telemetry/collector-contrib-approvers @dmitryax @pmcollins
-receiver/sqlserverreceiver/                                             @open-telemetry/collector-contrib-approvers @djaglowski @StefanKurek
-receiver/sshcheckreceiver/                                              @open-telemetry/collector-contrib-approvers @nslaughter @codeboten
-receiver/statsdreceiver/                                                @open-telemetry/collector-contrib-approvers @jmacd @dmitryax
-receiver/syslogreceiver/                                                @open-telemetry/collector-contrib-approvers @djaglowski
-receiver/tcplogreceiver/                                                @open-telemetry/collector-contrib-approvers @djaglowski
-receiver/udplogreceiver/                                                @open-telemetry/collector-contrib-approvers @djaglowski
-receiver/vcenterreceiver/                                               @open-telemetry/collector-contrib-approvers @djaglowski @schmikei
-receiver/wavefrontreceiver/                                             @open-telemetry/collector-contrib-approvers @samiura
-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/zookeeperreceiver/                                             @open-telemetry/collector-contrib-approvers @djaglowski
+receiver/activedirectorydsreceiver/                      @open-telemetry/collector-contrib-approvers @djaglowski @BinaryFissionGames
+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
+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
+receiver/awsfirehosereceiver/                            @open-telemetry/collector-contrib-approvers @Aneurysm9
+receiver/awsxrayreceiver/                                @open-telemetry/collector-contrib-approvers @wangzlei @srprash
+receiver/azureblobreceiver/                              @open-telemetry/collector-contrib-approvers @eedorenko @mx-psi
+receiver/azureeventhubreceiver/                          @open-telemetry/collector-contrib-approvers @atoulme @djaglowski
+receiver/azuremonitorreceiver/                           @open-telemetry/collector-contrib-approvers @altuner @codeboten
+receiver/bigipreceiver/                                  @open-telemetry/collector-contrib-approvers @djaglowski @StefanKurek
+receiver/carbonreceiver/                                 @open-telemetry/collector-contrib-approvers @aboguszewski-sumo
+receiver/chronyreceiver/                                 @open-telemetry/collector-contrib-approvers @MovieStoreGuy @jamesmoessis
+receiver/cloudflarereceiver/                             @open-telemetry/collector-contrib-approvers @dehaansa @djaglowski
+receiver/cloudfoundryreceiver/                           @open-telemetry/collector-contrib-approvers @agoallikmaa @pellared @crobert-1
+receiver/collectdreceiver/                               @open-telemetry/collector-contrib-approvers @atoulme
+receiver/couchdbreceiver/                                @open-telemetry/collector-contrib-approvers @djaglowski
+receiver/datadogreceiver/                                @open-telemetry/collector-contrib-approvers @boostchicken @gouthamve @jpkrohling @MovieStoreGuy
+receiver/dockerstatsreceiver/                            @open-telemetry/collector-contrib-approvers @rmfitzpatrick @jamesmoessis
+receiver/elasticsearchreceiver/                          @open-telemetry/collector-contrib-approvers @djaglowski @BinaryFissionGames
+receiver/expvarreceiver/                                 @open-telemetry/collector-contrib-approvers @jamesmoessis @MovieStoreGuy
+receiver/filelogreceiver/                                @open-telemetry/collector-contrib-approvers @djaglowski
+receiver/filereceiver/                                   @open-telemetry/collector-contrib-approvers @pmcollins @djaglowski
+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/googlecloudpubsubreceiver/                      @open-telemetry/collector-contrib-approvers @alexvanboxel
+receiver/googlecloudspannerreceiver/                     @open-telemetry/collector-contrib-approvers @architjugran @varunraiko @kiranmayib
+receiver/haproxyreceiver/                                @open-telemetry/collector-contrib-approvers @atoulme @MovieStoreGuy
+receiver/hostmetricsreceiver/                            @open-telemetry/collector-contrib-approvers @dmitryax @braydonk
+receiver/httpcheckreceiver/                              @open-telemetry/collector-contrib-approvers @codeboten
+receiver/iisreceiver/                                    @open-telemetry/collector-contrib-approvers @Mrod1598 @djaglowski
+receiver/influxdbreceiver/                               @open-telemetry/collector-contrib-approvers @jacobmarble
+receiver/jaegerreceiver/                                 @open-telemetry/collector-contrib-approvers @yurishkuro
+receiver/jmxreceiver/                                    @open-telemetry/collector-contrib-approvers @rmfitzpatrick
+receiver/journaldreceiver/                               @open-telemetry/collector-contrib-approvers @sumo-drosiek @djaglowski
+receiver/k8sclusterreceiver/                             @open-telemetry/collector-contrib-approvers @dmitryax @TylerHelmuth @povilasv
+receiver/k8seventsreceiver/                              @open-telemetry/collector-contrib-approvers @dmitryax @TylerHelmuth
+receiver/k8sobjectsreceiver/                             @open-telemetry/collector-contrib-approvers @dmitryax @hvaghani221 @TylerHelmuth
+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 @TylerHelmuth
+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
+receiver/mysqlreceiver/                                  @open-telemetry/collector-contrib-approvers @djaglowski
+receiver/nginxreceiver/                                  @open-telemetry/collector-contrib-approvers @djaglowski
+receiver/nsxtreceiver/                                   @open-telemetry/collector-contrib-approvers @dashpole @schmikei
+receiver/opencensusreceiver/                             @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers
+receiver/oracledbreceiver/                               @open-telemetry/collector-contrib-approvers @dmitryax @crobert-1 @atoulme
+receiver/otlpjsonfilereceiver/                           @open-telemetry/collector-contrib-approvers @djaglowski @atoulme
+receiver/podmanreceiver/                                 @open-telemetry/collector-contrib-approvers @rogercoll
+receiver/postgresqlreceiver/                             @open-telemetry/collector-contrib-approvers @djaglowski
+receiver/prometheusreceiver/                             @open-telemetry/collector-contrib-approvers @Aneurysm9 @dashpole
+receiver/pulsarreceiver/                                 @open-telemetry/collector-contrib-approvers @dmitryax @dao-jun
+receiver/purefareceiver/                                 @open-telemetry/collector-contrib-approvers @jpkrohling @dgoscn @chrroberts-pure
+receiver/purefbreceiver/                                 @open-telemetry/collector-contrib-approvers @jpkrohling @dgoscn @chrroberts-pure
+receiver/rabbitmqreceiver/                               @open-telemetry/collector-contrib-approvers @djaglowski @cpheps
+receiver/receivercreator/                                @open-telemetry/collector-contrib-approvers @rmfitzpatrick
+receiver/redisreceiver/                                  @open-telemetry/collector-contrib-approvers @dmitryax @hughesjj
+receiver/riakreceiver/                                   @open-telemetry/collector-contrib-approvers @djaglowski @armstrmi
+receiver/saphanareceiver/                                @open-telemetry/collector-contrib-approvers @dehaansa
+receiver/sapmreceiver/                                   @open-telemetry/collector-contrib-approvers @atoulme
+receiver/signalfxreceiver/                               @open-telemetry/collector-contrib-approvers @dmitryax
+receiver/simpleprometheusreceiver/                       @open-telemetry/collector-contrib-approvers @fatsheep9146
+receiver/skywalkingreceiver/                             @open-telemetry/collector-contrib-approvers @JaredTan95
+receiver/snmpreceiver/                                   @open-telemetry/collector-contrib-approvers @djaglowski @StefanKurek @tamir-michaeli
+receiver/snowflakereceiver/                              @open-telemetry/collector-contrib-approvers @dmitryax @shalper2
+receiver/solacereceiver/                                 @open-telemetry/collector-contrib-approvers @djaglowski @mcardy
+receiver/splunkenterprisereceiver/                       @open-telemetry/collector-contrib-approvers @shalper2 @MovieStoreGuy @greatestusername
+receiver/splunkhecreceiver/                              @open-telemetry/collector-contrib-approvers @atoulme
+receiver/sqlqueryreceiver/                               @open-telemetry/collector-contrib-approvers @dmitryax @pmcollins
+receiver/sqlserverreceiver/                              @open-telemetry/collector-contrib-approvers @djaglowski @StefanKurek
+receiver/sshcheckreceiver/                               @open-telemetry/collector-contrib-approvers @nslaughter @codeboten
+receiver/statsdreceiver/                                 @open-telemetry/collector-contrib-approvers @jmacd @dmitryax
+receiver/syslogreceiver/                                 @open-telemetry/collector-contrib-approvers @djaglowski
+receiver/tcplogreceiver/                                 @open-telemetry/collector-contrib-approvers @djaglowski
+receiver/udplogreceiver/                                 @open-telemetry/collector-contrib-approvers @djaglowski
+receiver/vcenterreceiver/                                @open-telemetry/collector-contrib-approvers @djaglowski @schmikei
+receiver/wavefrontreceiver/                              @open-telemetry/collector-contrib-approvers @samiura
+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/zookeeperreceiver/                              @open-telemetry/collector-contrib-approvers @djaglowski
 
-testbed/                                                                @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers
-testbed/mockdatareceivers/mockawsxrayreceiver/                          @open-telemetry/collector-contrib-approvers @wangzlei @srprash
-testbed/mockdatasenders/mockdatadogagentexporter/                       @open-telemetry/collector-contrib-approvers @boostchicken
+testbed/                                                 @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers
+testbed/mockdatareceivers/mockawsxrayreceiver/           @open-telemetry/collector-contrib-approvers @wangzlei @srprash
+testbed/mockdatasenders/mockdatadogagentexporter/        @open-telemetry/collector-contrib-approvers @boostchicken
 
 
 ## UNMAINTAINED components
-## The Github issue template generation code needs this to generate the corresponding labels.
 
diff --git a/cmd/githubgen/allowlist.txt b/cmd/githubgen/allowlist.txt
index 55b27e5a2248..61b1f77d378d 100644
--- a/cmd/githubgen/allowlist.txt
+++ b/cmd/githubgen/allowlist.txt
@@ -7,7 +7,7 @@ agoallikmaa
 architjugran
 asaharn
 billmeyer
-eedorenko
+braydonk
 emreyalvac
 keep94
 kiranmayib
diff --git a/cmd/githubgen/codeowners.go b/cmd/githubgen/codeowners.go
index f53c64b91ca0..d467e04bb9eb 100644
--- a/cmd/githubgen/codeowners.go
+++ b/cmd/githubgen/codeowners.go
@@ -30,7 +30,7 @@ const allowlistHeader = `# Code generated by githubgen. DO NOT EDIT.
 #
 
 ## 
-# NOTE: New components MUST have a codeowner. Add new components to the CODEOWNERS file instead of here.
+# NOTE: New components MUST have one or more codeowners. Add codeowners to the component metadata.yaml and run make gengithub
 ##
 
 ## COMMON & SHARED components
@@ -41,14 +41,13 @@ internal/common
 const unmaintainedHeader = `
 
 ## UNMAINTAINED components
-## The Github issue template generation code needs this to generate the corresponding labels.
 
 `
 
 const codeownersHeader = `# Code generated by githubgen. DO NOT EDIT.
 #####################################################
 #
-# List of approvers for OpenTelemetry Collector Contrib
+# List of codeowners for OpenTelemetry Collector Contrib
 #
 #####################################################
 #
@@ -59,12 +58,6 @@ const codeownersHeader = `# Code generated by githubgen. DO NOT EDIT.
 # Learn about CODEOWNERS file format:
 # https://help.github.com/en/articles/about-code-owners
 #
-# NOTE: Lines should be entered in the following format:
-# <component_path_relative_from_project_root>/<min_1_space><owner_1><space><owner_2><space>..<owner_n>
-# extension/oauth2clientauthextension/                 @open-telemetry/collector-contrib-approvers @pavankrish123 @jpkrohling
-# Path separator and minimum of 1 space between component path and owners is
-# important for validation steps
-#
 
 * @open-telemetry/collector-contrib-approvers
 `