Skip to content

Commit fbd61ae

Browse files
haoqixumx-psi
andauthored
[cmd/configschema]: include connectors (#29001)
**Description:** include connectors **Link to tracking Issue:** resolve #26990 --------- Co-authored-by: Pablo Baeyens <[email protected]>
1 parent 1c13014 commit fbd61ae

File tree

8 files changed

+97
-2
lines changed

8 files changed

+97
-2
lines changed
Lines changed: 27 additions & 0 deletions
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: enhancement
5+
6+
# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
7+
component: configschema
8+
9+
# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
10+
note: Generate metadata for connectors.
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: [26990]
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: []

cmd/configschema/cfgmetadatagen/cfgmetadatagen/cli.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func GenerateFiles(factories otelcol.Factories, sourceDir string, outputDir stri
3131
func writeComponentYAML(yw metadataWriter, cfg configschema.CfgInfo, dr configschema.DirResolver) error {
3232
fields, err := configschema.ReadFields(reflect.ValueOf(cfg.CfgInstance), dr)
3333
if err != nil {
34-
return fmt.Errorf("error reading fields for component: %w", err)
34+
return fmt.Errorf("error reading fields for component %v/%v: %w", cfg.Group, cfg.Type, err)
3535
}
3636
yamlBytes, err := yaml.Marshal(fields)
3737
if err != nil {

cmd/configschema/configs.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,16 @@ func GetCfgInfo(components otelcol.Factories, componentType, componentName strin
113113
Group: componentType,
114114
CfgInstance: f.CreateDefaultConfig(),
115115
}, nil
116+
case connector:
117+
f := components.Connectors[t]
118+
if f == nil {
119+
return CfgInfo{}, fmt.Errorf("unknown %s name %q", componentType, componentName)
120+
}
121+
return CfgInfo{
122+
Type: f.Type(),
123+
Group: componentType,
124+
CfgInstance: f.CreateDefaultConfig(),
125+
}, nil
116126
case extension:
117127
f := components.Extensions[t]
118128
if f == nil {

cmd/configschema/go.mod

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -471,6 +471,12 @@ require (
471471
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
472472
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
473473
github.com/nginxinc/nginx-prometheus-exporter v0.8.1-0.20201110005315-f5a5f8086c19 // indirect
474+
github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.89.0 // indirect
475+
github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.89.0 // indirect
476+
github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.89.0 // indirect
477+
github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.89.0 // indirect
478+
github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.89.0 // indirect
479+
github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.89.0 // indirect
474480
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awskinesisexporter v0.89.0 // indirect
475481
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/datadogexporter v0.89.0 // indirect
476482
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/f5cloudexporter v0.89.0 // indirect
@@ -626,6 +632,7 @@ require (
626632
go.opentelemetry.io/collector/config/internal v0.89.0 // indirect
627633
go.opentelemetry.io/collector/confmap v0.89.0 // indirect
628634
go.opentelemetry.io/collector/connector v0.89.0 // indirect
635+
go.opentelemetry.io/collector/connector/forwardconnector v0.89.0 // indirect
629636
go.opentelemetry.io/collector/consumer v0.89.0 // indirect
630637
go.opentelemetry.io/collector/exporter/debugexporter v0.89.0 // indirect
631638
go.opentelemetry.io/collector/exporter/loggingexporter v0.89.0 // indirect
@@ -1132,3 +1139,12 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azure
11321139
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden => ../../pkg/golden
11331140

11341141
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/collectd => ../../internal/collectd
1142+
1143+
replace (
1144+
github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector => ../../connector/countconnector
1145+
github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector => ../../connector/datadogconnector
1146+
github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector => ../../connector/exceptionsconnector
1147+
github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector => ../../connector/routingconnector
1148+
github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector => ../../connector/servicegraphconnector
1149+
github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector => ../../connector/spanmetricsconnector
1150+
)

cmd/configschema/go.sum

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go.mod

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ module github.com/open-telemetry/opentelemetry-collector-contrib
33
go 1.20
44

55
require (
6+
github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector v0.89.0
7+
github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector v0.89.0
8+
github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector v0.89.0
9+
github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector v0.89.0
10+
github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector v0.89.0
11+
github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector v0.89.0
612
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter v0.89.0
713
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter v0.89.0
814
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.89.0
@@ -164,6 +170,8 @@ require (
164170
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver v0.89.0
165171
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver v0.89.0
166172
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.89.0
173+
go.opentelemetry.io/collector/connector v0.89.0
174+
go.opentelemetry.io/collector/connector/forwardconnector v0.89.0
167175
go.opentelemetry.io/collector/exporter v0.89.0
168176
go.opentelemetry.io/collector/exporter/debugexporter v0.89.0
169177
go.opentelemetry.io/collector/exporter/loggingexporter v0.89.0
@@ -630,7 +638,6 @@ require (
630638
go.opentelemetry.io/collector/config/configtls v0.89.0 // indirect
631639
go.opentelemetry.io/collector/config/internal v0.89.0 // indirect
632640
go.opentelemetry.io/collector/confmap v0.89.0 // indirect
633-
go.opentelemetry.io/collector/connector v0.89.0 // indirect
634641
go.opentelemetry.io/collector/consumer v0.89.0 // indirect
635642
go.opentelemetry.io/collector/extension/auth v0.89.0 // indirect
636643
go.opentelemetry.io/collector/featuregate v1.0.0-rcv0018 // indirect
@@ -1136,3 +1143,12 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azure
11361143
replace github.com/open-telemetry/opentelemetry-collector-contrib/pkg/golden => ./pkg/golden
11371144

11381145
replace github.com/open-telemetry/opentelemetry-collector-contrib/internal/collectd => ./internal/collectd
1146+
1147+
replace (
1148+
github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector => ./connector/countconnector
1149+
github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector => ./connector/datadogconnector
1150+
github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector => ./connector/exceptionsconnector
1151+
github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector => ./connector/routingconnector
1152+
github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector => ./connector/servicegraphconnector
1153+
github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector => ./connector/spanmetricsconnector
1154+
)

go.sum

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/components/components.go

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
package components // import "github.com/open-telemetry/opentelemetry-collector-contrib/internal/components"
55

66
import (
7+
"go.opentelemetry.io/collector/connector"
8+
"go.opentelemetry.io/collector/connector/forwardconnector"
79
"go.opentelemetry.io/collector/exporter"
810
"go.opentelemetry.io/collector/exporter/debugexporter"
911
"go.opentelemetry.io/collector/exporter/loggingexporter"
@@ -19,6 +21,12 @@ import (
1921
"go.opentelemetry.io/collector/receiver"
2022
"go.opentelemetry.io/collector/receiver/otlpreceiver"
2123

24+
"github.com/open-telemetry/opentelemetry-collector-contrib/connector/countconnector"
25+
"github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector"
26+
"github.com/open-telemetry/opentelemetry-collector-contrib/connector/exceptionsconnector"
27+
"github.com/open-telemetry/opentelemetry-collector-contrib/connector/routingconnector"
28+
"github.com/open-telemetry/opentelemetry-collector-contrib/connector/servicegraphconnector"
29+
"github.com/open-telemetry/opentelemetry-collector-contrib/connector/spanmetricsconnector"
2230
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/alibabacloudlogserviceexporter"
2331
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awscloudwatchlogsexporter"
2432
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter"
@@ -385,5 +393,19 @@ func Components() (otelcol.Factories, error) {
385393
return otelcol.Factories{}, err
386394
}
387395

396+
connectors := []connector.Factory{
397+
forwardconnector.NewFactory(),
398+
countconnector.NewFactory(),
399+
datadogconnector.NewFactory(),
400+
exceptionsconnector.NewFactory(),
401+
routingconnector.NewFactory(),
402+
servicegraphconnector.NewFactory(),
403+
spanmetricsconnector.NewFactory(),
404+
}
405+
factories.Connectors, err = connector.MakeFactoryMap(connectors...)
406+
if err != nil {
407+
return otelcol.Factories{}, err
408+
}
409+
388410
return factories, nil
389411
}

0 commit comments

Comments
 (0)