Skip to content

Commit

Permalink
Merge pull request #78 from afzalabbasi/feature/update-dependency
Browse files Browse the repository at this point in the history
Update Dependency
  • Loading branch information
akvlad authored Mar 27, 2024
2 parents 0a7ac3c + fa0c3eb commit 4f1f658
Show file tree
Hide file tree
Showing 9 changed files with 1,218 additions and 1,147 deletions.
19 changes: 5 additions & 14 deletions cmd/otel-collector/components.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (
"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/opencensusexporter"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/parquetexporter"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusexporter"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter"
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/zipkinexporter"
Expand All @@ -27,7 +26,7 @@ import (
"github.com/open-telemetry/opentelemetry-collector-contrib/extension/encoding/zipkinencodingextension"
"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/extension/httpforwarder"
"github.com/open-telemetry/opentelemetry-collector-contrib/extension/httpforwarderextension"
"github.com/open-telemetry/opentelemetry-collector-contrib/extension/jaegerremotesampling"
"github.com/open-telemetry/opentelemetry-collector-contrib/extension/oauth2clientauthextension"
"github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/dockerobserver"
Expand Down Expand Up @@ -59,8 +58,6 @@ import (
"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/schemaprocessor"
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/servicegraphprocessor"
"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"
Expand Down Expand Up @@ -88,7 +85,6 @@ import (
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/elasticsearchreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/expvarreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filelogreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filereceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/filestatsreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/flinkmetricsreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/fluentforwardreceiver"
Expand Down Expand Up @@ -154,11 +150,10 @@ import (
"go.opentelemetry.io/collector/connector"
"go.opentelemetry.io/collector/connector/forwardconnector"
"go.opentelemetry.io/collector/exporter"
"go.opentelemetry.io/collector/exporter/loggingexporter"
"go.opentelemetry.io/collector/exporter/debugexporter"
"go.opentelemetry.io/collector/exporter/otlpexporter"
"go.opentelemetry.io/collector/exporter/otlphttpexporter"
"go.opentelemetry.io/collector/extension"
"go.opentelemetry.io/collector/extension/ballastextension"
"go.opentelemetry.io/collector/extension/zpagesextension"
"go.opentelemetry.io/collector/otelcol"
"go.opentelemetry.io/collector/processor"
Expand Down Expand Up @@ -187,7 +182,7 @@ func components() (otelcol.Factories, error) {
bearertokenauthextension.NewFactory(),
headerssetterextension.NewFactory(),
healthcheckextension.NewFactory(),
httpforwarder.NewFactory(),
httpforwarderextension.NewFactory(),
jaegerremotesampling.NewFactory(),
oauth2clientauthextension.NewFactory(),
ecsobserver.NewFactory(),
Expand Down Expand Up @@ -243,7 +238,6 @@ func components() (otelcol.Factories, error) {
expvarreceiver.NewFactory(),
filelogreceiver.NewFactory(),
filestatsreceiver.NewFactory(),
filereceiver.NewFactory(),
flinkmetricsreceiver.NewFactory(),
fluentforwardreceiver.NewFactory(),
googlecloudpubsubreceiver.NewFactory(),
Expand Down Expand Up @@ -323,7 +317,6 @@ func components() (otelcol.Factories, error) {
kafkaexporter.NewFactory(),
loadbalancingexporter.NewFactory(),
opencensusexporter.NewFactory(),
parquetexporter.NewFactory(),
prometheusexporter.NewFactory(),
prometheusremotewriteexporter.NewFactory(),
zipkinexporter.NewFactory(),
Expand Down Expand Up @@ -353,8 +346,6 @@ func components() (otelcol.Factories, error) {
resourceprocessor.NewFactory(),
routingprocessor.NewFactory(),
schemaprocessor.NewFactory(),
servicegraphprocessor.NewFactory(),
spanmetricsprocessor.NewFactory(),
spanprocessor.NewFactory(),
tailsamplingprocessor.NewFactory(),
transformprocessor.NewFactory(),
Expand All @@ -372,6 +363,7 @@ func components() (otelcol.Factories, error) {
datadogconnector.NewFactory(),
exceptionsconnector.NewFactory(),
routingconnector.NewFactory(),
// it is previously in processor now it is in connector
servicegraphconnector.NewFactory(),
spanmetricsconnector.NewFactory(),
}
Expand All @@ -394,7 +386,6 @@ func CoreComponents() (

extensions, err := extension.MakeFactoryMap(
zpagesextension.NewFactory(),
ballastextension.NewFactory(),
)
errs = multierr.Append(errs, err)

Expand All @@ -404,7 +395,7 @@ func CoreComponents() (
errs = multierr.Append(errs, err)

exporters, err := exporter.MakeFactoryMap(
loggingexporter.NewFactory(),
debugexporter.NewFactory(),
otlpexporter.NewFactory(),
otlphttpexporter.NewFactory(),
)
Expand Down
2 changes: 1 addition & 1 deletion exporter/clickhouseprofileexporter/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ func createLogsExporter(ctx context.Context, set exporter.CreateSettings, cfg co
// Creates a factory for the clickhouse profile exporter.
func NewFactory() exporter.Factory {
return exporter.NewFactory(
typeStr,
component.MustNewType(typeStr),
createDefaultConfig,
exporter.WithLogs(createLogsExporter, component.StabilityLevelAlpha),
)
Expand Down
2 changes: 1 addition & 1 deletion exporter/qrynexporter/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const (
// NewFactory creates a factory for Logging exporter
func NewFactory() exporter.Factory {
return exporter.NewFactory(
typeStr,
component.MustNewType(typeStr),
createDefaultConfig,
exporter.WithTraces(createTracesExporter, stability),
exporter.WithLogs(createLogsExporter, stability),
Expand Down
Loading

0 comments on commit 4f1f658

Please sign in to comment.