Merge branch 'main' into mvconfig

open-telemetry · Feb 14, 2022 · 7cc5eba · 7cc5eba
2 parents 5d57fca + 1765388
commit 7cc5eba
Show file tree

Hide file tree

Showing 104 changed files with 1,503 additions and 923 deletions.
diff --git a/.github/workflows/api-compatibility.yml b/.github/workflows/api-compatibility.yml
@@ -29,7 +29,7 @@ jobs:
           path: ${{ github.head_ref }}
 
       - name: Setup Go
-        uses: actions/setup-go@v2.1.5
+        uses: actions/setup-go@v2.2.0
         with:
           go-version: 1.17
 

diff --git a/.github/workflows/build-and-test-windows.yaml b/.github/workflows/build-and-test-windows.yaml
@@ -13,7 +13,7 @@ jobs:
       - name: Checkout Repo
         uses: actions/checkout@v2
       - name: Setup Go
-        uses: actions/setup-go@v2.1.5
+        uses: actions/setup-go@v2.2.0
         with:
           go-version: 1.17
       - name: Setup Go Environment

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -13,7 +13,7 @@ jobs:
       - name: Checkout Repo
         uses: actions/checkout@v2
       - name: Setup Go
-        uses: actions/setup-go@v2.1.5
+        uses: actions/setup-go@v2.2.0
         with:
           go-version: 1.17
       - name: Setup Go Environment
@@ -45,7 +45,7 @@ jobs:
       - name: Checkout Repo
         uses: actions/checkout@v2
       - name: Setup Go
-        uses: actions/setup-go@v2.1.5
+        uses: actions/setup-go@v2.2.0
         with:
           go-version: 1.17
       - name: Setup Go Environment
@@ -81,7 +81,7 @@ jobs:
       - name: Gen otelcorecol
         run: |
           make genotelcorecol
-          git diff -s --exit-code || (echo 'ALL_MODULES have been changed, please run "make genotelcorecol" and commit the changes in this PR.' && exit 1)
+          git diff -s --exit-code || (echo 'Generated code is out of date, please run "make genotelcorecol" and commit the changes in this PR.' && exit 1)
       - name: Multimod verify
         run: make multimod-verify
   unittest:
@@ -91,7 +91,7 @@ jobs:
       - name: Checkout Repo
         uses: actions/checkout@v2
       - name: Setup Go
-        uses: actions/setup-go@v2.1.5
+        uses: actions/setup-go@v2.2.0
         with:
           go-version: 1.17
       - name: Setup Go Environment
@@ -124,7 +124,7 @@ jobs:
       - name: Checkout Repo
         uses: actions/checkout@v2
       - name: Setup Go
-        uses: actions/setup-go@v2.1.5
+        uses: actions/setup-go@v2.2.0
         with:
           go-version: 1.17
       - name: Setup Go Environment

diff --git a/.github/workflows/builder-integration-test.yaml b/.github/workflows/builder-integration-test.yaml
@@ -27,7 +27,7 @@ jobs:
     steps:
 
     - name: Set up Go
-      uses: actions/setup-go@v2.1.5
+      uses: actions/setup-go@v2.2.0
       with:
         go-version: 1.17
 

diff --git a/.github/workflows/builder-release.yaml b/.github/workflows/builder-release.yaml
@@ -16,7 +16,7 @@ jobs:
           fetch-depth: 0
       -
         name: Set up Go
-        uses: actions/setup-go@v2.1.5
+        uses: actions/setup-go@v2.2.0
         with:
           go-version: 1.17
       -

diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
@@ -12,7 +12,7 @@ on:
 jobs:
   changelog:
     runs-on: ubuntu-latest
-    if: "!contains(github.event.pull_request.labels.*.name, 'Skip Changelog')"
+    if: ${{ !contains(github.event.pull_request.labels.*.name, 'dependencies') && !contains(github.event.pull_request.labels.*.name, 'Skip Changelog')}}
 
     steps:
       - uses: actions/checkout@v2

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -13,7 +13,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Setup Go
-        uses: actions/setup-go@v2.1.5
+        uses: actions/setup-go@v2.2.0
         with:
           go-version: 1.17
 

diff --git a/.github/workflows/dependabot.yml b/.github/workflows/dependabot.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,17 +4,37 @@
 
 ## 🛑 Breaking changes 🛑
 
+- Remove deprecated funcs in configtelemetry (#4808)
+- Deprecate `service/defaultcomponents` go package (#4622)
+- Move `config.Config` and `config.Service` to `serviceconfig` (#4608)
+
+## 💡 Enhancements 💡
+
+- Reject invalid queue size exporterhelper (#4799)
+- Transform configmapprovider.Retrieved interface to a struct (#4789)
+- Added feature gate summary to zpages extension (#4834)
+
+## 🚩 Deprecations 🚩
+
+- Deprecate `pdata.NumberDataPoint.Type()` and `pdata.Exemplar.Type()` in favor of `NumberDataPoint.ValueType()` and
+  `Exemplar.ValueType()` (#4850)
+
+## v0.44.0 Beta
+
+## 🛑 Breaking changes 🛑
+
 - Deprecate `service.NewConfigProvider`, and a new version `service.MustNewConfigProvider` (#4734).
 - Updated to OTLP 0.12.0. Deprecated traces and metrics messages that existed
   in 0.11.0 are no longer converted to the messages and fields that replaced the deprecated ones.
   Received deprecated messages and fields will be now ignored. In OTLP/JSON in the
   instrumentationLibraryLogs object the "logs" field is now named "logRecords" (#4724)
-- Move `config.Config` and `config.Service` to `serviceconfig` (#4608)
+- `otlphttp` and `otlp` exporters enable gzip compression by default (#4632)
 
 ## 💡 Enhancements 💡
 
 - Invalid requests now return an appropriate unsupported (`405`) or method not allowed (`415`) response (#4735)
 - `client.Info`: Add Host property for Metadata (#4736)
+- Add support for reloading TLS certificates (#4737)
 
 ## v0.43.1 Beta
 

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -412,6 +412,14 @@ version (`vM.N+1`).
 - when a feature is being replaced in favor of an existing one, we MUST mark a feature as deprecated in one version, and
   MAY remove it in a subsequent one.
 
+Deprecation notice SHOULD contain a version starting from which the deprecation takes effect for tracking purposes. For
+example, if `GetFoo` function is going to be deprecated in `v0.45.0` version, it gets the following godoc line:
+
+```go
+// Deprecated: [v0.45.0] Use MustGetFoo instead.
+func GetFoo() Bar {
+```
+
 When deprecating a feature affecting end-users, consider first deprecating the feature in one version, then hiding it
 behind a [feature
 flag](https://github.com/open-telemetry/opentelemetry-collector/blob/6b5a3d08a96bfb41a5e121b34f592a1d5c6e0435/service/featuregate/)

diff --git a/Makefile b/Makefile
@@ -90,8 +90,7 @@ gofmt:
 .PHONY: gotidy
 gotidy:
 	$(MAKE) for-all CMD="rm -fr go.sum"
-	$(MAKE) for-all CMD="go mod tidy -go=1.16"
-	$(MAKE) for-all CMD="go mod tidy -go=1.17"
+	$(MAKE) for-all CMD="go mod tidy -compat=1.17"
 
 .PHONY: addlicense
 addlicense:
@@ -319,13 +318,18 @@ check-contrib:
 	make -C $(CONTRIB_PATH) for-all CMD="go mod edit -dropreplace go.opentelemetry.io/collector"
 
 # List of directories where certificates are stored for unit tests.
-CERT_DIRS := config/configgrpc/testdata \
-             config/confighttp/testdata
+CERT_DIRS := localhost|""|config/configgrpc/testdata \
+             localhost|""|config/confighttp/testdata \
+             example1|"-1"|config/configtls/testdata \
+             example2|"-2"|config/configtls/testdata
+cert-domain = $(firstword $(subst |, ,$1))
+cert-suffix = $(word 2,$(subst |, ,$1))
+cert-dir = $(word 3,$(subst |, ,$1))
 
 # Generate certificates for unit tests relying on certificates.
 .PHONY: certs
 certs:
-	$(foreach dir, $(CERT_DIRS), $(call exec-command, @internal/buildscripts/gen-certs.sh -o $(dir)))
+	$(foreach dir, $(CERT_DIRS), $(call exec-command, @internal/buildscripts/gen-certs.sh -o $(call cert-dir,$(dir)) -s $(call cert-suffix,$(dir)) -m $(call cert-domain,$(dir))))
 
 # Generate certificates for unit tests relying on certificates without copying certs to specific test directories.
 .PHONY: certs-dryrun

diff --git a/README.md b/README.md
@@ -66,16 +66,16 @@ functionality and configuration:
 
 | Signal | Component | Status |
 |--------|-----------|--------|
-|Trace   | OTLP protocol | Stable |
+|Traces  | OTLP protocol | Stable |
 || OTLP receiver functionality | Stable |
-|| OTLP receiver configuration | Beta |
+|| OTLP receiver configuration | Stable |
 || OTLP exporter functionality | Stable |
-|| OTLP exporter configuration | Beta |
-|Metric  | OTLP protocol | Stable |
+|| OTLP exporter configuration | Stable |
+|Metrics | OTLP protocol | Stable |
 || OTLP receiver functionality | Stable |
-|| OTLP receiver configuration | Beta |
+|| OTLP receiver configuration | Stable |
 || OTLP exporter functionality | Stable |
-|| OTLP exporter configuration | Beta |
+|| OTLP exporter configuration | Stable |
 |Logs    | OTLP protocol | Beta |
 || OTLP receiver functionality | Beta |
 || OTLP receiver configuration | Beta |
@@ -101,13 +101,13 @@ Triagers ([@open-telemetry/collector-triagers](https://github.com/orgs/open-tele
 
 Approvers ([@open-telemetry/collector-approvers](https://github.com/orgs/open-telemetry/teams/collector-approvers)):
 
-- [Alex Boten](https://github.com/codeboten), Lightstep
 - [Anthony Mirabella](https://github.com/Aneurysm9), AWS
 - [Dmitrii Anoshin](https://github.com/dmitryax), Splunk
 - [Juraci Paixão Kröhling](https://github.com/jpkrohling), Grafana Labs
 
 Maintainers ([@open-telemetry/collector-maintainers](https://github.com/orgs/open-telemetry/teams/collector-maintainers)):
 
+- [Alex Boten](https://github.com/codeboten), Lightstep
 - [Bogdan Drutu](https://github.com/BogdanDrutu), Splunk
 - [Tigran Najaryan](https://github.com/tigrannajaryan), Splunk
 

diff --git a/cmd/builder/go.mod b/cmd/builder/go.mod
@@ -20,7 +20,7 @@ require (
 	github.com/spf13/cobra v1.3.0
 	github.com/spf13/viper v1.10.1
 	github.com/stretchr/testify v1.7.0
-	go.uber.org/zap v1.20.0
+	go.uber.org/zap v1.21.0
 )
 
 require (
@@ -31,7 +31,6 @@ require (
 	github.com/magiconair/properties v1.8.5 // indirect
 	github.com/mitchellh/mapstructure v1.4.3 // indirect
 	github.com/pelletier/go-toml v1.9.4 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/spf13/afero v1.6.0 // indirect
 	github.com/spf13/cast v1.4.1 // indirect

diff --git a/cmd/builder/go.sum b/cmd/builder/go.sum
@@ -284,9 +284,8 @@ github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144T
 github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM=
 github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
@@ -363,8 +362,8 @@ go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ
 go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
 go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
-go.uber.org/zap v1.20.0 h1:N4oPlghZwYG55MlU6LXk/Zp00FVNE9X9wrYO8CEs4lc=
-go.uber.org/zap v1.20.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw=
+go.uber.org/zap v1.21.0 h1:WefMeulhovoZ2sYXz7st6K0sLj7bBhpiFaud4r4zST8=
+go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=

diff --git a/cmd/builder/internal/builder/config.go b/cmd/builder/internal/builder/config.go
@@ -25,7 +25,7 @@ import (
 	"go.uber.org/zap"
 )
 
-const defaultOtelColVersion = "0.43.0"
+const defaultOtelColVersion = "0.44.0"
 
 // ErrInvalidGoMod indicates an invalid gomod
 var ErrInvalidGoMod = errors.New("invalid gomod specification for module")

diff --git a/cmd/builder/test/core.builder.yaml b/cmd/builder/test/core.builder.yaml
@@ -1,15 +1,15 @@
 dist:
-  module: go.opentelemetry.io/collector/builder/test/nocore
-  otelcol_version: 0.43.0
+  module: go.opentelemetry.io/collector/builder/test/core
+  otelcol_version: 0.44.0
 
 extensions:
   - import: go.opentelemetry.io/collector/extension/zpagesextension
-    gomod: go.opentelemetry.io/collector v0.43.1
+    gomod: go.opentelemetry.io/collector v0.44.0
 
 receivers:
   - import: go.opentelemetry.io/collector/receiver/otlpreceiver
-    gomod: go.opentelemetry.io/collector v0.43.1
+    gomod: go.opentelemetry.io/collector v0.44.0
 
 exporters:
   - import: go.opentelemetry.io/collector/exporter/loggingexporter
-    gomod: go.opentelemetry.io/collector v0.43.1
+    gomod: go.opentelemetry.io/collector v0.44.0
diff --git a/cmd/builder/test/replaces.builder.yaml b/cmd/builder/test/replaces.builder.yaml
@@ -1,22 +1,22 @@
 dist:
   module: go.opentelemetry.io/collector/builder/test/replaces
-  otelcol_version: 0.43.0
+  otelcol_version: 0.44.0
 
 extensions:
   - import: go.opentelemetry.io/collector/extension/zpagesextension
-    gomod: go.opentelemetry.io/collector v0.43.1
+    gomod: go.opentelemetry.io/collector v0.44.0
 
 receivers:
   - import: go.opentelemetry.io/collector/receiver/otlpreceiver
-    gomod: go.opentelemetry.io/collector v0.43.1
+    gomod: go.opentelemetry.io/collector v0.44.0
 
 processors:
-  - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.43.0
-  - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.43.0
+  - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor v0.44.0
+  - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor v0.44.0
 
 exporters:
   - import: go.opentelemetry.io/collector/exporter/loggingexporter
-    gomod: go.opentelemetry.io/collector v0.43.1
+    gomod: go.opentelemetry.io/collector v0.44.0
 
 replaces:
-  - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.43.0
+  - github.com/open-telemetry/opentelemetry-collector-contrib/internal/common => github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.44.0
diff --git a/cmd/otelcorecol/builder-config.yaml b/cmd/otelcorecol/builder-config.yaml
@@ -7,24 +7,24 @@ dist:
 
 receivers:
   - import: go.opentelemetry.io/collector/receiver/otlpreceiver
-    gomod: go.opentelemetry.io/collector v0.43.1
+    gomod: go.opentelemetry.io/collector v0.44.0
 exporters:
   - import: go.opentelemetry.io/collector/exporter/loggingexporter
-    gomod: go.opentelemetry.io/collector v0.43.1
+    gomod: go.opentelemetry.io/collector v0.44.0
   - import: go.opentelemetry.io/collector/exporter/otlpexporter
-    gomod: go.opentelemetry.io/collector v0.43.1
+    gomod: go.opentelemetry.io/collector v0.44.0
   - import: go.opentelemetry.io/collector/exporter/otlphttpexporter
-    gomod: go.opentelemetry.io/collector v0.43.1
+    gomod: go.opentelemetry.io/collector v0.44.0
 extensions:
   - import: go.opentelemetry.io/collector/extension/ballastextension
-    gomod: go.opentelemetry.io/collector v0.43.1
+    gomod: go.opentelemetry.io/collector v0.44.0
   - import: go.opentelemetry.io/collector/extension/zpagesextension
-    gomod: go.opentelemetry.io/collector v0.43.1
+    gomod: go.opentelemetry.io/collector v0.44.0
 processors:
   - import: go.opentelemetry.io/collector/processor/batchprocessor
-    gomod: go.opentelemetry.io/collector v0.43.1
+    gomod: go.opentelemetry.io/collector v0.44.0
   - import: go.opentelemetry.io/collector/processor/memorylimiterprocessor
-    gomod: go.opentelemetry.io/collector v0.43.1
+    gomod: go.opentelemetry.io/collector v0.44.0
 
 replaces:
   - go.opentelemetry.io/collector => ../../