From f9070a5930a6422ba81dd2e68c6194d58d8cc6df Mon Sep 17 00:00:00 2001 From: meenal-developer Date: Thu, 2 May 2024 13:19:50 +0530 Subject: [PATCH 1/3] minor change --- cmd/configschema/go.mod | 3 +++ cmd/otelcontribcol/builder-config.yaml | 2 ++ cmd/otelcontribcol/go.mod | 3 +++ go.mod | 2 ++ testbed/go.mod | 2 ++ versions.yaml | 1 + 6 files changed, 13 insertions(+) diff --git a/cmd/configschema/go.mod b/cmd/configschema/go.mod index 4aabeb1678da..626f554d8d4f 100644 --- a/cmd/configschema/go.mod +++ b/cmd/configschema/go.mod @@ -132,6 +132,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.84.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/receiver/couchdbreceiver v0.84.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/receiver/datadogreceiver v0.84.0 // indirect + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/datadoglogreceiver v0.84.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver v0.84.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/receiver/elasticsearchreceiver v0.84.0 // indirect github.com/open-telemetry/opentelemetry-collector-contrib/receiver/expvarreceiver v0.84.0 // indirect @@ -967,6 +968,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/colle replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/datadogreceiver => ../../receiver/datadogreceiver +replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/datadoglogreceiver => ../../receiver/datadoglogreceiver + replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver => ../../receiver/dockerstatsreceiver replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/elasticsearchreceiver => ../../receiver/elasticsearchreceiver diff --git a/cmd/otelcontribcol/builder-config.yaml b/cmd/otelcontribcol/builder-config.yaml index d01105c1eacb..988dd373dfdd 100644 --- a/cmd/otelcontribcol/builder-config.yaml +++ b/cmd/otelcontribcol/builder-config.yaml @@ -127,6 +127,7 @@ receivers: - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.84.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/couchdbreceiver v0.84.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/datadogreceiver v0.84.0 + - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/datadoglogreceiver v0.84.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver v0.84.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/elasticsearchreceiver v0.84.0 - gomod: github.com/open-telemetry/opentelemetry-collector-contrib/receiver/expvarreceiver v0.84.0 @@ -395,6 +396,7 @@ replaces: - github.com/open-telemetry/opentelemetry-collector-contrib/processor/datadogprocessor => ../../processor/datadogprocessor - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sshcheckreceiver => ../../receiver/sshcheckreceiver - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/datadogreceiver => ../../receiver/datadogreceiver + - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/datadoglogreceiver => ../../receiver/datadoglogreceiver - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/chronyreceiver => ../../receiver/chronyreceiver - github.com/open-telemetry/opentelemetry-collector-contrib/exporter/parquetexporter => ../../exporter/parquetexporter - github.com/open-telemetry/opentelemetry-collector-contrib/extension/observer/ecstaskobserver => ../../extension/observer/ecstaskobserver diff --git a/cmd/otelcontribcol/go.mod b/cmd/otelcontribcol/go.mod index 13eb8095ff8d..472362b4fa08 100644 --- a/cmd/otelcontribcol/go.mod +++ b/cmd/otelcontribcol/go.mod @@ -118,6 +118,7 @@ require ( github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver v0.84.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/couchdbreceiver v0.84.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/datadogreceiver v0.84.0 + github.com/open-telemetry/opentelemetry-collector-contrib/receiver/datadoglogreceiver v0.84.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver v0.84.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/elasticsearchreceiver v0.84.0 github.com/open-telemetry/opentelemetry-collector-contrib/receiver/expvarreceiver v0.84.0 @@ -1095,6 +1096,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/sshch replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/datadogreceiver => ../../receiver/datadogreceiver +replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/datadoglogreceiver => ../../receiver/datadoglogreceiver + replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/chronyreceiver => ../../receiver/chronyreceiver replace github.com/open-telemetry/opentelemetry-collector-contrib/exporter/parquetexporter => ../../exporter/parquetexporter diff --git a/go.mod b/go.mod index b06fa9192675..b68aaae4811a 100644 --- a/go.mod +++ b/go.mod @@ -967,6 +967,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/couch replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/datadogreceiver => ./receiver/datadogreceiver +replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/datadoglogreceiver => ./receiver/datadoglogreceiver + replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/flinkmetricsreceiver => ./receiver/flinkmetricsreceiver replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver => ./receiver/dockerstatsreceiver diff --git a/testbed/go.mod b/testbed/go.mod index 8dbe12e33474..21ff1f58895e 100644 --- a/testbed/go.mod +++ b/testbed/go.mod @@ -315,6 +315,8 @@ replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/carbo replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/datadogreceiver => ../receiver/datadogreceiver +replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/datadoglogreceiver => ../receiver/datadoglogreceiver + replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jaegerreceiver => ../receiver/jaegerreceiver replace github.com/open-telemetry/opentelemetry-collector-contrib/receiver/opencensusreceiver => ../receiver/opencensusreceiver diff --git a/versions.yaml b/versions.yaml index b5943968f20f..cf50ca046360 100644 --- a/versions.yaml +++ b/versions.yaml @@ -167,6 +167,7 @@ module-sets: - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/collectdreceiver - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/couchdbreceiver - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/datadogreceiver + - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/datadoglogreceiver - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/elasticsearchreceiver - github.com/open-telemetry/opentelemetry-collector-contrib/receiver/expvarreceiver From 3a92c4852269fcfa51196867f0e0a1d88faada9a Mon Sep 17 00:00:00 2001 From: meenal-developer Date: Thu, 2 May 2024 14:08:31 +0530 Subject: [PATCH 2/3] minor change --- internal/components/components.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/internal/components/components.go b/internal/components/components.go index ad98ff7deb87..772448d1d6bf 100644 --- a/internal/components/components.go +++ b/internal/components/components.go @@ -117,6 +117,7 @@ import ( "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/couchdbreceiver" + "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/datadoglogreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/datadogreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/dockerstatsreceiver" "github.com/open-telemetry/opentelemetry-collector-contrib/receiver/elasticsearchreceiver" @@ -235,6 +236,7 @@ func Components() (otelcol.Factories, error) { collectdreceiver.NewFactory(), couchdbreceiver.NewFactory(), datadogreceiver.NewFactory(), + datadoglogreceiver.NewFactory(), dockerstatsreceiver.NewFactory(), elasticsearchreceiver.NewFactory(), expvarreceiver.NewFactory(), From 0ea59a5d3d905b3a02155b99eb643c44a16029df Mon Sep 17 00:00:00 2001 From: meenal-developer Date: Sun, 5 May 2024 21:43:52 +0530 Subject: [PATCH 3/3] typo error --- receiver/datadoglogreceiver/receiver.go | 1 - receiver/datadoglogreceiver/translator.go | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/receiver/datadoglogreceiver/receiver.go b/receiver/datadoglogreceiver/receiver.go index 403b1a011aa6..783d2ef1da32 100644 --- a/receiver/datadoglogreceiver/receiver.go +++ b/receiver/datadoglogreceiver/receiver.go @@ -51,7 +51,6 @@ func newDataDogReceiver(config *Config, nextConsumer consumer.Logs, params recei func (ddr *datadogReceiver) Start(_ context.Context, host component.Host) error { ddmux := http.NewServeMux() - // ddmux.HandleFunc("/api/v0.2/traces", ddr.handleV2Traces) ddmux.HandleFunc("/api/v2/logs", ddr.handleLogs) var err error ddr.server, err = ddr.config.HTTPServerSettings.ToServer( diff --git a/receiver/datadoglogreceiver/translator.go b/receiver/datadoglogreceiver/translator.go index f2f176787322..c50e55cb750f 100644 --- a/receiver/datadoglogreceiver/translator.go +++ b/receiver/datadoglogreceiver/translator.go @@ -96,7 +96,7 @@ func setResourceAttributes(attributes pcommon.Map, attributes.PutStr("host.id", cra.host) } if cra.mwSource != "" { - attributes.PutStr("source.", cra.mwSource) + attributes.PutStr("source", cra.mwSource) } }