/
collector.patch
82 lines (79 loc) · 3.26 KB
/
collector.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
diff --git a/collector/internal/collector/collector.go b/collector/internal/collector/collector.go
index 35aaa18..c3e56fa 100644
--- a/collector/internal/collector/collector.go
+++ b/collector/internal/collector/collector.go
@@ -26,6 +26,7 @@ import (
"go.opentelemetry.io/collector/confmap/provider/envprovider"
"go.opentelemetry.io/collector/confmap/provider/fileprovider"
"go.opentelemetry.io/collector/confmap/provider/httpprovider"
+ "go.opentelemetry.io/collector/confmap/provider/httpsprovider"
"go.opentelemetry.io/collector/confmap/provider/yamlprovider"
"go.opentelemetry.io/collector/otelcol"
"go.uber.org/zap"
@@ -38,13 +39,14 @@ import (
// Collector runs a single otelcol as a go routine within the
// same process as the executor.
type Collector struct {
- factories otelcol.Factories
- configProvider otelcol.ConfigProvider
- svc *otelcol.Collector
- appDone chan struct{}
- stopped bool
- logger *zap.Logger
- version string
+ factories otelcol.Factories
+ configProvider otelcol.ConfigProvider
+ configProviderSettings otelcol.ConfigProviderSettings
+ svc *otelcol.Collector
+ appDone chan struct{}
+ stopped bool
+ logger *zap.Logger
+ version string
}
func getConfig(logger *zap.Logger) string {
@@ -59,7 +61,15 @@ func getConfig(logger *zap.Logger) string {
func NewCollector(logger *zap.Logger, factories otelcol.Factories, version string) *Collector {
l := logger.Named("NewCollector")
providerSettings := confmap.ProviderSettings{Logger: l}
- providers := []confmap.Provider{fileprovider.NewWithSettings(providerSettings), envprovider.NewWithSettings(providerSettings), yamlprovider.NewWithSettings(providerSettings), httpprovider.NewWithSettings(providerSettings), s3provider.New()}
+ providers := []confmap.Provider{
+ fileprovider.NewWithSettings(providerSettings),
+ envprovider.NewWithSettings(providerSettings),
+ yamlprovider.NewWithSettings(providerSettings),
+ httpprovider.NewWithSettings(providerSettings),
+ httpsprovider.NewWithSettings(providerSettings),
+ s3provider.New(),
+ }
+
mapProvider := make(map[string]confmap.Provider, len(providers))
for _, provider := range providers {
@@ -82,10 +92,11 @@ func NewCollector(logger *zap.Logger, factories otelcol.Factories, version strin
}
col := &Collector{
- factories: factories,
- configProvider: cfgProvider,
- logger: logger,
- version: version,
+ factories: factories,
+ configProvider: cfgProvider,
+ configProviderSettings: cfgSet,
+ logger: logger,
+ version: version,
}
return col
}
@@ -93,11 +104,11 @@ func NewCollector(logger *zap.Logger, factories otelcol.Factories, version strin
func (c *Collector) Start(ctx context.Context) error {
params := otelcol.CollectorSettings{
BuildInfo: component.BuildInfo{
- Command: "otelcol-lambda",
- Description: "Lambda Collector",
+ Command: "aws-otel-lambda",
+ Description: "ADOT Lambda Collector",
Version: c.version,
},
- ConfigProvider: c.configProvider,
+ ConfigProviderSettings: c.configProviderSettings,
Factories: func() (otelcol.Factories, error) {
return c.factories, nil
},