Merge branch 'main' into main

sfc-gh-sili · Aug 13, 2024 · 4adda55 · 4adda55
2 parents 4aaa8d5 + 3f4f0d0
commit 4adda55
Show file tree

Hide file tree

Showing 88 changed files with 349 additions and 199 deletions.
diff --git a/.chloggen/batchprocessor_metric_units.yaml b/.chloggen/batchprocessor_metric_units.yaml
@@ -0,0 +1,25 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: bug_fix
+
+# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
+component: batchprocessor
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Update units for internal telemetry
+
+# One or more tracking issues or pull requests related to the change
+issues: [10652]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:
+
+# Optional: The change log or logs in which this entry should be included.
+# e.g. '[user]' or '[user, api]'
+# Include 'user' if the change is relevant to end users.
+# Include 'api' if there is a change to a library API.
+# Default: '[user]'
+change_logs: []
diff --git a/.chloggen/componentstatus-add-reporter-interface.yaml b/.chloggen/componentstatus-add-reporter-interface.yaml
@@ -0,0 +1,25 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: enhancement
+
+# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
+component: componentstatus
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Add new Reporter interface to define how to report a status via a `component.Host` implementation
+
+# One or more tracking issues or pull requests related to the change
+issues: [10852]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:
+
+# Optional: The change log or logs in which this entry should be included.
+# e.g. '[user]' or '[user, api]'
+# Include 'user' if the change is relevant to end users.
+# Include 'api' if there is a change to a library API.
+# Default: '[user]'
+change_logs: []
diff --git a/.chloggen/goleak_service.yaml b/.chloggen/goleak_service.yaml
@@ -0,0 +1,25 @@
+# Use this changelog template to create an entry for release notes.
+
+# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
+change_type: bug_fix
+
+# The name of the component, or a single word describing the area of concern, (e.g. otlpreceiver)
+component: service
+
+# A brief description of the change.  Surround your text with quotes ("") if it needs to start with a backtick (`).
+note: Fix memory leaks during service package shutdown
+
+# One or more tracking issues or pull requests related to the change
+issues: [9165]
+
+# (Optional) One or more lines of additional information to render under the primary note.
+# These lines will be padded with 2 spaces and then inserted directly into the document.
+# Use pipe (|) for multiline entries.
+subtext:
+
+# Optional: The change log or logs in which this entry should be included.
+# e.g. '[user]' or '[user, api]'
+# Include 'user' if the change is relevant to end users.
+# Include 'api' if there is a change to a library API.
+# Default: '[user]'
+change_logs: []
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -101,7 +101,7 @@ Reporting bugs is an important contribution. Please make sure to include:
 ### Before you start
 
 Please read the project contribution
-[guide](https://github.com/open-telemetry/community/blob/main/CONTRIBUTING.md)
+[guide](https://github.com/open-telemetry/community/tree/main/guides/contributor)
 for general practices for the OpenTelemetry project.
 
 Select a good issue from the links below (ordered by difficulty/complexity):
@@ -153,7 +153,7 @@ Remember to always work in a branch of your local copy, as you might otherwise
 have to contend with conflicts in `main`.
 
 Please also see [GitHub
-workflow](https://github.com/open-telemetry/community/blob/main/CONTRIBUTING.md#github-workflow)
+workflow](https://github.com/open-telemetry/community/blob/main/guides/contributor/processes.md#github-workflow)
 section of the general project contributing guide.
 
 ## Required Tools

diff --git a/cmd/mdatagen/go.mod b/cmd/mdatagen/go.mod
@@ -29,7 +29,7 @@ require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-viper/mapstructure/v2 v2.0.0 // indirect
+	github.com/go-viper/mapstructure/v2 v2.1.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/hashicorp/go-version v1.7.0 // indirect

diff --git a/cmd/mdatagen/go.sum b/cmd/mdatagen/go.sum
diff --git a/cmd/otelcorecol/go.mod b/cmd/otelcorecol/go.mod
@@ -33,7 +33,7 @@ require (
 	go.opentelemetry.io/collector/receiver v0.107.0
 	go.opentelemetry.io/collector/receiver/nopreceiver v0.107.0
 	go.opentelemetry.io/collector/receiver/otlpreceiver v0.107.0
-	golang.org/x/sys v0.23.0
+	golang.org/x/sys v0.24.0
 )
 
 require (
@@ -45,7 +45,7 @@ require (
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
-	github.com/go-viper/mapstructure/v2 v2.0.0 // indirect
+	github.com/go-viper/mapstructure/v2 v2.1.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/uuid v1.6.0 // indirect

diff --git a/cmd/otelcorecol/go.sum b/cmd/otelcorecol/go.sum
diff --git a/component/componentstatus/status.go b/component/componentstatus/status.go
@@ -11,8 +11,20 @@ package componentstatus // import "go.opentelemetry.io/collector/component/compo
 
 import (
 	"time"
+
+	"go.opentelemetry.io/collector/component"
 )
 
+// Reporter is an extra interface for `component.Host` implementations.
+// A Reporter defines how to report a `componentstatus.Event`.
+type Reporter interface {
+	// Report allows a component to report runtime changes in status. The service
+	// will automatically report status for a component during startup and shutdown. Components can
+	// use this method to report status after start and before shutdown. For more details about
+	// component status reporting see: https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/component-status.md
+	Report(*Event)
+}
+
 // Watcher is an extra interface for Extension hosted by the OpenTelemetry
 // Collector that is to be implemented by extensions interested in changes to component
 // status.
@@ -137,3 +149,12 @@ func StatusIsError(status Status) bool {
 		status == StatusPermanentError ||
 		status == StatusFatalError
 }
+
+// ReportStatus is a helper function that handles checking if the component.Host has implemented Reporter.
+// If it has, the Event is reported. Otherwise, nothing happens.
+func ReportStatus(host component.Host, e *Event) {
+	statusReporter, ok := host.(Reporter)
+	if ok {
+		statusReporter.Report(e)
+	}
+}
diff --git a/component/componentstatus/status_test.go b/component/componentstatus/status_test.go
@@ -8,6 +8,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"go.opentelemetry.io/collector/component"
 )
 
 func TestNewStatusEvent(t *testing.T) {
@@ -88,3 +90,42 @@ func TestStatusIsError(t *testing.T) {
 		})
 	}
 }
+
+func Test_ReportStatus(t *testing.T) {
+	t.Run("Reporter implemented", func(t *testing.T) {
+		r := &reporter{}
+		ReportStatus(r, NewEvent(StatusOK))
+		require.True(t, r.reportStatusCalled)
+	})
+
+	t.Run("Reporter not implemented", func(t *testing.T) {
+		h := &host{}
+		ReportStatus(h, NewEvent(StatusOK))
+		require.False(t, h.reportStatusCalled)
+	})
+}
+
+var _ = (component.Host)(nil)
+var _ = (Reporter)(nil)
+
+type reporter struct {
+	reportStatusCalled bool
+}
+
+func (r *reporter) GetExtensions() map[component.ID]component.Component {
+	return nil
+}
+
+func (r *reporter) Report(_ *Event) {
+	r.reportStatusCalled = true
+}
+
+var _ = (component.Host)(nil)
+
+type host struct {
+	reportStatusCalled bool
+}
+
+func (h *host) GetExtensions() map[component.ID]component.Component {
+	return nil
+}
diff --git a/config/configauth/go.mod b/config/configauth/go.mod
@@ -12,7 +12,7 @@ require (
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/go-viper/mapstructure/v2 v2.0.0 // indirect
+	github.com/go-viper/mapstructure/v2 v2.1.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/hashicorp/go-version v1.7.0 // indirect
 	github.com/knadh/koanf/maps v0.1.1 // indirect

diff --git a/config/configauth/go.sum b/config/configauth/go.sum
diff --git a/config/configgrpc/go.mod b/config/configgrpc/go.mod
@@ -33,7 +33,7 @@ require (
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-viper/mapstructure/v2 v2.0.0 // indirect
+	github.com/go-viper/mapstructure/v2 v2.1.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/uuid v1.6.0 // indirect

diff --git a/config/configgrpc/go.sum b/config/configgrpc/go.sum
diff --git a/config/confighttp/go.mod b/config/confighttp/go.mod
@@ -33,7 +33,7 @@ require (
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-viper/mapstructure/v2 v2.0.0 // indirect
+	github.com/go-viper/mapstructure/v2 v2.1.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/hashicorp/go-version v1.7.0 // indirect

diff --git a/config/confighttp/go.sum b/config/confighttp/go.sum
diff --git a/confmap/converter/expandconverter/go.mod b/confmap/converter/expandconverter/go.mod
@@ -13,7 +13,7 @@ require (
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/go-viper/mapstructure/v2 v2.0.0 // indirect
+	github.com/go-viper/mapstructure/v2 v2.1.0 // indirect
 	github.com/hashicorp/go-version v1.7.0 // indirect
 	github.com/knadh/koanf/maps v0.1.1 // indirect
 	github.com/knadh/koanf/providers/confmap v0.1.0 // indirect

diff --git a/confmap/converter/expandconverter/go.sum b/confmap/converter/expandconverter/go.sum
diff --git a/confmap/go.mod b/confmap/go.mod
@@ -3,7 +3,7 @@ module go.opentelemetry.io/collector/confmap
 go 1.21.0
 
 require (
-	github.com/go-viper/mapstructure/v2 v2.0.0
+	github.com/go-viper/mapstructure/v2 v2.1.0
 	github.com/knadh/koanf/maps v0.1.1
 	github.com/knadh/koanf/providers/confmap v0.1.0
 	github.com/knadh/koanf/v2 v2.1.1

diff --git a/confmap/go.sum b/confmap/go.sum
diff --git a/confmap/internal/e2e/go.mod b/confmap/internal/e2e/go.mod
@@ -5,15 +5,15 @@ go 1.21.0
 require (
 	github.com/stretchr/testify v1.9.0
 	go.opentelemetry.io/collector/confmap v0.107.0
-	go.opentelemetry.io/collector/confmap/provider/envprovider v0.106.1
-	go.opentelemetry.io/collector/confmap/provider/fileprovider v0.106.1
+	go.opentelemetry.io/collector/confmap/provider/envprovider v0.107.0
+	go.opentelemetry.io/collector/confmap/provider/fileprovider v0.107.0
 	go.opentelemetry.io/collector/featuregate v1.13.0
 	go.opentelemetry.io/collector/internal/globalgates v0.107.0
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/go-viper/mapstructure/v2 v2.0.0 // indirect
+	github.com/go-viper/mapstructure/v2 v2.1.0 // indirect
 	github.com/hashicorp/go-version v1.7.0 // indirect
 	github.com/knadh/koanf/maps v0.1.1 // indirect
 	github.com/knadh/koanf/providers/confmap v0.1.0 // indirect

diff --git a/confmap/internal/e2e/go.sum b/confmap/internal/e2e/go.sum
diff --git a/confmap/provider/envprovider/go.mod b/confmap/provider/envprovider/go.mod
@@ -11,7 +11,7 @@ require (
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/go-viper/mapstructure/v2 v2.0.0 // indirect
+	github.com/go-viper/mapstructure/v2 v2.1.0 // indirect
 	github.com/hashicorp/go-version v1.7.0 // indirect
 	github.com/knadh/koanf/maps v0.1.1 // indirect
 	github.com/knadh/koanf/providers/confmap v0.1.0 // indirect

diff --git a/confmap/provider/envprovider/go.sum b/confmap/provider/envprovider/go.sum
diff --git a/confmap/provider/fileprovider/go.mod b/confmap/provider/fileprovider/go.mod
@@ -10,7 +10,7 @@ require (
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/go-viper/mapstructure/v2 v2.0.0 // indirect
+	github.com/go-viper/mapstructure/v2 v2.1.0 // indirect
 	github.com/hashicorp/go-version v1.7.0 // indirect
 	github.com/knadh/koanf/maps v0.1.1 // indirect
 	github.com/knadh/koanf/providers/confmap v0.1.0 // indirect