Merge pull request #8 from newrelic-forks/alanwest/upstream-update

Update from upstream

.github/CODEOWNERS

@@ -14,69 +14,70 @@
 
 * @open-telemetry/collector-contrib-approvers
 
-exporter/alibabacloudlogserviceexporter/   @open-telemetry/collector-contrib-approvers @shabicheng @kongluoxing
-exporter/awsemfexporter/                   @open-telemetry/collector-contrib-approvers @anuraaga @shaochengwang @mxiamxia
-exporter/awsprometheusremotewriteexporter/ @open-telemetry/collector-contrib-approvers @rakyll @alolita
-exporter/awsxrayexporter/                  @open-telemetry/collector-contrib-approvers @kbrockhoff @anuraaga
-exporter/azuremonitorexporter/             @open-telemetry/collector-contrib-approvers @pcwiese
-exporter/carbonexporter/                   @open-telemetry/collector-contrib-approvers @pjanotti
-exporter/datadogexporter/                  @open-telemetry/collector-contrib-approvers @KSerrania @ericmustin @mx-psi
-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/honeycombexporter/                @open-telemetry/collector-contrib-approvers @paulosman @lizthegrey @MikeGoldsmith
-exporter/jaegerthrifthttpexporter/         @open-telemetry/collector-contrib-approvers @jpkrohling @pavolloffay
-exporter/awskinesisexporter/                  @open-telemetry/collector-contrib-approvers @owais
-exporter/loadbalancingexporter/            @open-telemetry/collector-contrib-approvers @jpkrohling
-exporter/logzioexporter/                   @open-telemetry/collector-contrib-approvers @yyyogev
-exporter/lokiexporter/                     @open-telemetry/collector-contrib-approvers @gramidt
-exporter/newrelicexporter/                 @open-telemetry/collector-contrib-approvers @alanwest @a-feld @jack-berg @nrcventura
-exporter/sapmexporter/                     @open-telemetry/collector-contrib-approvers @owais @dmitryax
-exporter/sentryexporter/                   @open-telemetry/collector-contrib-approvers @AbhiPrasad
-exporter/signalfxexporter/                 @open-telemetry/collector-contrib-approvers @pmcollins @asuresh4
-exporter/signalfxcorrelationexporter/      @open-telemetry/collector-contrib-approvers @jrcamp @keitwb
-exporter/splunkhecexporter/                @open-telemetry/collector-contrib-approvers @atoulme
-exporter/stackdriverexporter/              @open-telemetry/collector-contrib-approvers @dashpole
-exporter/sumologicexporter/                @open-telemetry/collector-contrib-approvers @pmm-sumo @sumo-drosiek
-exporter/uptraceexporter/                  @open-telemetry/collector-contrib-approvers @vmihailenco
+exporter/alibabacloudlogserviceexporter/             @open-telemetry/collector-contrib-approvers @shabicheng @kongluoxing
+exporter/awsemfexporter/                             @open-telemetry/collector-contrib-approvers @anuraaga @shaochengwang @mxiamxia
+exporter/awsprometheusremotewriteexporter/           @open-telemetry/collector-contrib-approvers @rakyll @alolita
+exporter/awsxrayexporter/                            @open-telemetry/collector-contrib-approvers @kbrockhoff @anuraaga
+exporter/azuremonitorexporter/                       @open-telemetry/collector-contrib-approvers @pcwiese
+exporter/carbonexporter/                             @open-telemetry/collector-contrib-approvers @pjanotti
+exporter/datadogexporter/                            @open-telemetry/collector-contrib-approvers @KSerrania @ericmustin @mx-psi
+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/honeycombexporter/                          @open-telemetry/collector-contrib-approvers @paulosman @lizthegrey @MikeGoldsmith
+exporter/jaegerthrifthttpexporter/                   @open-telemetry/collector-contrib-approvers @jpkrohling @pavolloffay
+exporter/awskinesisexporter/                         @open-telemetry/collector-contrib-approvers @owais
+exporter/loadbalancingexporter/                      @open-telemetry/collector-contrib-approvers @jpkrohling
+exporter/logzioexporter/                             @open-telemetry/collector-contrib-approvers @yyyogev
+exporter/lokiexporter/                               @open-telemetry/collector-contrib-approvers @gramidt
+exporter/newrelicexporter/                           @open-telemetry/collector-contrib-approvers @alanwest @a-feld @jack-berg @nrcventura
+exporter/sapmexporter/                               @open-telemetry/collector-contrib-approvers @owais @dmitryax
+exporter/sentryexporter/                             @open-telemetry/collector-contrib-approvers @AbhiPrasad
+exporter/signalfxexporter/                           @open-telemetry/collector-contrib-approvers @pmcollins @asuresh4
+exporter/signalfxcorrelationexporter/                @open-telemetry/collector-contrib-approvers @jrcamp @keitwb
+exporter/splunkhecexporter/                          @open-telemetry/collector-contrib-approvers @atoulme
+exporter/stackdriverexporter/                        @open-telemetry/collector-contrib-approvers @dashpole
+exporter/sumologicexporter/                          @open-telemetry/collector-contrib-approvers @pmm-sumo @sumo-drosiek
+exporter/uptraceexporter/                            @open-telemetry/collector-contrib-approvers @vmihailenco
 
-extension/httpforwarder/                   @open-telemetry/collector-contrib-approvers @asuresh4
-extension/observer/                        @open-telemetry/collector-contrib-approvers @asuresh4 @jrcamp
+extension/httpforwarder/                             @open-telemetry/collector-contrib-approvers @asuresh4
+extension/observer/                                  @open-telemetry/collector-contrib-approvers @asuresh4 @jrcamp
 
-internal/awsxray/                          @open-telemetry/collector-contrib-approvers @anuraaga @mxiamxia
-internal/k8sconfig/                        @open-telemetry/collector-contrib-approvers @pmcollins @asuresh4
-internal/splunk/                           @open-telemetry/collector-contrib-approvers @pmcollins @asuresh4
-internal/stanza/                           @open-telemetry/collector-contrib-approvers @djaglowski
+internal/awsxray/                                    @open-telemetry/collector-contrib-approvers @anuraaga @mxiamxia
+internal/k8sconfig/                                  @open-telemetry/collector-contrib-approvers @pmcollins @asuresh4
+internal/splunk/                                     @open-telemetry/collector-contrib-approvers @pmcollins @asuresh4
+internal/stanza/                                     @open-telemetry/collector-contrib-approvers @djaglowski
 
-pkg/batchpertrace/                         @open-telemetry/collector-contrib-approvers @jpkrohling
+pkg/batchpertrace/                                   @open-telemetry/collector-contrib-approvers @jpkrohling
 
-processor/groupbyattrsprocessor/           @open-telemetry/collector-contrib-approvers @pmm-sumo
-processor/groupbytraceprocessor/           @open-telemetry/collector-contrib-approvers @jpkrohling
-processor/k8sprocessor/                    @open-telemetry/collector-contrib-approvers @owais @dmitryax @pmm-sumo
-processor/metricstransformprocessor/       @open-telemetry/collector-contrib-approvers @james-bebbington
-processor/resourcedetectionprocessor/      @open-telemetry/collector-contrib-approvers @jrcamp @pmm-sumo @anuraaga @dashpole
-processor/routingprocessor/                @open-telemetry/collector-contrib-approvers @jpkrohling
-processor/tailsamplingprocessor/           @open-telemetry/collector-contrib-approvers @jpkrohling
+processor/groupbyattrsprocessor/                     @open-telemetry/collector-contrib-approvers @pmm-sumo
+processor/groupbytraceprocessor/                     @open-telemetry/collector-contrib-approvers @jpkrohling
+processor/k8sprocessor/                              @open-telemetry/collector-contrib-approvers @owais @dmitryax @pmm-sumo
+processor/metricstransformprocessor/                 @open-telemetry/collector-contrib-approvers @james-bebbington
+processor/resourcedetectionprocessor/                @open-telemetry/collector-contrib-approvers @jrcamp @pmm-sumo @anuraaga @dashpole
+processor/resourcedetectionprocessor/internal/azure  @open-telemetry/collector-contrib-approvers @mx-psi
+processor/routingprocessor/                          @open-telemetry/collector-contrib-approvers @jpkrohling
+processor/tailsamplingprocessor/                     @open-telemetry/collector-contrib-approvers @jpkrohling
 
-receiver/awsecscontainermetricsreceiver/   @open-telemetry/collector-contrib-approvers @kbrockhoff @anuraaga
-receiver/awsxrayreceiver/                  @open-telemetry/collector-contrib-approvers @kbrockhoff @anuraaga
-receiver/carbonreceiver/                   @open-telemetry/collector-contrib-approvers @pjanotti
-receiver/collectdreceiver/                 @open-telemetry/collector-contrib-approvers @owais
-receiver/dockerstatsreceiver/              @open-telemetry/collector-contrib-approvers @rmfitzpatrick
-receiver/jmxreceiver/                      @open-telemetry/collector-contrib-approvers @rmfitzpatrick
-receiver/k8sclusterreceiver/               @open-telemetry/collector-contrib-approvers @asuresh4
-receiver/kubeletstatsreceiver/             @open-telemetry/collector-contrib-approvers @pmcollins @asuresh4
-receiver/prometheusexecreceiver/           @open-telemetry/collector-contrib-approvers @keitwb
-receiver/receivercreator/                  @open-telemetry/collector-contrib-approvers @jrcamp
-receiver/redisreceiver/                    @open-telemetry/collector-contrib-approvers @pmcollins @jrcamp
-receiver/sapmreceiver/                     @open-telemetry/collector-contrib-approvers @owais
-receiver/signalfxreceiver/                 @open-telemetry/collector-contrib-approvers @pjanotti @asuresh4
-receiver/simpleprometheusreceiver/         @open-telemetry/collector-contrib-approvers @asuresh4
-receiver/splunkhecreceiver/                @open-telemetry/collector-contrib-approvers @atoulme @keitwb
-receiver/filelogreceiver/                  @open-telemetry/collector-contrib-approvers @djaglowski
-receiver/statsdreceiver/                   @open-telemetry/collector-contrib-approvers @keitwb @jmacd
-receiver/wavefrontreceiver/                @open-telemetry/collector-contrib-approvers @pjanotti
-receiver/windowsperfcountersreceiver/      @open-telemetry/collector-contrib-approvers @dashpole
+receiver/awsecscontainermetricsreceiver/             @open-telemetry/collector-contrib-approvers @kbrockhoff @anuraaga
+receiver/awsxrayreceiver/                            @open-telemetry/collector-contrib-approvers @kbrockhoff @anuraaga
+receiver/carbonreceiver/                             @open-telemetry/collector-contrib-approvers @pjanotti
+receiver/collectdreceiver/                           @open-telemetry/collector-contrib-approvers @owais
+receiver/dockerstatsreceiver/                        @open-telemetry/collector-contrib-approvers @rmfitzpatrick
+receiver/jmxreceiver/                                @open-telemetry/collector-contrib-approvers @rmfitzpatrick
+receiver/k8sclusterreceiver/                         @open-telemetry/collector-contrib-approvers @asuresh4
+receiver/kubeletstatsreceiver/                       @open-telemetry/collector-contrib-approvers @pmcollins @asuresh4
+receiver/prometheusexecreceiver/                     @open-telemetry/collector-contrib-approvers @keitwb
+receiver/receivercreator/                            @open-telemetry/collector-contrib-approvers @jrcamp
+receiver/redisreceiver/                              @open-telemetry/collector-contrib-approvers @pmcollins @jrcamp
+receiver/sapmreceiver/                               @open-telemetry/collector-contrib-approvers @owais
+receiver/signalfxreceiver/                           @open-telemetry/collector-contrib-approvers @pjanotti @asuresh4
+receiver/simpleprometheusreceiver/                   @open-telemetry/collector-contrib-approvers @asuresh4
+receiver/splunkhecreceiver/                          @open-telemetry/collector-contrib-approvers @atoulme @keitwb
+receiver/filelogreceiver/                            @open-telemetry/collector-contrib-approvers @djaglowski
+receiver/statsdreceiver/                             @open-telemetry/collector-contrib-approvers @keitwb @jmacd
+receiver/wavefrontreceiver/                          @open-telemetry/collector-contrib-approvers @pjanotti
+receiver/windowsperfcountersreceiver/                @open-telemetry/collector-contrib-approvers @dashpole
 
-tracegen/                                  @open-telemetry/collector-contrib-approvers @jpkrohling
+tracegen/                                            @open-telemetry/collector-contrib-approvers @jpkrohling

.github/dependabot.yml

@@ -234,6 +234,10 @@ updates:
     directory: "/receiver/k8sclusterreceiver"
     schedule:
       interval: "weekly"
+  - package-ecosystem: "gomod"
+    directory: "/receiver/kafkametricsreceiver"
+    schedule:
+      interval: "weekly"
   - package-ecosystem: "gomod"
     directory: "/receiver/kubeletstatsreceiver"
     schedule:
@@ -270,6 +274,10 @@ updates:
     directory: "/receiver/simpleprometheusreceiver"
     schedule:
       interval: "weekly"
+  - package-ecosystem: "gomod"
+    directory: "/receiver/simpleprometheusreceiver/examples/federation/prom-counter"
+    schedule:
+      interval: "weekly"
   - package-ecosystem: "gomod"
     directory: "/receiver/splunkhecreceiver"
     schedule:

.golangci.yml

@@ -66,6 +66,9 @@ linters-settings:
           - (github.com/golangci/golangci-lint/pkg/logutils.Log).Fatalf
 
     enable-all: true
+    # TODO: Enable this and fix the alignment issues.
+    disable:
+      - fieldalignment
 
   golint:
     # minimal confidence for issues, default is 0.8

CHANGELOG.md

@@ -2,6 +2,43 @@
 
 ## Unreleased
 
+## v0.22.0
+
+# 🎉 OpenTelemetry Collector Contrib v0.22.0 (Beta) 🎉
+
+The OpenTelemetry Collector Contrib contains everything in the [opentelemetry-collector release](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.22.0) (be sure to check the release notes here as well!). Check out the [Getting Started Guide](https://opentelemetry.io/docs/collector/getting-started/) for deployment and configuration information.
+
+## 🚀 New components 🚀
+
+- `filelog` receiver to tail and parse logs from files using the [opentelemetry-log-collection](https://github.com/open-telemetry/opentelemetry-log-collection) library
+
+## 💡 Enhancements 💡
+
+- `dynatrace` exporter: Send metrics to Dynatrace in chunks of 1000 (#2468)
+- `k8s` processor: Add ability to associate metadata tags using pod UID rather than just IP (#2199)
+- `signalfx` exporter:
+  - Add statusCode to logging field on dimension client (#2459)
+  - Add translation rules for `cpu.utilization_per_core` (#2540)
+  - Updates to metadata handling (#2531)
+  - Calculate extra network I/O metrics (#2553)
+  - Calculate extra disk I/O metrics (#2557)
+- `statsd` receiver: Add metric type label and `enable_metric_type` option (#2466)
+- `sumologic` exporter: Add support for carbon2 format (#2562)
+- `resourcedetection` processor: Add Azure detector (#2372)
+- `k8scluster` receiver: Use OTel conventions for metadata (#2530)
+- `newrelic` exporter: Multi-tenant support for sending trace data and performance enhancements (#2481)
+- `stackdriver` exporter: Enable `retry_on_failure` and `sending_queue` options (#2613)
+- Use standard way to convert from time.Time to proto Timestamp (#2548)
+
+## 🧰 Bug fixes 🧰
+
+- `signalfx` exporter:
+  - Fix calculation of `network.total` metric (#2551)
+  - Correctly convert dimensions on metadata updates (#2552)
+- `awsxray` exporter and receiver: Fix the type of content_length (#2539)
+- `resourcedetection` processor: Use values in accordance to semantic conventions for AWS (#2556)
+- `awsemf` exporter: Fix concurrency issue (#2571)
+
 ## v0.21.0
 
 # 🎉 OpenTelemetry Collector Contrib v0.21.0 (Beta) 🎉

Makefile

@@ -2,7 +2,6 @@ include ./Makefile.Common
 
 RUN_CONFIG=local/config.yaml
 CMD?=
-STATIC_CHECK=staticcheck
 OTEL_VERSION=main
 
 BUILD_INFO_IMPORT_PATH=github.com/open-telemetry/opentelemetry-collector-contrib/internal/version
@@ -13,6 +12,9 @@ BUILD_X2=-X $(BUILD_INFO_IMPORT_PATH).Version=$(VERSION)
 BUILD_X3=-X go.opentelemetry.io/collector/internal/version.BuildType=$(BUILD_TYPE)
 BUILD_INFO=-ldflags "${BUILD_X1} ${BUILD_X2} ${BUILD_X3}"
 
+# ALL_MODULES includes ./* dirs (excludes . dir and example with go code)
+ALL_MODULES := $(shell find . -type f -name "go.mod" -exec dirname {} \; | sort | egrep  '^./' )
+
 # Modules to run integration tests on.
 # XXX: Find a way to automatically populate this. Too slow to run across all modules when there are just a few.
 INTEGRATION_TEST_MODULES := \
@@ -24,8 +26,11 @@ INTEGRATION_TEST_MODULES := \
 
 .DEFAULT_GOAL := all
 
+all-modules:
+	@echo $(ALL_MODULES) | tr ' ' '\n' | sort
+
 .PHONY: all
-all: common otelcontribcol otelcontribcol-unstable
+all: common gotest otelcontribcol otelcontribcol-unstable
 
 .PHONY: e2e-test
 e2e-test: otelcontribcol otelcontribcol-unstable
@@ -54,6 +59,10 @@ gotidy:
 	$(MAKE) for-all CMD="rm -fr go.sum"
 	$(MAKE) for-all CMD="go mod tidy"
 
+.PHONY: gotest
+gotest:
+	$(MAKE) for-all CMD="make test"
+
 .PHONY: gofmt
 gofmt:
 	$(MAKE) for-all CMD="make fmt"
@@ -133,7 +142,6 @@ install-tools:
 	cd $(TOOLS_MOD_DIR) && go install github.com/jstemmer/go-junit-report
 	cd $(TOOLS_MOD_DIR) && go install github.com/pavius/impi/cmd/impi
 	cd $(TOOLS_MOD_DIR) && go install github.com/tcnksm/ghr
-	cd $(TOOLS_MOD_DIR) && go install honnef.co/go/tools/cmd/staticcheck
 	cd $(TOOLS_MOD_DIR) && go install go.opentelemetry.io/collector/cmd/mdatagen
 	cd $(TOOLS_MOD_DIR) && go install go.opentelemetry.io/collector/cmd/issuegenerator
 

Makefile.Common

@@ -11,8 +11,6 @@ ALL_SRC_AND_DOC := $(shell find . \( -name "*.md" -o -name "*.go" -o -name "*.ya
 
 # ALL_PKGS is used with 'go cover'
 ALL_PKGS := $(shell go list $(sort $(dir $(ALL_SRC))) 2>/dev/null)
-# ALL_MODULES includes ./* dirs (excludes . dir and example with go code)
-ALL_MODULES := $(shell find . -type f -name "go.mod" -exec dirname {} \; | sort | egrep  '^./' | grep -v 'receiver/simpleprometheusreceiver/examples/' )
 
 GOTEST_OPT?= -race -timeout 30s
 GOTEST_INTEGRATION_OPT?= -race -timeout 60s
@@ -24,15 +22,11 @@ GOARCH=$(shell go env GOARCH)
 ADDLICENCESE= addlicense
 MISSPELL=misspell -error
 MISSPELL_CORRECTION=misspell -w
-STATICCHECK=staticcheck
 LINT=golangci-lint
 IMPI=impi
 # BUILD_TYPE should be one of (dev, release).
 BUILD_TYPE?=release
 
-all-modules:
-	@echo $(ALL_MODULES) | tr ' ' '\n' | sort
-
 all-pkgs:
 	@echo $(ALL_PKGS) | tr ' ' '\n' | sort
 
@@ -42,15 +36,11 @@ all-srcs:
 .DEFAULT_GOAL := common
 
 .PHONY: common
-common: checklicense impi lint misspell test
+common: checklicense impi lint misspell
 
 .PHONY: test
 test:
-	@set -e; for dir in $(ALL_MODULES); do \
-	  echo "go test ./... in $${dir}"; \
-	  (cd "$${dir}" && \
-	    $(GOTEST) ./... ); \
-	done
+	$(GOTEST) ./...
 
 .PHONY: do-unit-tests-with-cover
 do-unit-tests-with-cover:
@@ -93,25 +83,13 @@ checklicense:
 			echo "Check License finished successfully"; \
 		fi
 
-.PHONY: lint-static-check
-lint-static-check:
-	@STATIC_CHECK_OUT=`$(STATICCHECK) ./... 2>&1`; \
-		if [ "$$STATIC_CHECK_OUT" ]; then \
-			echo "$(STATICCHECK) FAILED => static check errors:\n"; \
-			echo "$$STATIC_CHECK_OUT\n"; \
-			exit 1; \
-		else \
-			echo "Static check finished successfully"; \
-		fi
-
-
 .PHONY: fmt
 fmt:
 	gofmt  -w -s ./
 	goimports -w  -local github.com/open-telemetry/opentelemetry-collector-contrib ./
 
 .PHONY: lint
-lint: lint-static-check
+lint:
 	$(LINT) run --allow-parallel-runners
 
 .PHONY: misspell