Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Datadog Connector Component #25065

Merged
merged 13 commits into from
Aug 14, 2023
Prev Previous commit
Next Next commit
resolving conflicts
  • Loading branch information
gord02 committed Aug 10, 2023
commit 4fd7e868f6d963630c33a8a460ca978ef6c867de
15 changes: 1 addition & 14 deletions cmd/otelcontribcol/components.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions connector/datadogconnector/connector.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,7 @@ package datadogconnector // import "github.com/open-telemetry/opentelemetry-coll
import (
"context"

<<<<<<< HEAD
pb "github.com/DataDog/datadog-agent/pkg/proto/pbgo/trace"
=======
"github.com/DataDog/datadog-agent/pkg/trace/pb"
>>>>>>> c2d244a8a0 (adding code for datadog connector)
"github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/metrics"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/consumer"
Expand Down
1 change: 0 additions & 1 deletion connector/datadogconnector/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import (
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/connector"
"go.opentelemetry.io/collector/consumer"
// "github.com/open-telemetry/opentelemetry-collector-contrib/connector/datadogconnector/metadata"
)

const (
Expand Down
14 changes: 2 additions & 12 deletions connector/datadogconnector/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 0 additions & 10 deletions go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

74 changes: 4 additions & 70 deletions internal/datadog/go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading