Merge branch 'open-telemetry:main' into main

open-telemetry · Jul 26, 2023 · aa373ce · aa373ce
2 parents fdd6ac6 + 62c7b53
commit aa373ce
Show file tree

Hide file tree

Showing 30 changed files with 1,046 additions and 263 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -22,6 +22,7 @@
 * @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
@@ -32,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
 
@@ -67,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
@@ -91,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
@@ -130,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
@@ -157,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
@@ -169,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
@@ -210,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

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -19,6 +19,7 @@ body:
       # Do not manually edit it.
       # Start Collector components list
       - cmd/configschema
+      - cmd/githubgen
       - cmd/mdatagen
       - cmd/opampsupervisor
       - cmd/otelcontribcol

diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -13,6 +13,7 @@ body:
       # Do not manually edit it.
       # Start Collector components list
       - cmd/configschema
+      - cmd/githubgen
       - cmd/mdatagen
       - cmd/opampsupervisor
       - cmd/otelcontribcol

diff --git a/.github/ISSUE_TEMPLATE/other.yaml b/.github/ISSUE_TEMPLATE/other.yaml
@@ -13,6 +13,7 @@ body:
       # Do not manually edit it.
       # Start Collector components list
       - cmd/configschema
+      - cmd/githubgen
       - cmd/mdatagen
       - cmd/opampsupervisor
       - cmd/otelcontribcol

diff --git a/.github/auto_assign.yml b/.github/auto_assign.yml
@@ -15,7 +15,6 @@ assigneeGroups:
     - atoulme
     - dashpole
     - fatsheep9146
-    - kovrus
     # Maintainers
     - bogdandrutu
     - codeboten

diff --git a/README.md b/README.md
@@ -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)):
 

diff --git a/cmd/githubgen/metadata.yaml b/cmd/githubgen/metadata.yaml
@@ -0,0 +1,6 @@
+type: githubgen
+
+status:
+  class: cmd
+  codeowners:
+    active: [atoulme]
diff --git a/connector/routingconnector/README.md b/connector/routingconnector/README.md
@@ -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

diff --git a/connector/routingconnector/metadata.yaml b/connector/routingconnector/metadata.yaml
@@ -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]
diff --git a/connector/spanmetricsconnector/README.md b/connector/spanmetricsconnector/README.md
@@ -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

diff --git a/connector/spanmetricsconnector/metadata.yaml b/connector/spanmetricsconnector/metadata.yaml
@@ -6,4 +6,4 @@ status:
     alpha: [traces_to_metrics]
   distributions: [contrib, sumo]
   codeowners:
-    active: [albertteoh, kovrus]
+    active: [albertteoh]
diff --git a/exporter/datadogexporter/examples/collector.yaml b/exporter/datadogexporter/examples/collector.yaml
@@ -325,6 +325,21 @@ exporters:
       #
       # span_name_as_resource_name: true
 
+      ## @param compute_stats_by_span_kind - enables APM stats computation based on `span.kind`
+      ## If set to true, enables an additional stats computation check on spans to see they have an eligible `span.kind` (server, consumer, client, producer).
+      ## If enabled, a span with an eligible `span.kind` will have stats computed. If disabled, only top-level and measured spans will have stats computed.
+      ## NOTE: For stats computed from OTel traces, only top-level spans are considered when this option is off.
+      #
+      # compute_stats_by_span_kind: true
+
+      ## @param peer_service_aggregation - enables `peer.service` aggregation on trace stats in Datadog exporter
+      ## If set to true, enables `peer.service` aggregation in the exporter. If disabled, aggregated trace stats will not include `peer.service` as a dimension.
+      ## For the best experience with `peer.service`, it is recommended to also enable `compute_stats_by_span_kind`.
+      ## If enabling both causes the datadog exporter to consume too many resources, try disabling `compute_stats_by_span_kind` first.
+      ## If the overhead remains high, it will be due to a high cardinality of `peer.service` values from the traces. You may need to check your instrumentation.
+      #
+      # peer_service_aggregation: true
+
     ## @param host_metadata - custom object - optional
     ## Host metadata specific configuration.
     ## Host metadata is the information used for populating the infrastructure list, the host map and providing host tags functionality within the Datadog app.

diff --git a/exporter/lokiexporter/README.md b/exporter/lokiexporter/README.md
@@ -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

diff --git a/exporter/lokiexporter/metadata.yaml b/exporter/lokiexporter/metadata.yaml
@@ -8,4 +8,4 @@ status:
   - contrib
   - observiq
   codeowners:
-    active: [gramidt, gouthamve, jpkrohling, kovrus, mar4uk]
+    active: [gramidt, gouthamve, jpkrohling, mar4uk]
diff --git a/extension/headerssetterextension/README.md b/extension/headerssetterextension/README.md
@@ -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

diff --git a/extension/headerssetterextension/metadata.yaml b/extension/headerssetterextension/metadata.yaml
@@ -9,4 +9,4 @@ status:
   - grafana
   - sumo
   codeowners:
-    active: [jpkrohling, kovrus]
+    active: [jpkrohling]
diff --git a/pkg/translator/loki/metadata.yaml b/pkg/translator/loki/metadata.yaml
@@ -1,3 +1,3 @@
 status:
   codeowners:
-    active: [gouthamve, jpkrohling, kovrus, mar4uk]
+    active: [gouthamve, jpkrohling, mar4uk]
diff --git a/pkg/translator/prometheusremotewrite/metadata.yaml b/pkg/translator/prometheusremotewrite/metadata.yaml
@@ -1,3 +1,3 @@
 status:
   codeowners:
-    active: [Aneurysm9, kovrus]
+    active: [Aneurysm9]
diff --git a/processor/metricstransformprocessor/metrics_transform_processor_otlp.go b/processor/metricstransformprocessor/metrics_transform_processor_otlp.go
@@ -163,6 +163,7 @@ func extractMetricWithMatchingAttrs(metric pmetric.Metric, f internalFilter) pme
 	newMetric.SetUnit(metric.Unit())
 
 	switch metric.Type() {
+	//exhaustive:enforce
 	case pmetric.MetricTypeGauge:
 		newMetric.SetEmptyGauge().DataPoints().EnsureCapacity(matchedDpsCount)
 		for i := 0; i < metric.Gauge().DataPoints().Len(); i++ {
@@ -443,6 +444,7 @@ func copyMetricDetails(from, to pmetric.Metric) {
 	to.SetName(from.Name())
 	to.SetUnit(from.Unit())
 	to.SetDescription(from.Description())
+	//exhaustive:enforce
 	switch from.Type() {
 	case pmetric.MetricTypeGauge:
 		to.SetEmptyGauge()
@@ -461,6 +463,7 @@ func copyMetricDetails(from, to pmetric.Metric) {
 // rangeDataPointAttributes calls f sequentially on attributes of every metric data point.
 // The iteration terminates if f returns false.
 func rangeDataPointAttributes(metric pmetric.Metric, f func(pcommon.Map) bool) {
+	//exhaustive:enforce
 	switch metric.Type() {
 	case pmetric.MetricTypeGauge:
 		for i := 0; i < metric.Gauge().DataPoints().Len(); i++ {
@@ -501,6 +504,7 @@ func rangeDataPointAttributes(metric pmetric.Metric, f func(pcommon.Map) bool) {
 }
 
 func countDataPoints(metric pmetric.Metric) int {
+	//exhaustive:enforce
 	switch metric.Type() {
 	case pmetric.MetricTypeGauge:
 		return metric.Gauge().DataPoints().Len()

diff --git a/processor/metricstransformprocessor/operation_delete_label_value.go b/processor/metricstransformprocessor/operation_delete_label_value.go
@@ -11,6 +11,7 @@ import (
 // deleteLabelValueOp deletes a label value and all data associated with it
 func deleteLabelValueOp(metric pmetric.Metric, mtpOp internalOperation) {
 	op := mtpOp.configOperation
+	//exhaustive:enforce
 	switch metric.Type() {
 	case pmetric.MetricTypeGauge:
 		metric.Gauge().DataPoints().RemoveIf(func(dp pmetric.NumberDataPoint) bool {