Skip to content

Commit

Permalink
Merge pull request #56 from samiura/otl-2947
Browse files Browse the repository at this point in the history 
updated with the latest from upstream 0.81 -> 0.108+
  • Loading branch information
@theletterf
theletterf authored Sep 6, 2024
2 parents 08f08f6 + fa4312d commit e277a43
Show file tree
Hide file tree
Showing 18 changed files with 3,074 additions and 7,318 deletions.
618 changes: 324 additions & 294 deletions c3/go.mod
View file

Large diffs are not rendered by default.

3,582 changes: 782 additions & 2,800 deletions c3/go.sum
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions c3/internal/c3/supported_pipelines.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func factoriesToComponentTypes(factories otelcol.Factories) components {
for name, factory := range factories.Receivers {
sp := receiverSupportedPipelines(factory)
c := component{
Name: string(name),
Name: name.String(),
Metrics: sp.metrics,
Traces: sp.traces,
Logs: sp.logs,
Expand All @@ -69,7 +69,7 @@ func factoriesToComponentTypes(factories otelcol.Factories) components {
for name, factory := range factories.Processors {
sp := processorSupportedPipelines(factory)
c := component{
Name: string(name),
Name: name.String(),
Metrics: sp.metrics,
Traces: sp.traces,
Logs: sp.logs,
Expand All @@ -82,7 +82,7 @@ func factoriesToComponentTypes(factories otelcol.Factories) components {
for name, factory := range factories.Exporters {
sp := exporterSupportedPipelines(factory)
c := component{
Name: string(name),
Name: name.String(),
Metrics: sp.metrics,
Traces: sp.traces,
Logs: sp.logs,
Expand Down
194 changes: 134 additions & 60 deletions c3/internal/components/components.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,139 +15,213 @@
package components

import (
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awss3exporter"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/fileexporter"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/kafkaexporter"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/loadbalancingexporter"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/sapmexporter"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/splunkhecexporter"
"github.com/open-telemetry/opentelemetry-collector-contrib/extension/ackextension"
"github.com/open-telemetry/opentelemetry-collector-contrib/extension/basicauthextension"
"github.com/open-telemetry/opentelemetry-collector-contrib/extension/headerssetterextension"
"github.com/open-telemetry/opentelemetry-collector-contrib/extension/healthcheckextension"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor"
"github.com/open-telemetry/opentelemetry-collector-contrib/extension/httpforwarderextension"
"github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension"

"github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecsobserver"
"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/pprofextension"
"github.com/open-telemetry/opentelemetry-collector-contrib/extension/storage/filestorage"

"github.com/open-telemetry/opentelemetry-collector-contrib/processor/cumulativetodeltaprocessor"

"github.com/open-telemetry/opentelemetry-collector-contrib/processor/groupbyattrsprocessor"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/k8sattributesprocessor"

"github.com/open-telemetry/opentelemetry-collector-contrib/processor/logstransformprocessor"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/metricstransformprocessor"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourcedetectionprocessor"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/resourceprocessor"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/routingprocessor"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanmetricsprocessor"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/spanprocessor"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/tailsamplingprocessor"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/transformprocessor"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/redactionprocessor"

"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/activedirectorydsreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/apachereceiver"

"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsecscontainermetricsreceiver"

"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/azuremonitorreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbonreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/cloudfoundryreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/elasticsearchreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/googlecloudpubsubreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/haproxyreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/httpcheckreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8sclusterreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/k8seventsreceiver"

"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkametricsreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver"

"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mongodbatlasreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusexecreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver"

"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mysqlreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/nginxreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/oracledbreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/postgresqlreceiver"

"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/rabbitmqreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/receivercreator"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/redisreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sapmreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/signalfxreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/simpleprometheusreceiver"

"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/solacereceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkenterprisereceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/splunkhecreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlqueryreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sqlserverreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sshcheckreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/syslogreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/tcplogreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/udplogreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/vcenterreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/wavefrontreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowseventlogreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/windowsperfcountersreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zipkinreceiver"

"go.opentelemetry.io/collector/exporter"
"go.opentelemetry.io/collector/exporter/debugexporter"
"go.opentelemetry.io/collector/exporter/loggingexporter"
"go.opentelemetry.io/collector/exporter/otlpexporter"
"go.opentelemetry.io/collector/exporter/otlphttpexporter"
"go.opentelemetry.io/collector/extension"
"go.opentelemetry.io/collector/otelcol"
"go.opentelemetry.io/collector/extension/ballastextension"
"go.opentelemetry.io/collector/extension/zpagesextension"
"go.opentelemetry.io/collector/processor"
"go.opentelemetry.io/collector/processor/batchprocessor"
"go.opentelemetry.io/collector/processor/memorylimiterprocessor"
"go.opentelemetry.io/collector/receiver"
"go.opentelemetry.io/collector/receiver/otlpreceiver"

"go.opentelemetry.io/collector/otelcol"
"go.opentelemetry.io/collector/receiver"
)

func Components() (otelcol.Factories, error) {
var err error
factories := otelcol.Factories{}
factories.Extensions, err = extension.MakeFactoryMap(
func Components() (factories otelcol.Factories, err error) {
extensions := []extension.Factory{
ackextension.NewFactory(),
ballastextension.NewFactory(),
basicauthextension.NewFactory(),
ecsobserver.NewFactory(),
ecstaskobserver.NewFactory(),

filestorage.NewFactory(),
headerssetterextension.NewFactory(),
healthcheckextension.NewFactory(),
)
hostobserver.NewFactory(),
httpforwarderextension.NewFactory(),

oauth2clientauthextension.NewFactory(),
pprofextension.NewFactory(),

zpagesextension.NewFactory(),
}
factories.Extensions, err = extension.MakeFactoryMap(extensions...)
if err != nil {
return otelcol.Factories{}, err
return
}
factories.Receivers, err = receiver.MakeFactoryMap(

receivers := []receiver.Factory{
activedirectorydsreceiver.NewFactory(),

awsecscontainermetricsreceiver.NewFactory(),
apachereceiver.NewFactory(),
azuremonitorreceiver.NewFactory(),
carbonreceiver.NewFactory(),
cloudfoundryreceiver.NewFactory(),
collectdreceiver.NewFactory(),
elasticsearchreceiver.NewFactory(),
fluentforwardreceiver.NewFactory(),
filelogreceiver.NewFactory(),
googlecloudpubsubreceiver.NewFactory(),
haproxyreceiver.NewFactory(),
hostmetricsreceiver.NewFactory(),
httpcheckreceiver.NewFactory(),
jaegerreceiver.NewFactory(),
jmxreceiver.NewFactory(),
journaldreceiver.NewFactory(),
k8sclusterreceiver.NewFactory(),
k8seventsreceiver.NewFactory(),

kafkametricsreceiver.NewFactory(),
kafkareceiver.NewFactory(),
kubeletstatsreceiver.NewFactory(),
mongodbatlasreceiver.NewFactory(),
mysqlreceiver.NewFactory(),
nginxreceiver.NewFactory(),
oracledbreceiver.NewFactory(),
otlpreceiver.NewFactory(),
prometheusexecreceiver.NewFactory(),
prometheusreceiver.NewFactory(),
postgresqlreceiver.NewFactory(),
rabbitmqreceiver.NewFactory(),
receivercreator.NewFactory(),
redisreceiver.NewFactory(),
sapmreceiver.NewFactory(),
signalfxreceiver.NewFactory(),
simpleprometheusreceiver.NewFactory(),
solacereceiver.NewFactory(),
splunkenterprisereceiver.NewFactory(),
splunkhecreceiver.NewFactory(),
sqlqueryreceiver.NewFactory(),
sqlserverreceiver.NewFactory(),
sshcheckreceiver.NewFactory(),
statsdreceiver.NewFactory(),
syslogreceiver.NewFactory(),
tcplogreceiver.NewFactory(),
udplogreceiver.NewFactory(),
vcenterreceiver.NewFactory(),
wavefrontreceiver.NewFactory(),
windowsperfcountersreceiver.NewFactory(),
windowseventlogreceiver.NewFactory(),
zipkinreceiver.NewFactory(),
)
if err != nil {
return otelcol.Factories{}, err
}
factories.Exporters, err = exporter.MakeFactoryMap(
fileexporter.NewFactory(),
kafkaexporter.NewFactory(),
loggingexporter.NewFactory(),
otlpexporter.NewFactory(),
otlphttpexporter.NewFactory(),
sapmexporter.NewFactory(),
signalfxexporter.NewFactory(),
splunkhecexporter.NewFactory(),
)
factories.Receivers, err = receiver.MakeFactoryMap(receivers...)
if err != nil {
return otelcol.Factories{}, err
return
}
factories.Processors, err = processor.MakeFactoryMap(
attributesprocessor.NewFactory(),

processors := []processor.Factory{

batchprocessor.NewFactory(),
filterprocessor.NewFactory(),
cumulativetodeltaprocessor.NewFactory(),

groupbyattrsprocessor.NewFactory(),
k8sattributesprocessor.NewFactory(),

logstransformprocessor.NewFactory(),
memorylimiterprocessor.NewFactory(),
metricstransformprocessor.NewFactory(),
probabilisticsamplerprocessor.NewFactory(),
resourcedetectionprocessor.NewFactory(),
resourceprocessor.NewFactory(),
routingprocessor.NewFactory(),
spanmetricsprocessor.NewFactory(),
spanprocessor.NewFactory(),
tailsamplingprocessor.NewFactory(),
transformprocessor.NewFactory(),
)
redactionprocessor.NewFactory(),
}
factories.Processors, err = processor.MakeFactoryMap(processors...)
if err != nil {
return otelcol.Factories{}, err
return
}

exporters := []exporter.Factory{
awss3exporter.NewFactory(),
debugexporter.NewFactory(),
fileexporter.NewFactory(),
kafkaexporter.NewFactory(),
loadbalancingexporter.NewFactory(),
loggingexporter.NewFactory(),
otlpexporter.NewFactory(),
otlphttpexporter.NewFactory(),
sapmexporter.NewFactory(),

splunkhecexporter.NewFactory(),
}
return factories, nil
factories.Exporters, err = exporter.MakeFactoryMap(exporters...)
return
}
Loading

0 comments on commit e277a43

Please sign in to comment.