Merge branch 'main' into filter_spans

open-telemetry · Jun 20, 2022 · cefdbd4 · cefdbd4
2 parents 9f1c831 + c1c325f
commit cefdbd4
Show file tree

Hide file tree

Showing 881 changed files with 22,339 additions and 7,986 deletions.
diff --git a/.github/ALLOWLIST b/.github/ALLOWLIST
@@ -16,7 +16,6 @@
 cmd/configschema
 examples/demo/client
 examples/demo/server
-exporter/opencensusexporter
 exporter/parquetexporter
 extension/fluentbitextension
 extension/httpforwarder
@@ -29,15 +28,11 @@ internal/sharedcomponent
 internal/tools
 pkg/batchperresourceattr
 pkg/experimentalmetricmetadata
-pkg/translator/jaeger
-pkg/translator/opencensus
 pkg/translator/prometheusremotewrite
 pkg/translator/signalfx
-pkg/translator/zipkin
 pkg/winperfcounters
 processor/deltatorateprocessor
 processor/metricsgenerationprocessor
-receiver/opencensusreceiver
 receiver/podmanreceiver
 receiver/simpleprometheusreceiver
 receiver/simpleprometheusreceiver/examples/federation/prom-counter

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -9,16 +9,23 @@
 #
 #
 # Learn about CODEOWNERS file format:
-#  https://help.github.com/en/articles/about-code-owners
+# 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/mdatagen                                         @open-telemetry/collector-contrib-approvers @dmitryax
-cmd/telemetrygen                                     @open-telemetry/collector-contrib-approvers @mx-psi @amenasria @codeboten
+cmd/mdatagen/                                        @open-telemetry/collector-contrib-approvers @dmitryax
+cmd/telemetrygen/                                    @open-telemetry/collector-contrib-approvers @mx-psi @amenasria @codeboten
+cmd/otelcontribcol/                                  @open-telemetry/collector-contrib-approvers @codeboten
 
 exporter/alibabacloudlogserviceexporter/             @open-telemetry/collector-contrib-approvers @shabicheng @kongluoxing @qiansheng91
-exporter/awscloudwatchlogsexporter                   @open-telemetry/collector-contrib-approvers @boostchicken
+exporter/awscloudwatchlogsexporter/                  @open-telemetry/collector-contrib-approvers @boostchicken
 exporter/awsemfexporter/                             @open-telemetry/collector-contrib-approvers @Aneurysm9 @shaochengwang @mxiamxia
 exporter/awskinesisexporter/                         @open-telemetry/collector-contrib-approvers @Aneurysm9 @MovieStoreGuy
 exporter/awsprometheusremotewriteexporter/           @open-telemetry/collector-contrib-approvers @Aneurysm9 @alolita
@@ -27,13 +34,14 @@ exporter/azuremonitorexporter/                       @open-telemetry/collector-c
 exporter/carbonexporter/                             @open-telemetry/collector-contrib-approvers @pjanotti
 exporter/clickhouseexporter/                         @open-telemetry/collector-contrib-approvers @hanjm @dmitryax
 exporter/coralogixexporter/                          @open-telemetry/collector-contrib-approvers @oded-dd @ofirshmuel
-exporter/datadogexporter/                            @open-telemetry/collector-contrib-approvers @KSerrania @mx-psi @gbbr @knusbaum
+exporter/datadogexporter/                            @open-telemetry/collector-contrib-approvers @KSerrania @mx-psi @gbbr @knusbaum @amenasria
 exporter/dynatraceexporter/                          @open-telemetry/collector-contrib-approvers @dyladan @arminru
 exporter/elasticexporter/                            @open-telemetry/collector-contrib-approvers @axw @simitt @jalvz
 exporter/elasticsearchexporter/                      @open-telemetry/collector-contrib-approvers @urso @faec @blakerouse
 exporter/f5cloudexporter/                            @open-telemetry/collector-contrib-approvers @gramidt
 exporter/fileexporter/                               @open-telemetry/collector-contrib-approvers @pmm-sumo
-exporter/googlecloudexporter/                        @open-telemetry/collector-contrib-approvers @aabmass @dashpole @jsuereth @punya @tbarker25
+exporter/googlecloudexporter/                        @open-telemetry/collector-contrib-approvers @aabmass @dashpole @jsuereth @punya @tbarker25 @damemi
+exporter/googlemanagedprometheusexporter/            @open-telemetry/collector-contrib-approvers @aabmass @dashpole @jsuereth @punya @tbarker25 @damemi
 exporter/googlecloudpubsubexporter/                  @open-telemetry/collector-contrib-approvers @alexvanboxel
 exporter/honeycombexporter/                          @open-telemetry/collector-contrib-approvers @paulosman @lizthegrey @MikeGoldsmith
 exporter/humioexporter/                              @open-telemetry/collector-contrib-approvers @xitric
@@ -46,6 +54,7 @@ exporter/logzioexporter/                             @open-telemetry/collector-c
 exporter/lokiexporter/                               @open-telemetry/collector-contrib-approvers @gramidt @jpkrohling
 exporter/mezmoexporter/                              @open-telemetry/collector-contrib-approvers @dashpole @billmeyer @gjanco
 exporter/observiqexporter/                           @open-telemetry/collector-contrib-approvers @binaryfissiongames
+exporter/opencensusexporter/                         @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers
 exporter/prometheusexporter/                         @open-telemetry/collector-contrib-approvers @Aneurysm9
 exporter/prometheusremotewriteexporter/              @open-telemetry/collector-contrib-approvers @Aneurysm9
 exporter/sapmexporter/                               @open-telemetry/collector-contrib-approvers @owais @dmitryax
@@ -71,8 +80,8 @@ extension/observer/ecstaskobserver/                  @open-telemetry/collector-c
 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/sigv4authextension/                        @open-telemetry/collector-contrib-approvers @Aneurysm9 @erichsueh3
 extension/pprofextension/                            @open-telemetry/collector-contrib-approvers @MovieStoreGuy
+extension/sigv4authextension/                        @open-telemetry/collector-contrib-approvers @Aneurysm9 @erichsueh3
 extension/storage/dbstorage/                         @open-telemetry/collector-contrib-approvers @dmitryax @atoulme
 extension/storage/filestorage/                       @open-telemetry/collector-contrib-approvers @djaglowski
 
@@ -88,6 +97,9 @@ internal/splunk/                                     @open-telemetry/collector-c
 pkg/batchpersignal/                                  @open-telemetry/collector-contrib-approvers @jpkrohling
 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/opencensus/                           @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers
+pkg/translator/zipkin/                               @open-telemetry/collector-contrib-approvers @open-telemetry/collector-approvers
 
 processor/attributesprocessor/                       @open-telemetry/collector-contrib-approvers @boostchicken @pmm-sumo
 processor/cumulativetodeltaprocessor/                @open-telemetry/collector-contrib-approvers @TylerHelmuth
@@ -100,8 +112,8 @@ processor/metricstransformprocessor/                 @open-telemetry/collector-c
 processor/probabilisticsamplerprocessor/             @open-telemetry/collector-contrib-approvers @jpkrohling
 processor/redactionprocessor/                        @open-telemetry/collector-contrib-approvers @leonsp-ai @dmitryax @mx-psi
 processor/resourcedetectionprocessor/                @open-telemetry/collector-contrib-approvers @jrcamp @pmm-sumo @Aneurysm9 @dashpole
-processor/resourceprocessor                          @open-telemetry/collector-contrib-approvers @dmitryax
-processor/resourcedetectionprocessor/internal/azure  @open-telemetry/collector-contrib-approvers @mx-psi
+processor/resourceprocessor/                         @open-telemetry/collector-contrib-approvers @dmitryax
+processor/resourcedetectionprocessor/internal/azure/ @open-telemetry/collector-contrib-approvers @mx-psi
 processor/routingprocessor/                          @open-telemetry/collector-contrib-approvers @jpkrohling
 processor/schemaprocessor/                           @open-telemetry/collector-contrib-approvers @MovieStoreGuy
 processor/spanmetricsprocessor/                      @open-telemetry/collector-contrib-approvers @albertteoh
@@ -110,14 +122,15 @@ processor/tailsamplingprocessor/                     @open-telemetry/collector-c
 processor/transformprocessor/                        @open-telemetry/collector-contrib-approvers @anuraaga @Aneurysm9 @bogdandrutu @TylerHelmuth
 
 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/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 @willarmiros
 receiver/bigipreceiver/                              @open-telemetry/collector-contrib-approvers @djaglowski @StefanKurek
 receiver/carbonreceiver/                             @open-telemetry/collector-contrib-approvers @pjanotti
-receiver/cloudfoundryreceiver/                       @open-telemetry/collector-contrib-approvers @agoallikmaa @pellared
+receiver/cloudfoundryreceiver/                       @open-telemetry/collector-contrib-approvers @agoallikmaa @pellared @crobert-1
 receiver/collectdreceiver/                           @open-telemetry/collector-contrib-approvers @owais
 receiver/couchdbreceiver/                            @open-telemetry/collector-contrib-approvers @djaglowski
 receiver/dockerstatsreceiver/                        @open-telemetry/collector-contrib-approvers @rmfitzpatrick
@@ -129,7 +142,7 @@ receiver/flinkmetricsreceiver/                       @open-telemetry/collector-c
 receiver/fluentforwardreceiver/                      @open-telemetry/collector-contrib-approvers @dmitryax
 receiver/googlecloudpubsubreceiver/                  @open-telemetry/collector-contrib-approvers @alexvanboxel
 receiver/googlecloudspannerreceiver/                 @open-telemetry/collector-contrib-approvers @ydrozhdzhal @asukhyy @khospodarysko @architjugran
-receiver/hostmetricsreceiver                         @open-telemetry/collector-contrib-approvers @dmitryax
+receiver/hostmetricsreceiver/                        @open-telemetry/collector-contrib-approvers @dmitryax
 receiver/influxdbreceiver/                           @open-telemetry/collector-contrib-approvers @jacobmarble
 receiver/iisreceiver/                                @open-telemetry/collector-contrib-approvers @mrod1598 @djaglowski
 receiver/jaegerreceiver/                             @open-telemetry/collector-contrib-approvers @jpkrohling
@@ -146,6 +159,7 @@ receiver/mongodbatlasreceiver/                       @open-telemetry/collector-c
 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/postgresqlreceiver/                         @open-telemetry/collector-contrib-approvers @djaglowski
 receiver/prometheusexecreceiver/                     @open-telemetry/collector-contrib-approvers @dmitryax
 receiver/prometheusreceiver/                         @open-telemetry/collector-contrib-approvers @Aneurysm9 @dashpole
@@ -156,7 +170,7 @@ receiver/riakreceiver/                               @open-telemetry/collector-c
 receiver/saphanareceiver/                            @open-telemetry/collector-contrib-approvers @pmm-sumo @dehaansa
 receiver/sapmreceiver/                               @open-telemetry/collector-contrib-approvers @owais
 receiver/signalfxreceiver/                           @open-telemetry/collector-contrib-approvers @pjanotti @dmitryax
-receiver/skywalkingreceiver                          @open-telemetry/collector-contrib-approvers @JaredTan95
+receiver/skywalkingreceiver/                         @open-telemetry/collector-contrib-approvers @JaredTan95
 receiver/splunkhecreceiver/                          @open-telemetry/collector-contrib-approvers @atoulme @keitwb
 receiver/sqlqueryreceiver/                           @open-telemetry/collector-contrib-approvers @dmitryax @pmcollins
 receiver/sqlserverreceiver/                          @open-telemetry/collector-contrib-approvers @djaglowski @StefanKurek

diff --git a/.github/workflows/scripts/check-codeowners.sh b/.github/workflows/scripts/check-codeowners.sh
@@ -25,34 +25,44 @@ set -eu -o pipefail
 CODEOWNERS=".github/CODEOWNERS"
 ALLOWLIST=".github/ALLOWLIST"
 
-# Get component folders from the project and checks that they have 
-# an owner in $CODEOWNERS 
+# Get component folders from the project and checks that they have
+# an owner in $CODEOWNERS
 check_code_owner_existence() {
   MODULES=$(find . -type f -name "go.mod" -exec dirname {} \; | sort | grep -E '^./' | cut -c 3-)
   MISSING_COMPONENTS=0
   ALLOW_LIST_COMPONENTS=0
   for module in ${MODULES}
   do
-    if ! grep -q "^$module " "$CODEOWNERS"; then
-      # Account for parent folders which implicitly include 
-      # sub folders e.g. 'internal/aws' is listed in $CODEOWNERS
+    # For a component path exact match, need to add '/ ' to end of module as
+    # each line in the CODEOWNERS file is of the format:
+    # <component_path_relative_from_project_root>/<min_1_space><owner_1><space><owner_2><space>..<owner_n>
+    # This is because the path separator at end is dropped while searching for
+    # modules and there is at least 1 space separating the path from the owners.
+    if ! grep -q "^$module/ " "$CODEOWNERS"; then
+      # If there is not an exact match to component path, there might be a parent folder
+      # which has an owner and would therefore implicitly include the component
+      # path as a sub folder e.g. 'internal/aws' is listed in $CODEOWNERS
       # which accounts for internal/aws/awsutil, internal/aws/k8s etc.
       PREFIX_MODULE_PATH=$(echo $module | cut -d/ -f 1-2)
       if ! grep -wq "^$PREFIX_MODULE_PATH/ " "$CODEOWNERS"; then
         # Check if it is a known component that is waiting on an owner
         if grep -wq "$module" "$ALLOWLIST"; then
           ((ALLOW_LIST_COMPONENTS=ALLOW_LIST_COMPONENTS+1))
-          echo "\"$module\" not included in CODEOWNERS but in the ALLOWLIST"
+          echo "pass: \"$module\" not included in CODEOWNERS but in the ALLOWLIST"
         else
           ((MISSING_COMPONENTS=MISSING_COMPONENTS+1))
-          echo "\"$module\" not included in CODEOWNERS"
+          echo "FAIL: \"$module\" not included in CODEOWNERS"
         fi
       fi
     fi
   done
-  echo "there are $ALLOW_LIST_COMPONENTS components not included in CODEOWNERS but known in the ALLOWLIST"
-  echo "there are $MISSING_COMPONENTS components not included in CODEOWNERS and not known in the ALLOWLIST"
+  if [ "$ALLOW_LIST_COMPONENTS" -gt 0 ]; then
+    echo "---"
+    echo "pass: there are $ALLOW_LIST_COMPONENTS components not included in CODEOWNERS but known in the ALLOWLIST"
+  fi
   if [ "$MISSING_COMPONENTS" -gt 0 ]; then
+    echo "---"
+    echo "FAIL: there are $MISSING_COMPONENTS components not included in CODEOWNERS and not known in the ALLOWLIST"
     exit 1
   fi
 }

diff --git a/.github/workflows/scripts/sqlserver_install.ps1 b/.github/workflows/scripts/sqlserver_install.ps1
diff --git a/.golangci.yml b/.golangci.yml
@@ -105,18 +105,21 @@ linters-settings:
 
 linters:
   enable:
+    - depguard
+    - errcheck
+    - errorlint
     - exportloopref
+    - gocritic
     - gofmt
     - goimports
     - gosec
     - govet
     - misspell
     - revive
     - staticcheck
+    - tenv
     - unconvert
     - unparam
-    - errcheck
-    - gocritic
 
 issues:
   # Excluding configuration per-path, per-linter, per-text and per-source