Merge branch 'main' into json_conversion

open-telemetry · Mar 16, 2022 · 0953993 · 0953993
2 parents d488758 + 749a3c5
commit 0953993
Show file tree

Hide file tree

Showing 63 changed files with 708 additions and 956 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,15 +4,27 @@
 
 ### 🛑 Breaking changes 🛑
 
+- Remove service/defaultcomponents deprecated package (#5019)
+
+## v0.47.0 Beta
+
+### 🛑 Breaking changes 🛑
+
 - Remove `Type` funcs in pdata (#4933)
-- Rename `pdata.AttributeMap.Delete` to `pdata.AttributeMap.Remove` (#4914)
 - pdata: deprecate funcs working with InternalRep (#4957)
+- Remove all deprecated funcs/structs from v0.46.0 (#4995)
 - AsString for pdata.AttributeValue now returns the JSON-encoded string of floats. (#4934)
 
+### 🚩 Deprecations 🚩
+
+- Deprecate `pdata.AttributeMap.Delete` in favor of `pdata.AttributeMap.Remove` (#4914)
+- Deprecate consumerhelper, move helpers to consumer (#5006)
+
 ### 💡 Enhancements 💡
 
 - Add `pdata.AttributeMap.RemoveIf`, which is a more performant way to remove multiple keys (#4914)
 - Add `pipeline` key with pipeline identifier to processor loggers (#4968)
+- Add a new yaml provider, allows providing yaml bytes (#4998)
 
 ### 🧰 Bug fixes 🧰
 
@@ -24,6 +36,14 @@
 
 ### 🛑 Breaking changes 🛑
 
+- Change otel collector to enable open telemetry metrics through feature gate instead of a constant (#4912)
+- Remove support for legacy otlp/http port. (#4916)
+- Remove deprecated funcs in pdata (#4809)
+- Remove deprecated Retrieve funcs/calls (#4922)
+- Remove deprecated NewConfigProvider funcs (#4937)
+
+### 🚩 Deprecations 🚩
+
 - Deprecated funcs `config.DefaultConfig`, `confighttp.DefaultHTTPSettings`, `exporterhelper.DefaultTimeoutSettings`, 
   `exporthelper.DefaultQueueSettings`, `exporterhelper.DefaultRetrySettings`, `testcomponents.DefaultFactories`, and
   `scraperhelper.DefaultScraperControllerSettings` in favour for their `NewDefault` method to adhere to contribution guidelines (#4865)
@@ -50,11 +70,6 @@
   - Deprecated `receiverhelper.WithMetrics` in favour of `component.WithMetricsReceiver`
   - Deprecated `receiverhelper.WithLogs` in favour of `component.WithLogsReceiver`
   - Deprecated `receiverhelper.NewFactory` in favour of `component.NewReceiverFactory`
-- Change otel collector to enable open telemetry metrics through feature gate instead of a constant
-- Remove support for legacy otlp/http port. (#4916)
-- Remove deprecated funcs in pdata (#4809)
-- Remove deprecated Retrieve funcs/calls (#4922)
-- Remove deprecated NewConfigProvider funcs (#4937)
 
 ### 💡 Enhancements 💡
 
@@ -76,9 +91,14 @@
 ### 🛑 Breaking changes 🛑
 
 - Remove deprecated funcs in configtelemetry (#4808)
-- Deprecate `service/defaultcomponents` go package (#4622)
 - `otlphttp` and `otlp` exporters enable gzip compression by default (#4632)
 
+### 🚩 Deprecations 🚩
+
+- Deprecate `service/defaultcomponents` go package (#4622)
+- Deprecate `pdata.NumberDataPoint.Type()` and `pdata.Exemplar.Type()` in favor of `NumberDataPoint.ValueType()` and
+  `Exemplar.ValueType()` (#4850)
+
 ### 💡 Enhancements 💡
 
 - Reject invalid queue size exporterhelper (#4799)
@@ -90,21 +110,19 @@
 
 - `confighttp`: Allow CORS requests with configured auth (#4869)
 
-### 🚩 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)
 
+### 🚩 Deprecations 🚩
+
+- Deprecate `service.NewConfigProvider`, and a new version `service.MustNewConfigProvider` (#4734).
+
 ### 💡 Enhancements 💡
 
 - Invalid requests now return an appropriate unsupported (`405`) or method not allowed (`415`) response (#4735)
@@ -132,11 +150,14 @@
   - Usages of `--metrics-level={VALUE}` can be replaced by `--set=service.telemetry.metrics.level={VALUE}`;
   - Usages of `--metrics-addr={VALUE}` can be replaced by `--set=service.telemetry.metrics.address={VALUE}`;
 - Updated confighttp `ToClient` to support passing telemetry settings for instrumenting otlphttp exporter(#4449)
-- Deprecate `configtelemetry.Level.Set()` (#4700)
 - Remove support to some arches and platforms from `ocb` (opentelemetry-collector-builder) (#4710)
 - Remove deprecated legacy path ("v1/trace") support for otlp http receiver (#4720)
 - Change the `service.NewDefaultConfigProvider` to accept a slice of location strings (#4727).
 
+### 🚩 Deprecations 🚩
+
+- Deprecate `configtelemetry.Level.Set()` (#4700)
+
 ### 🧰 Bug fixes 🧰
 
 - Ensure Windows path (e.g: C:) is recognized as a file path (#4726)
@@ -369,8 +390,6 @@
 - Artifacts are no longer published in this repository, check [here](https://github.com/open-telemetry/opentelemetry-collector-releases) (#3941)
 - Remove deprecated `tracetranslator.AttributeValueToString` and `tracetranslator.AttributeMapToMap` (#3873)
 - Change semantic conventions for status (code, msg) as per specifications (#3872)
-- Add `pdata.NewTimestampFromTime`, deprecate `pdata.TimestampFromTime` (#3868)
-- Add `pdata.NewAttributeMapFromMap`, deprecate `pdata.AttributeMap.InitFromMap` (#3936)
 - Move `fileexporter` to contrib (#3474)
 - Move `jaegerexporter` to contrib (#3474)
 - Move `kafkaexporter` to contrib (#3474)
@@ -401,6 +420,11 @@
 - Move `processor/processorhelper/attraction` to contrib (#3474)
 - Move `translator/conventions` to `model/semconv` (#3901)
 
+### 🚩 Deprecations 🚩
+
+- Add `pdata.NewTimestampFromTime`, deprecate `pdata.TimestampFromTime` (#3868)
+- Add `pdata.NewAttributeMapFromMap`, deprecate `pdata.AttributeMap.InitFromMap` (#3936)
+
 ## v0.33.0 Beta
 
 ### 🛑 Breaking changes 🛑
@@ -507,9 +531,12 @@ This release is marked as "bad" since the metrics pipelines will produce bad dat
 - zipkinv1 implement directly Unmarshaler interface (#3504)
 - zipkinv2 implement directly Marshaler/Unmarshaler interface (#3505)
 - Change exporterhelper to accept ExporterCreateSettings instead of just logger (#3569)
-- Deprecate Resize() from pdata slice APIs (#3573)
 - Use Func pattern in processorhelper, consistent with others (#3570)
 
+### 🚩 Deprecations 🚩
+
+- Deprecate Resize() from pdata slice APIs (#3573)
+
 ### 💡 Enhancements 💡
 
 - Update OTLP to v0.8.0 (#3572)
@@ -677,10 +704,13 @@ This release is marked as "bad" since the metrics pipelines will produce bad dat
 - Rename `ApplicationStartInfo.ExeName` to `BuildInfo.Command`
 - Rename `ApplicationStartInfo.LongName` to `BuildInfo.Description`
 
+### 🚩 Deprecations 🚩
+
+- Add AppendEmpty and deprecate Append for slices (#2970)
+
 ### 💡 Enhancements 💡
 
 - `kafka` exporter: Add logs support (#2943)
-- Add AppendEmpty and deprecate Append for slices (#2970)
 - Update mdatagen to create factories of init instead of new (#2978)
 - `zipkin` receiver: Reduce the judgment of zipkin v1 version (#2990)
 - Custom authenticator logic to accept a `component.Host` which will extract the authenticator to use based on a new authenticator name property (#2767)
@@ -772,13 +802,16 @@ This release is marked as "bad" since the metrics pipelines will produce bad dat
 - Move `configmodels` to `config` (#2808)
 - Move `fluentforward` receiver to contrib (#2723)
 
+### 🚩 Deprecations 🚩
+
+- Deprecate `consumetest.New[${SIGNAL}]Nop` in favor of `consumetest.NewNop` (#2878)
+- Deprecate `consumetest.New[${SIGNAL}]Err` in favor of `consumetest.NewErr` (#2878)
+
 ### 💡 Enhancements 💡
 
 - `batch` processor: - Support max batch size for logs (#2736)
 - Use `Endpoint` for health check extension (#2782)
 - Use `confignet.TCPAddr` for `pprof` and `zpages` extensions (#2829)
-- Deprecate `consumetest.New[${SIGNAL}]Nop` in favor of `consumetest.NewNop` (#2878)
-- Deprecate `consumetest.New[${SIGNAL}]Err` in favor of `consumetest.NewErr` (#2878)
 - Add watcher to values retrieved via config sources (#2803)
 - Updates for cloud semantic conventions (#2809)
   - `cloud.infrastructure_service` -> `cloud.platform`
@@ -1012,14 +1045,17 @@ This release is marked as "bad" since the metrics pipelines will produce bad dat
 - Rename component.TraceReceiver to component.TracesReceiver #1975
 - Rename component.TraceProcessor to component.TracesProcessor #1976
 - Rename component.TraceExporter to component.TracesExporter #1975
-- Deprecate NopExporter, add NopConsumer (#1972)
-- Deprecate SinkExporter, add SinkConsumer (#1973)
 - Move `tailsampling` processor to contrib (#2012)
 - Remove NewAttributeValueSlice (#2028) and mark NewAttributeValue as deprecated (#2022)
 - Remove pdata.StringValue (#2021)
 - Remove pdata.InitFromAttributeMap, use CopyTo if needed (#2042)
 - Remove SetMapVal and SetArrayVal for pdata.AttributeValue (#2039)
 
+### 🚩 Deprecations 🚩
+
+- Deprecate NopExporter, add NopConsumer (#1972)
+- Deprecate SinkExporter, add SinkConsumer (#1973)
+
 ### 💡 Enhancements 💡
 
 - `zipkin` exporter: Add queue retry to zipkin (#1971)
@@ -1093,13 +1129,16 @@ This release is marked as "bad" since the metrics pipelines will produce bad dat
   - Add filters for mount point and filesystem type (#1866)
 - Add cloud.provider semantic conventions (#1865)
 - `attribute` processor: Add log support (#1783)
-- Deprecate OpenCensus-based internal data structures (#1843)
 - Introduce SpanID data type, not yet used in Protobuf messages ($1854, #1855)
 - Enable `otlp` trace by default in the released docker image (#1883)
 - `tailsampling` processor: Combine batches of spans into a single batch (#1864)
 - `filter` processor: Update to use pdata (#1885)
 - Allow MSI upgrades (#1914)
 
+### 🚩 Deprecations 🚩
+
+- Deprecate OpenCensus-based internal data structures (#1843)
+
 ### 🧰 Bug fixes 🧰
 
 - `prometheus` receiver: Print a more informative message about 'up' metric value (#1826)

diff --git a/Makefile b/Makefile
@@ -26,7 +26,7 @@ BUILD_INFO=-ldflags "-X $(BUILD_INFO_IMPORT_PATH).Version=$(VERSION)"
 
 RUN_CONFIG?=examples/local/otel-config.yaml
 CONTRIB_PATH=$(CURDIR)/../opentelemetry-collector-contrib
-COMP_REL_PATH=service/defaultcomponents/defaults.go
+COMP_REL_PATH=cmd/otelcorecol/components.go
 MOD_NAME=go.opentelemetry.io/collector
 
 ADDLICENSE=addlicense
@@ -230,7 +230,7 @@ gendependabot: $(eval SHELL:=/bin/bash)
 OPENTELEMETRY_PROTO_SRC_DIR=model/internal/opentelemetry-proto
 
 # The SHA matching the current version of the proto to use
-OPENTELEMETRY_PROTO_VERSION=v0.12.0
+OPENTELEMETRY_PROTO_VERSION=v0.14.0
 
 # Find all .proto files.
 OPENTELEMETRY_PROTO_FILES := $(subst $(OPENTELEMETRY_PROTO_SRC_DIR)/,,$(wildcard $(OPENTELEMETRY_PROTO_SRC_DIR)/opentelemetry/proto/*/v1/*.proto $(OPENTELEMETRY_PROTO_SRC_DIR)/opentelemetry/proto/collector/*/v1/*.proto))
@@ -244,7 +244,7 @@ PROTO_PACKAGE=go.opentelemetry.io/collector/$(PROTO_TARGET_GEN_DIR)
 # Intermediate directory used during generation.
 PROTO_INTERMEDIATE_DIR=model/internal/.patched-otlp-proto
 
-DOCKER_PROTOBUF ?= otel/build-protobuf:0.4.1
+DOCKER_PROTOBUF ?= otel/build-protobuf:0.9.0
 PROTOC := docker run --rm -u ${shell id -u} -v${PWD}:${PWD} -w${PWD}/$(PROTO_INTERMEDIATE_DIR) ${DOCKER_PROTOBUF} --proto_path=${PWD}
 PROTO_INCLUDES := -I/usr/include/github.com/gogo/protobuf -I./
 

diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
     &nbsp;&nbsp;&bull;&nbsp;&nbsp;
     <a href="CONTRIBUTING.md">Getting Involved</a>
     &nbsp;&nbsp;&bull;&nbsp;&nbsp;
-    <a href="https://gitter.im/open-telemetry/opentelemetry-service">Getting In Touch</a>
+    <a href="https://cloud-native.slack.com/archives/C01N6P7KR6W">Getting In Touch</a>
   </strong>
 </p>
 
@@ -48,7 +48,7 @@
 The OpenTelemetry Collector offers a vendor-agnostic implementation on how to
 receive, process and export telemetry data. In addition, it removes the need
 to run, operate and maintain multiple agents/collectors in order to support
-open-source telemetry data formats (e.g. Jaeger, Prometheus, etc.) sending to
+open-source telemetry data formats (e.g. Jaeger, Prometheus, etc.) to
 multiple open-source or commercial back-ends.
 
 Objectives:
@@ -81,13 +81,13 @@ functionality and configuration:
 || OTLP receiver configuration | Beta |
 || OTLP exporter functionality | Beta |
 || OTLP exporter configuration | Beta |
-|Common| Logging exporter | unstable |
+|Common| Logging exporter | Unstable |
 || Batch processor functionality | Beta |
 || Batch processor configuration | Beta |
 || MemoryLimiter processor functionality | Beta |
 || MemoryLimiter processor configuration | Beta |
 
-We follow the production maturity level defined [here](https://github.com/open-telemetry/community/blob/47813530864b9fe5a5146f466a58bd2bb94edc72/maturity-matrix.yaml#L31)
+We follow the production maturity level defined [here](https://github.com/open-telemetry/community/blob/47813530864b9fe5a5146f466a58bd2bb94edc72/maturity-matrix.yaml#L31).
 
 ### Compatibility
 
@@ -103,46 +103,47 @@ Official OpenTelemetry Collector distro binaries may be built with any supported
 
 ## Contributing
 
-See [CONTRIBUTING.md](CONTRIBUTING.md).
+See the [Contributing Guide](CONTRIBUTING.md) for details.
 
-Triagers ([@open-telemetry/collector-triagers](https://github.com/orgs/open-telemetry/teams/collector-triagers)):
+Here is a list of community roles with current and previous members:
 
-- [Alolita Sharma](https://github.com/alolita), AWS
-- [Punya Biswal](https://github.com/punya), Google
-- [Steve Flanders](https://github.com/flands), Splunk
+- Triagers ([@open-telemetry/collector-triagers](https://github.com/orgs/open-telemetry/teams/collector-triagers)):
+   - [Alolita Sharma](https://github.com/alolita), AWS
+   - [Punya Biswal](https://github.com/punya), Google
+   - [Steve Flanders](https://github.com/flands), Splunk
 
-Emeritus Triagers:
+- Emeritus Triagers:
 
-- [Andrew Hsu](https://github.com/andrewhsu), Lightstep
+   - [Andrew Hsu](https://github.com/andrewhsu), Lightstep
 
-Approvers ([@open-telemetry/collector-approvers](https://github.com/orgs/open-telemetry/teams/collector-approvers)):
+- Approvers ([@open-telemetry/collector-approvers](https://github.com/orgs/open-telemetry/teams/collector-approvers)):
 
-- [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
-- [Pablo Baeyens](https://github.com/mx-psi), DataDog
+   - [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
+   - [Pablo Baeyens](https://github.com/mx-psi), DataDog
 
-Emeritus Approvers:
+- Emeritus Approvers:
 
-- [James Bebbington](https://github.com/james-bebbington), Google
-- [Jay Camp](https://github.com/jrcamp), Splunk
-- [Nail Islamov](https://github.com/nilebox), Google
-- [Owais Lone](https://github.com/owais), Splunk
-- [Rahul Patel](https://github.com/rghetia), Google
-- [Steven Karis](https://github.com/sjkaris), Splunk
-- [Yang Song](https://github.com/songy23), Google
+   - [James Bebbington](https://github.com/james-bebbington), Google
+   - [Jay Camp](https://github.com/jrcamp), Splunk
+   - [Nail Islamov](https://github.com/nilebox), Google
+   - [Owais Lone](https://github.com/owais), Splunk
+   - [Rahul Patel](https://github.com/rghetia), Google
+   - [Steven Karis](https://github.com/sjkaris), Splunk
+   - [Yang Song](https://github.com/songy23), Google
 
-Maintainers ([@open-telemetry/collector-maintainers](https://github.com/orgs/open-telemetry/teams/collector-maintainers)):
+- 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
+   - [Alex Boten](https://github.com/codeboten), Lightstep
+   - [Bogdan Drutu](https://github.com/BogdanDrutu), Splunk
+   - [Tigran Najaryan](https://github.com/tigrannajaryan), Splunk
 
-Emeritus Maintainers:
+- Emeritus Maintainers:
 
-- [Paulo Janotti](https://github.com/pjanotti), Splunk
+   - [Paulo Janotti](https://github.com/pjanotti), Splunk
 
-Learn more about roles in the [community repository](https://github.com/open-telemetry/community/blob/main/community-membership.md).
+Learn more about roles in [Community membership](https://github.com/open-telemetry/community/blob/main/community-membership.md).
 
 Thanks to all the people who already contributed!
 

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.46.0"
+const defaultOtelColVersion = "0.47.0"
 
 // ErrInvalidGoMod indicates an invalid gomod
 var ErrInvalidGoMod = errors.New("invalid gomod specification for module")
@@ -63,9 +63,6 @@ type Module struct {
 	Path   string `mapstructure:"path"`   // an optional path to the local version of this module
 }
 
-// Deprecated: [v0.46.0] Use NewDefaultConfig instead
-var DefaultConfig = NewDefaultConfig
-
 // NewDefaultConfig creates a new config, with default values
 func NewDefaultConfig() Config {
 	log, err := zap.NewDevelopment()

diff --git a/cmd/builder/internal/builder/config_test.go b/cmd/builder/internal/builder/config_test.go
@@ -131,8 +131,8 @@ func TestInvalidModule(t *testing.T) {
 	}
 }
 
-func TestDefaultConfig(t *testing.T) {
-	cfg := DefaultConfig()
+func TestNewDefaultConfig(t *testing.T) {
+	cfg := NewDefaultConfig()
 	require.NoError(t, cfg.ParseModules())
 	require.NoError(t, cfg.Validate())
 }