Skip to content

Commit 26cc3d6

Browse files
CemDKtomasmotajrigueracrobert-1
authored
[observer/cfgarden] New component (#33727)
**Description:** We would like to implement a new observer for [Cloudfoundry](https://www.cloudfoundry.org/) containers/applications. The idea is not make use of the main API but the local one, which is available as unix socket on each node and manages the containers lifecycle. The main API would remain as optional and only to get Application info (which only involves one GET http request once the app id is known). **Link to tracking Issue:** [33618](#33618) **Testing:** First component PR **Documentation:** Added Readme --------- Co-authored-by: Tomás Mota <[email protected]> Co-authored-by: Jose Riguera <[email protected]> Co-authored-by: Tomás Mota <[email protected]> Co-authored-by: Curtis Robert <[email protected]> Co-authored-by: José Riguera Lopez <[email protected]>
1 parent fd17b88 commit 26cc3d6

30 files changed

+612
-9
lines changed

.chloggen/add-cfgardenobserver.yaml

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Use this changelog template to create an entry for release notes.
2+
3+
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
4+
change_type: new_component
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: extensions/observer/cfgardenobserver
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Add a new observer that discovers containers through the Garden API
11+
12+
# Mandatory: One or more tracking issues related to the change. You can use the PR number here if no issue exists.
13+
issues: [33618]
14+
15+
# (Optional) One or more lines of additional information to render under the primary note.
16+
# These lines will be padded with 2 spaces and then inserted directly into the document.
17+
# Use pipe (|) for multiline entries.
18+
subtext:
19+
20+
# If your change doesn't affect end users or the exported elements of any package,
21+
# you should instead start your pull request title with [chore] or use the "Skip Changelog" label.
22+
# Optional: The change log or logs in which this entry should be included.
23+
# e.g. '[user]' or '[user, api]'
24+
# Include 'user' if the change is relevant to end users.
25+
# Include 'api' if there is a change to a library API.
26+
# Default: '[user]'
27+
change_logs: [user]

.github/CODEOWNERS

+1
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ extension/httpforwarderextension/ @open-teleme
103103
extension/jaegerremotesampling/ @open-telemetry/collector-contrib-approvers @yurishkuro @frzifus
104104
extension/oauth2clientauthextension/ @open-telemetry/collector-contrib-approvers @pavankrish123 @jpkrohling
105105
extension/observer/ @open-telemetry/collector-contrib-approvers @dmitryax @rmfitzpatrick
106+
extension/observer/cfgardenobserver/ @open-telemetry/collector-contrib-approvers @cemdk @tomasmota @m1rp @jriguera @crobert-1
106107
extension/observer/dockerobserver/ @open-telemetry/collector-contrib-approvers @MovieStoreGuy
107108
extension/observer/ecsobserver/ @open-telemetry/collector-contrib-approvers @dmitryax @rmfitzpatrick
108109
extension/observer/ecstaskobserver/ @open-telemetry/collector-contrib-approvers @rmfitzpatrick

.github/ISSUE_TEMPLATE/bug_report.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ body:
101101
- extension/jaegerremotesampling
102102
- extension/oauth2clientauth
103103
- extension/observer
104+
- extension/observer/cfgardenobserver
104105
- extension/observer/dockerobserver
105106
- extension/observer/ecsobserver
106107
- extension/observer/ecstaskobserver

.github/ISSUE_TEMPLATE/feature_request.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ body:
9595
- extension/jaegerremotesampling
9696
- extension/oauth2clientauth
9797
- extension/observer
98+
- extension/observer/cfgardenobserver
9899
- extension/observer/dockerobserver
99100
- extension/observer/ecsobserver
100101
- extension/observer/ecstaskobserver

.github/ISSUE_TEMPLATE/other.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ body:
9595
- extension/jaegerremotesampling
9696
- extension/oauth2clientauth
9797
- extension/observer
98+
- extension/observer/cfgardenobserver
9899
- extension/observer/dockerobserver
99100
- extension/observer/ecsobserver
100101
- extension/observer/ecstaskobserver

.github/ISSUE_TEMPLATE/unmaintained.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ body:
100100
- extension/jaegerremotesampling
101101
- extension/oauth2clientauth
102102
- extension/observer
103+
- extension/observer/cfgardenobserver
103104
- extension/observer/dockerobserver
104105
- extension/observer/ecsobserver
105106
- extension/observer/ecstaskobserver

cmd/githubgen/allowlist.txt

+4
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,7 @@ rlankfo
1616
swar8080
1717
zpzhuSplunk
1818
thmshmm
19+
cemdk
20+
tomasmota
21+
m1rp
22+
jriguera

cmd/otelcontribcol/builder-config.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,12 @@ extensions:
2828
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/httpforwarderextension v0.104.0
2929
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/jaegerremotesampling v0.104.0
3030
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension v0.104.0
31+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/cfgardenobserver v0.104.0
32+
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/dockerobserver v0.104.0
3133
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecsobserver v0.104.0
3234
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecstaskobserver v0.104.0
3335
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/hostobserver v0.104.0
3436
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/k8sobserver v0.104.0
35-
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/dockerobserver v0.104.0
3637
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/oidcauthextension v0.104.0
3738
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/opampextension v0.104.0
3839
- gomod: github.com/open-telemetry/opentelemetry-collector-contrib/extension/pprofextension v0.104.0
@@ -485,4 +486,5 @@ replaces:
485486
- github.com/open-telemetry/opentelemetry-collector-contrib/internal/pdatautil => ../../internal/pdatautil
486487
- github.com/open-telemetry/opentelemetry-collector-contrib/exporter/otelarrowexporter => ../../exporter/otelarrowexporter
487488
- github.com/open-telemetry/opentelemetry-collector-contrib/receiver/otelarrowreceiver => ../../receiver/otelarrowreceiver
489+
- github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/cfgardenobserver => ../../extension/observer/cfgardenobserver
488490
- github.com/open-telemetry/opentelemetry-collector-contrib/exporter/rabbitmqexporter => ../../exporter/rabbitmqexporter

cmd/otelcontribcol/components.go

+3-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/otelcontribcol/go.mod

+3
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ require (
8080
github.com/open-telemetry/opentelemetry-collector-contrib/extension/httpforwarderextension v0.104.0
8181
github.com/open-telemetry/opentelemetry-collector-contrib/extension/jaegerremotesampling v0.104.0
8282
github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension v0.104.0
83+
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/cfgardenobserver v0.104.0
8384
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/dockerobserver v0.104.0
8485
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecsobserver v0.104.0
8586
github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecstaskobserver v0.104.0
@@ -1327,4 +1328,6 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/otela
13271328

13281329
replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/otelarrowreceiver => ../../receiver/otelarrowreceiver
13291330

1331+
replace github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/cfgardenobserver => ../../extension/observer/cfgardenobserver
1332+
13301333
replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/rabbitmqexporter => ../../exporter/rabbitmqexporter
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
include ../../../Makefile.Common
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# Cloud Foundry Garden Observer Extension
2+
3+
<!-- status autogenerated section -->
4+
| Status | |
5+
| ------------- |-----------|
6+
| Stability | [development] |
7+
| Distributions | [] |
8+
| Issues | [![Open issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aopen%20label%3Aextension%2Fcfgardenobserver%20&label=open&color=orange&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aopen+is%3Aissue+label%3Aextension%2Fcfgardenobserver) [![Closed issues](https://img.shields.io/github/issues-search/open-telemetry/opentelemetry-collector-contrib?query=is%3Aissue%20is%3Aclosed%20label%3Aextension%2Fcfgardenobserver%20&label=closed&color=blue&logo=opentelemetry)](https://github.com/open-telemetry/opentelemetry-collector-contrib/issues?q=is%3Aclosed+is%3Aissue+label%3Aextension%2Fcfgardenobserver) |
9+
| [Code Owners](https://github.com/open-telemetry/opentelemetry-collector-contrib/blob/main/CONTRIBUTING.md#becoming-a-code-owner) | [@crobert-1](https://www.github.com/crobert-1), [@cemdk](https://www.github.com/cemdk), [@tomasmota](https://www.github.com/tomasmota), [@m1rp](https://www.github.com/m1rp), [@jriguera](https://www.github.com/jriguera) |
10+
11+
[development]: https://github.com/open-telemetry/opentelemetry-collector#development
12+
<!-- end autogenerated section -->
13+
14+
Cloud Foundry (CF) is a platform as a service (PaaS) which has implemented their own container technology. The component in charge of providing a local API in each node (also known as "diego-cell") is named Garden.
15+
16+
The `cfgarden_observer` looks at the current host to discover Garden containers.
17+
18+
## Example Config
19+
20+
```yaml
21+
extensions:
22+
cfgarden_observer:
23+
# url of the Garden socket, defaults to unix:///var/vcap/data/garden/garden.sock
24+
endpoint: my/path/to/garden.sock
25+
# determines how often to look for changes in endpoints.
26+
refresh_interval: 30s
27+
28+
receivers:
29+
receiver_creator:
30+
watch_observers: [cfgarden_observer]
31+
receivers:
32+
prometheus_simple:
33+
rule: type == "container" && name == "myapp"
34+
config:
35+
metrics_path: /metrics
36+
endpoint: '`endpoint`'
37+
```
38+
39+
### Configuration
40+
41+
| Name | Type | Default | Docs |
42+
|------------------|--------|------------------------------------------|--------------------------------------------------------|
43+
| refresh_interval | string | 60s | Determines how often to look for changes in endpoints. |
44+
| endpoint | string | unix:///var/vcap/data/garden/garden.sock | The endpoint to connect to the Garden API. |
45+
46+
### Endpoint Variables
47+
48+
Endpoint variables exposed by this observer are as follows.
49+
50+
| Variable | Description |
51+
|-----------|--------------------------------------------------------------------------------------------|
52+
| type | this value is always `container` |
53+
| name | name of the Garden container associated to the port |
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
// Copyright The OpenTelemetry Authors
2+
// SPDX-License-Identifier: Apache-2.0
3+
4+
package cfgardenobserver // import "github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/cfgardenobserver"
5+
6+
import (
7+
"time"
8+
)
9+
10+
// Config defines configuration for CF Garden observer.
11+
type Config struct {
12+
// The URL of the CF Garden api. Default is "unix:///var/vcap/data/garden/garden.sock"
13+
Endpoint string `mapstructure:"endpoint"`
14+
15+
// RefreshInterval determines the frequency at which the observer
16+
// needs to poll for collecting information about new processes.
17+
RefreshInterval time.Duration `mapstructure:"refresh_interval"`
18+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
// Copyright The OpenTelemetry Authors
2+
// SPDX-License-Identifier: Apache-2.0
3+
4+
package cfgardenobserver
5+
6+
import (
7+
"path/filepath"
8+
"testing"
9+
"time"
10+
11+
"github.com/stretchr/testify/assert"
12+
"github.com/stretchr/testify/require"
13+
"go.opentelemetry.io/collector/component"
14+
"go.opentelemetry.io/collector/confmap/confmaptest"
15+
16+
"github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/cfgardenobserver/internal/metadata"
17+
)
18+
19+
func TestLoadConfig(t *testing.T) {
20+
t.Parallel()
21+
22+
tests := []struct {
23+
id component.ID
24+
expected component.Config
25+
}{
26+
{
27+
id: component.NewID(metadata.Type),
28+
expected: &Config{
29+
Endpoint: "unix:///var/vcap/data/garden/garden.sock",
30+
RefreshInterval: 1 * time.Minute,
31+
},
32+
},
33+
{
34+
id: component.NewIDWithName(metadata.Type, "all_settings"),
35+
expected: &Config{
36+
Endpoint: "unix:///var/vcap/data/garden/custom.sock",
37+
RefreshInterval: 20 * time.Second,
38+
},
39+
},
40+
}
41+
for _, tt := range tests {
42+
t.Run(tt.id.String(), func(t *testing.T) {
43+
cm, err := confmaptest.LoadConf(filepath.Join("testdata", "config.yaml"))
44+
require.NoError(t, err)
45+
factory := NewFactory()
46+
cfg := factory.CreateDefaultConfig()
47+
sub, err := cm.Sub(tt.id.String())
48+
require.NoError(t, err)
49+
require.NoError(t, sub.Unmarshal(cfg))
50+
51+
assert.NoError(t, component.ValidateConfig(cfg))
52+
assert.Equal(t, tt.expected, cfg)
53+
})
54+
}
55+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
// Copyright The OpenTelemetry Authors
2+
// SPDX-License-Identifier: Apache-2.0
3+
4+
//go:generate mdatagen metadata.yaml
5+
6+
package cfgardenobserver // import "github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/cfgardenobserver"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
// Copyright The OpenTelemetry Authors
2+
// SPDX-License-Identifier: Apache-2.0
3+
4+
package cfgardenobserver // import "github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/cfgardenobserver"
5+
6+
import (
7+
"time"
8+
9+
"go.opentelemetry.io/collector/component"
10+
"go.opentelemetry.io/collector/extension"
11+
12+
"github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer"
13+
)
14+
15+
type cfGardenObserver struct {
16+
*observer.EndpointsWatcher
17+
18+
component.StartFunc
19+
component.ShutdownFunc
20+
}
21+
22+
var _ extension.Extension = (*cfGardenObserver)(nil)
23+
24+
func newObserver(params extension.Settings, _ *Config) (extension.Extension, error) {
25+
g := &cfGardenObserver{}
26+
g.EndpointsWatcher = observer.NewEndpointsWatcher(g, time.Second, params.Logger)
27+
28+
return g, nil
29+
}
30+
31+
func (g *cfGardenObserver) ListEndpoints() []observer.Endpoint {
32+
// TODO: Implement the logic to list the endpoints.
33+
endpoints := make([]observer.Endpoint, 0)
34+
35+
return endpoints
36+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
// Copyright The OpenTelemetry Authors
2+
// SPDX-License-Identifier: Apache-2.0
3+
4+
package cfgardenobserver
5+
6+
import (
7+
"context"
8+
"testing"
9+
10+
"github.com/stretchr/testify/require"
11+
"go.opentelemetry.io/collector/component/componenttest"
12+
"go.opentelemetry.io/collector/extension/extensiontest"
13+
14+
"github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer"
15+
)
16+
17+
func TestStartAndStopObserver(t *testing.T) {
18+
factory := NewFactory()
19+
params := extensiontest.NewNopSettings()
20+
ext, err := newObserver(params, factory.CreateDefaultConfig().(*Config))
21+
require.NoError(t, err)
22+
require.NotNil(t, ext)
23+
24+
obvs, ok := ext.(*cfGardenObserver)
25+
require.True(t, ok)
26+
27+
ctx := context.Background()
28+
require.NoError(t, obvs.Start(ctx, componenttest.NewNopHost()))
29+
30+
expected := obvs.ListEndpoints()
31+
want := []observer.Endpoint{}
32+
require.Equal(t, want, expected)
33+
34+
require.NoError(t, obvs.Shutdown(ctx))
35+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
// Copyright The OpenTelemetry Authors
2+
// SPDX-License-Identifier: Apache-2.0
3+
4+
package cfgardenobserver // import "github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/cfgardenobserver"
5+
6+
import (
7+
"context"
8+
"time"
9+
10+
"go.opentelemetry.io/collector/component"
11+
"go.opentelemetry.io/collector/extension"
12+
13+
"github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/cfgardenobserver/internal/metadata"
14+
)
15+
16+
const (
17+
defaultCollectionInterval = 1 * time.Minute
18+
defaultEndpoint = "unix:///var/vcap/data/garden/garden.sock"
19+
)
20+
21+
// NewFactory creates a factory for HostObserver extension.
22+
func NewFactory() extension.Factory {
23+
return extension.NewFactory(
24+
metadata.Type,
25+
createDefaultConfig,
26+
createExtension,
27+
metadata.ExtensionStability,
28+
)
29+
}
30+
31+
func createDefaultConfig() component.Config {
32+
return &Config{
33+
RefreshInterval: defaultCollectionInterval,
34+
Endpoint: defaultEndpoint,
35+
}
36+
}
37+
38+
func createExtension(
39+
_ context.Context,
40+
params extension.Settings,
41+
cfg component.Config,
42+
) (extension.Extension, error) {
43+
return newObserver(params, cfg.(*Config))
44+
}

0 commit comments

Comments
 (0)