Skip to content

Commit

Permalink
[exporter/coralogixexporter] Remove old tracing client (open-telemetr…
Browse files Browse the repository at this point in the history
  • Loading branch information
povilasv authored and shalper2 committed Dec 6, 2022
1 parent 3bef5ab commit 4a8bbe8
Show file tree
Hide file tree
Showing 13 changed files with 26 additions and 219 deletions.
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: deprecation
change_type: breaking

# The name of the component, or a single word describing the area of concern, (e.g. filelogreceiver)
component: exporter/coralogix
component: coralogixexporter

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: Mark Coralogix exporter as unmaintained
note: "remove old jaeger based tracing client"

# One or more tracking issues related to the change
issues: [16548]
issues: [7931]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:
1 change: 0 additions & 1 deletion cmd/configschema/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,6 @@ require (
github.com/containerd/cgroups v1.0.4 // indirect
github.com/containerd/console v1.0.3 // indirect
github.com/containerd/ttrpc v1.1.0 // indirect
github.com/coralogix/opentelemetry-cx-protobuf-api/coralogixpb v0.0.0-20211201100428-d2a5d0ecf53e // indirect
github.com/coreos/go-oidc v2.2.1+incompatible // indirect
github.com/coreos/go-semver v0.3.0 // indirect
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect
Expand Down
2 changes: 0 additions & 2 deletions cmd/configschema/go.sum

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

10 changes: 5 additions & 5 deletions exporter/coralogixexporter/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@

| Status | |
| ------------------------ |----------------------- |
| Stability | [unmaintained] |
| Stability | traces, metrics [beta] |
| | logs [alpha] |
| Supported pipeline types | traces, metrics, logs |
| Distributions | [contrib] |

**Note**: This component was marked as unmaintained on 2022-11-30, it will be removed from official builds on 2023-05-30

The Coralogix exporter sends traces, metrics and logs to [Coralogix](https://coralogix.com/).

> Please review the Collector's [security
Expand Down Expand Up @@ -51,7 +50,7 @@ exporters:
```
### Tracing deprecation
The v0.60 version deprecates old Jaeger based tracing endpoint in favour of Opentelemetry based one.
The v0.67 version removed old Jaeger based tracing endpoint in favour of Opentelemetry based one.
To migrate, please remove the old endpoint field, and change the configuration to `traces.endpoint` using the new Tracing endpoint.

Expand Down Expand Up @@ -232,5 +231,6 @@ exporters:
Our world-class customer success team is available 24/7 to walk you through the setup for this exporter and answer any questions that may come up.
Feel free to reach out to us **via our in-app chat** or by sending us an email to [[email protected]](mailto:[email protected]).
[unmaintained]:https://github.com/open-telemetry/opentelemetry-collector#unmaintained
[alpha]:https://github.com/open-telemetry/opentelemetry-collector#alpha
[beta]:https://github.com/open-telemetry/opentelemetry-collector#beta
[contrib]:https://github.com/open-telemetry/opentelemetry-collector-releases/tree/main/distributions/otelcol-contrib
81 changes: 0 additions & 81 deletions exporter/coralogixexporter/client.go

This file was deleted.

3 changes: 1 addition & 2 deletions exporter/coralogixexporter/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ import (
const (
typeStr = "coralogix"
// The stability level of the exporter.
// Marked as unmantained on 2022-11-30, will be removed from official builds on 2023-05-30.
stability = component.StabilityLevelUnmaintained
stability = component.StabilityLevelBeta
)

// Config defines by Coralogix.
Expand Down
20 changes: 0 additions & 20 deletions exporter/coralogixexporter/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ import (
"go.opentelemetry.io/collector/config/configtls"
"go.opentelemetry.io/collector/confmap/confmaptest"
"go.opentelemetry.io/collector/exporter/exporterhelper"
"go.opentelemetry.io/collector/pdata/ptrace"
)

func TestLoadConfig(t *testing.T) {
Expand Down Expand Up @@ -188,22 +187,3 @@ func TestTraceExporter(t *testing.T) {
assert.NotNil(t, te, "failed to create trace exporter")
assert.NoError(t, te.start(context.Background(), componenttest.NewNopHost()))
}

func TestJaegerBasedTraceExporter(t *testing.T) {
cm, err := confmaptest.LoadConf(filepath.Join("testdata", "config.yaml"))
require.NoError(t, err)
factory := NewFactory()
cfg := factory.CreateDefaultConfig()

sub, err := cm.Sub(component.NewIDWithName(typeStr, "trace").String())
require.NoError(t, err)
require.NoError(t, component.UnmarshalConfig(sub, cfg))

params := componenttest.NewNopExporterCreateSettings()
te, err := newCoralogixExporter(cfg.(*Config), params)
assert.NoError(t, err)
assert.NotNil(t, te, "failed to create trace exporter")
assert.NoError(t, te.client.startConnection(context.Background(), componenttest.NewNopHost()))
td := ptrace.NewTraces()
assert.NoError(t, te.tracesPusher(context.Background(), td))
}
48 changes: 0 additions & 48 deletions exporter/coralogixexporter/exporter.go

This file was deleted.

24 changes: 1 addition & 23 deletions exporter/coralogixexporter/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ func NewFactory() component.ExporterFactory {
createDefaultConfig,
component.WithTracesExporter(createTraceExporter, stability),
component.WithMetricsExporter(createMetricsExporter, stability),
// Marked as unmantained on 2022-11-30, will be removed from official builds on 2023-05-30.
component.WithLogsExporter(createLogsExporter, component.StabilityLevelUnmaintained),
component.WithLogsExporter(createLogsExporter, component.StabilityLevelAlpha),
)
}

Expand Down Expand Up @@ -67,27 +66,6 @@ func createDefaultConfig() component.Config {
func createTraceExporter(ctx context.Context, set component.ExporterCreateSettings, config component.Config) (component.TracesExporter, error) {
cfg := config.(*Config)

// Use deprecated jaeger endpoint if it's not empty
if !isEmpty(cfg.Endpoint) {
set.Logger.Warn("endpoint field is deprecated.Please use the new `traces.endpoint` field with OpenTelemtry endpoint.")

exporter, err := newCoralogixExporter(cfg, set)
if err != nil {
return nil, err
}

return exporterhelper.NewTracesExporter(
ctx,
set,
config,
exporter.tracesPusher,
exporterhelper.WithQueue(cfg.QueueSettings),
exporterhelper.WithRetry(cfg.RetrySettings),
exporterhelper.WithTimeout(cfg.TimeoutSettings),
exporterhelper.WithStart(exporter.client.startConnection),
)
}

exporter, err := newTracesExporter(cfg, set)
if err != nil {
return nil, err
Expand Down
15 changes: 4 additions & 11 deletions exporter/coralogixexporter/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,55 +3,48 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/coralo
go 1.18

require (
github.com/coralogix/opentelemetry-cx-protobuf-api/coralogixpb v0.0.0-20211201100428-d2a5d0ecf53e
github.com/open-telemetry/opentelemetry-collector-contrib/internal/common v0.66.0
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/jaeger v0.66.0
github.com/stretchr/testify v1.8.1
go.opentelemetry.io/collector v0.66.1-0.20221202005155-1c54042beb70
go.opentelemetry.io/collector/component v0.66.1-0.20221202005155-1c54042beb70
go.opentelemetry.io/collector/confmap v0.0.0-20221201172708-2bdff61fa52a
go.opentelemetry.io/collector/consumer v0.66.1-0.20221202005155-1c54042beb70
go.opentelemetry.io/collector/pdata v0.66.1-0.20221202005155-1c54042beb70
go.uber.org/zap v1.24.0
google.golang.org/genproto v0.0.0-20221027153422-115e99e71e1c
google.golang.org/grpc v1.51.0
)

require (
cloud.google.com/go/compute/metadata v0.2.1 // indirect
github.com/apache/thrift v0.17.0 // indirect
github.com/cenkalti/backoff/v4 v4.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/gogo/googleapis v1.4.1 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/jaegertracing/jaeger v1.39.1-0.20221110195127-14c11365a856 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.15.12 // indirect
github.com/knadh/koanf v1.4.4 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/mostynb/go-grpc-compression v1.1.17 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.66.0 // indirect
github.com/opentracing/opentracing-go v1.2.0 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/collector/featuregate v0.66.1-0.20221202005155-1c54042beb70 // indirect
go.opentelemetry.io/collector/semconv v0.66.1-0.20221202005155-1c54042beb70 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.36.4 // indirect
go.opentelemetry.io/otel v1.11.1 // indirect
go.opentelemetry.io/otel/metric v0.33.0 // indirect
go.opentelemetry.io/otel/trace v1.11.1 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
go.uber.org/zap v1.24.0 // indirect
golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
golang.org/x/sys v0.2.0 // indirect
golang.org/x/text v0.4.0 // indirect
Expand Down
Loading

0 comments on commit 4a8bbe8

Please sign in to comment.