[docker observer] Add into main release of contrib (open-telemetry#21521

)

* Adding changes for docker observer to be included in release

Fixing shutdown safety

* Removing changelog

cmd/configschema/go.mod

@@ -493,6 +493,7 @@ require (
  github.com/open-telemetry/opentelemetry-collector-contrib/extension/bearertokenauthextension v0.76.3 // indirect
  github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension v0.76.3 // indirect
  github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer v0.76.3 // indirect
+ github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/dockerobserver v0.76.3 // indirect
  github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/hostobserver v0.76.3 // indirect
  github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.76.3 // indirect
  github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension v0.76.3 // indirect
@@ -1065,3 +1066,5 @@ replace github.com/openshift/api v3.9.0+incompatible => github.com/openshift/api
 replace github.com/outcaste-io/ristretto v0.2.0 => github.com/outcaste-io/ristretto v0.2.1
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/snowflakereceiver => ../../receiver/snowflakereceiver
+
+replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/dockerobserver => ../../extension/observer/dockerobserver

cmd/otelcontribcol/builder-config.yaml

@@ -20,6 +20,7 @@ extensions:
  - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecstaskobserver v0.76.3
  - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/hostobserver v0.76.3
  - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver v0.76.3
+ - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/dockerobserver v0.76.3
  - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/oidcauthextension v0.76.3
  - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.76.3
  - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/sigv4authextension v0.76.3
@@ -199,6 +200,7 @@ replaces:
  - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sobjectsreceiver => ../../receiver/k8sobjectsreceiver
  - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/haproxyreceiver => ../../receiver/haproxyreceiver
  - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver => ../../receiver/httpcheckreceiver
+ - github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/dockerobserver => ../../extension/observer/dockerobserver
  - github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver => ../../extension/observer/k8sobserver
  - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sentryexporter => ../../exporter/sentryexporter
  - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/dynatraceexporter => ../../exporter/dynatraceexporter

cmd/otelcontribcol/extensions_test.go

@@ -206,6 +206,10 @@ func TestDefaultExtensions(t *testing.T) {
  extension: "k8s_observer",
  skipLifecycle: true, // Requires a K8s api to interfact with and validate
  },
+ {
+ extension: "docker_observer",
+ skipLifecycle: true, // Requires a docker api to interface and validate.
+ },
  {
  extension: "headers_setter",
  getConfigFn: func() component.Config {

cmd/otelcontribcol/go.mod

@@ -62,6 +62,7 @@ require (
  github.com/open-telemetry/opentelemetry-collector-contrib/extension/httpforwarder v0.76.3
  github.com/open-telemetry/opentelemetry-collector-contrib/extension/jaegerremotesampling v0.76.3
  github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension v0.76.3
+ github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/dockerobserver v0.76.3
  github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecstaskobserver v0.76.3
  github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/hostobserver v0.76.3
  github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver v0.76.3
@@ -680,6 +681,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hapro
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver => ../../receiver/httpcheckreceiver
 
+replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/dockerobserver => ../../extension/observer/dockerobserver
+
 replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver => ../../extension/observer/k8sobserver
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sentryexporter => ../../exporter/sentryexporter

extension/observer/dockerobserver/extension.go

@@ -56,6 +56,9 @@ func newObserver(logger *zap.Logger, config *Config) (extension.Extension, error
  d := &dockerObserver{
  logger: logger, config: config,
  once: &sync.Once{},
+ cancel: func() {
+ // Safe value provided on initialisation
+ },
  }
  d.EndpointsWatcher = observer.NewEndpointsWatcher(d, time.Second, logger)
  return d, nil

go.mod

@@ -54,6 +54,7 @@ require (
  github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension v0.0.0-00010101000000-000000000000
  github.com/open-telemetry/opentelemetry-collector-contrib/extension/httpforwarder v0.76.3
  github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension v0.76.3
+ github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/dockerobserver v0.76.3
  github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecstaskobserver v0.76.3
  github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/hostobserver v0.76.3
  github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver v0.76.3
@@ -1040,6 +1041,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipki
 
 replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver => ./receiver/zookeeperreceiver
 
+replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/dockerobserver => ./extension/observer/dockerobserver
+
 // see https://github.com/google/gnostic/issues/262
 replace github.com/googleapis/gnostic v0.5.6 => github.com/googleapis/gnostic v0.5.5
 

internal/components/components.go

@@ -80,6 +80,7 @@ import (
  "github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension"
  "github.com/open-telemetry/opentelemetry-collector-contrib/extension/httpforwarder"
  "github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension"
+ "github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/dockerobserver"
  "github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecstaskobserver"
  "github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/hostobserver"
  "github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver"
@@ -202,6 +203,7 @@ func Components() (otelcol.Factories, error) {
  basicauthextension.NewFactory(),
  bearertokenauthextension.NewFactory(),
  dbstorage.NewFactory(),
+ dockerobserver.NewFactory(),
  ecstaskobserver.NewFactory(),
  filestorage.NewFactory(),
  headerssetterextension.NewFactory(),