Merge branch 'main' into rmdeprecatedunmarshaler

Author: bogdandrutu

CHANGELOG.md

@@ -8,6 +8,7 @@
 - Move `consumerdata.MetricsData` to `internaldata.MetricsData` (#2512)
 - Remove custom OpenCensus sematic conventions that have equivalent in otel (#2552)
 - Remove support for deprecated unmarshaler `CustomUnmarshaler`, only `Unmarshal` is supported (#2591)
+- Remove deprecated componenterror.CombineErrors (#2598)
 
 ## v0.21.0 Beta
 

component/componenterror/errors.go

@@ -18,8 +18,6 @@ package componenterror
 
 import (
 	"errors"
-
-	"go.opentelemetry.io/collector/consumer/consumererror"
 )
 
 var (
@@ -32,9 +30,3 @@ var (
 	// ErrNilNextConsumer indicates an error on nil next consumer.
 	ErrNilNextConsumer = errors.New("nil nextConsumer")
 )
-
-// CombineErrors converts a list of errors into one error.
-// Deprecated: use consumererror.CombineErrors instead.
-func CombineErrors(errs []error) error {
-	return consumererror.CombineErrors(errs)
-}

component/componenttest/nop_host.go

@@ -19,34 +19,26 @@ import (
 	"go.opentelemetry.io/collector/config/configmodels"
 )
 
-// NopHost mocks a receiver.ReceiverHost for test purposes.
-type NopHost struct {
-}
+// nopHost mocks a receiver.ReceiverHost for test purposes.
+type nopHost struct{}
 
-var _ component.Host = (*NopHost)(nil)
+var nopHostInstance component.Host = &nopHost{}
 
-// NewNopHost returns a new instance of NopHost with proper defaults for most
-// tests.
+// NewNopHost returns a new instance of nopHost with proper defaults for most tests.
 func NewNopHost() component.Host {
-	return &NopHost{}
+	return nopHostInstance
 }
 
-// ReportFatalError is used to report to the host that the receiver encountered
-// a fatal error (i.e.: an error that the instance can't recover from) after
-// its start function has already returned.
-func (nh *NopHost) ReportFatalError(_ error) {
-	// Do nothing for now.
-}
+func (nh *nopHost) ReportFatalError(_ error) {}
 
-// GetFactory of the specified kind. Returns the factory for a component type.
-func (nh *NopHost) GetFactory(_ component.Kind, _ configmodels.Type) component.Factory {
+func (nh *nopHost) GetFactory(_ component.Kind, _ configmodels.Type) component.Factory {
 	return nil
 }
 
-func (nh *NopHost) GetExtensions() map[configmodels.Extension]component.ServiceExtension {
+func (nh *nopHost) GetExtensions() map[configmodels.Extension]component.ServiceExtension {
 	return nil
 }
 
-func (nh *NopHost) GetExporters() map[configmodels.DataType]map[configmodels.Exporter]component.Exporter {
+func (nh *nopHost) GetExporters() map[configmodels.DataType]map[configmodels.Exporter]component.Exporter {
 	return nil
 }

component/componenttest/nop_host_test.go

@@ -27,7 +27,7 @@ import (
 func TestNewNopHost(t *testing.T) {
 	nh := NewNopHost()
 	require.NotNil(t, nh)
-	require.IsType(t, &NopHost{}, nh)
+	require.IsType(t, &nopHost{}, nh)
 
 	nh.ReportFatalError(errors.New("TestError"))
 	assert.Nil(t, nh.GetExporters())

config/configgrpc/README.md

@@ -25,6 +25,9 @@ README](../configtls/README.md).
   - `timeout`
 - [`read_buffer_size`](https://godoc.org/google.golang.org/grpc#ReadBufferSize)
 - [`write_buffer_size`](https://godoc.org/google.golang.org/grpc#WriteBufferSize)
+- [`per_rpc_auth`](https://pkg.go.dev/google.golang.org/grpc#PerRPCCredentials): the credentials to send for every RPC. Note that this isn't about sending the headers only during the initial connection as an `authorization` header under the `headers` would do: this is sent for every RPC performed during an established connection.
+  - `auth_type`: the authentication type, currently only `bearer` is supported
+  - `bearer_token`: the bearer token to use for each RPC call.
 
 Example:
 

config/configmodels/config.go

@@ -0,0 +1,86 @@
+// Copyright The OpenTelemetry Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//       http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Package configmodels defines the data models for entities. This file defines the
+// models for configuration format. The defined entities are:
+// Config (the top-level structure), Receivers, Exporters, Processors, Pipelines.
+//
+// Receivers, Exporters and Processors typically have common configuration settings, however
+// sometimes specific implementations will have extra configuration settings.
+// This requires the configuration data for these entities to be polymorphic.
+//
+// To satisfy these requirements we declare interfaces Receiver, Exporter, Processor,
+// which define the behavior. We also provide helper structs ReceiverSettings, ExporterSettings,
+// ProcessorSettings, which define the common settings and un-marshaling from config files.
+//
+// Specific Receivers/Exporters/Processors are expected to at the minimum implement the
+// corresponding interface and if they have additional settings they must also extend
+// the corresponding common settings struct (the easiest approach is to embed the common struct).
+package configmodels
+
+// Config defines the configuration for the various elements of collector or agent.
+type Config struct {
+	Receivers
+	Exporters
+	Processors
+	Extensions
+	Service
+}
+
+// Service defines the configurable components of the service.
+type Service struct {
+	// Extensions is the ordered list of extensions configured for the service.
+	Extensions []string
+
+	// Pipelines is the set of data pipelines configured for the service.
+	Pipelines Pipelines
+}
+
+// Type is the component type as it is used in the config.
+type Type string
+
+// NamedEntity is a configuration entity that has a type and a name.
+type NamedEntity interface {
+	Type() Type
+	Name() string
+	SetName(name string)
+}
+
+// DataType is the data type that is supported for collection. We currently support
+// collecting metrics, traces and logs, this can expand in the future.
+type DataType string
+
+// Currently supported data types. Add new data types here when new types are supported in the future.
+const (
+	// TracesDataType is the data type tag for traces.
+	TracesDataType DataType = "traces"
+
+	// MetricsDataType is the data type tag for metrics.
+	MetricsDataType DataType = "metrics"
+
+	// LogsDataType is the data type tag for logs.
+	LogsDataType DataType = "logs"
+)
+
+// Pipeline defines a single pipeline.
+type Pipeline struct {
+	Name       string
+	InputType  DataType
+	Receivers  []string
+	Processors []string
+	Exporters  []string
+}
+
+// Pipelines is a map of names to Pipelines.
+type Pipelines map[string]*Pipeline