Skip to content

Commit c9af8e1

Browse files
authored
[chore] [exporter/signalfx] Remove dependency on signalfx-agent (#27040)
https://github.com/signalfx/signalfx-agent is marked as EOS. In order to remove the dependency, this change brings code from https://github.com/signalfx/signalfx-agent/tree/main/pkg/apm module needed for the exporter without any modifications other than linter fixes. Exporter uses only part of that code. We can remove unused parts in the next steps to cut the dependency tree.
1 parent ef78231 commit c9af8e1

File tree

34 files changed

+2206
-30
lines changed

34 files changed

+2206
-30
lines changed

cmd/configschema/go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@ require (
169169
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/zookeeperreceiver v0.85.0 // indirect
170170
github.com/samber/lo v1.37.0 // indirect
171171
github.com/shoenig/go-m1cpu v0.1.6 // indirect
172-
github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230214151822-6a6813cf5bf1 // indirect
173172
go.opentelemetry.io/collector/exporter v0.85.1-0.20230919160920-512b9c3c8fec // indirect
174173
go.opentelemetry.io/collector/receiver v0.85.1-0.20230919160920-512b9c3c8fec // indirect
175174
)

cmd/configschema/go.sum

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/otelcontribcol/go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,6 @@ require (
586586
github.com/signalfx/gohistogram v0.0.0-20160107210732-1ccfd2ff5083 // indirect
587587
github.com/signalfx/golib/v3 v3.3.47 // indirect
588588
github.com/signalfx/sapm-proto v0.13.0 // indirect
589-
github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230214151822-6a6813cf5bf1 // indirect
590589
github.com/sijms/go-ora/v2 v2.7.17 // indirect
591590
github.com/sirupsen/logrus v1.9.0 // indirect
592591
github.com/snowflakedb/gosnowflake v1.6.24 // indirect

cmd/otelcontribcol/go.sum

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/oteltestbedcol/go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,6 @@ require (
211211
github.com/signalfx/gohistogram v0.0.0-20160107210732-1ccfd2ff5083 // indirect
212212
github.com/signalfx/golib/v3 v3.3.47 // indirect
213213
github.com/signalfx/sapm-proto v0.13.0 // indirect
214-
github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230214151822-6a6813cf5bf1 // indirect
215214
github.com/soheilhy/cmux v0.1.5 // indirect
216215
github.com/spf13/cobra v1.7.0 // indirect
217216
github.com/spf13/pflag v1.0.5 // indirect

cmd/oteltestbedcol/go.sum

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

exporter/signalfxexporter/config_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"time"
1111

1212
"github.com/cenkalti/backoff/v4"
13-
apmcorrelation "github.com/signalfx/signalfx-agent/pkg/apm/correlations"
1413
"github.com/stretchr/testify/assert"
1514
"github.com/stretchr/testify/require"
1615
"go.opentelemetry.io/collector/component"
@@ -21,6 +20,7 @@ import (
2120
"go.opentelemetry.io/collector/exporter/exporterhelper"
2221
"go.uber.org/zap"
2322

23+
apmcorrelation "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter/internal/apm/correlations"
2424
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter/internal/correlation"
2525
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter/internal/metadata"
2626
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/signalfxexporter/internal/translation"

exporter/signalfxexporter/go.mod

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ require (
1414
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/signalfx v0.85.0
1515
github.com/shirou/gopsutil/v3 v3.23.8
1616
github.com/signalfx/com_signalfx_metrics_protobuf v0.0.3
17-
github.com/signalfx/signalfx-agent/pkg/apm v0.0.0-20230214151822-6a6813cf5bf1
17+
github.com/signalfx/golib/v3 v3.3.47
1818
github.com/stretchr/testify v1.8.4
1919
go.opentelemetry.io/collector/component v0.85.1-0.20230919160920-512b9c3c8fec
2020
go.opentelemetry.io/collector/config/confighttp v0.85.1-0.20230919160920-512b9c3c8fec
@@ -63,7 +63,6 @@ require (
6363
github.com/rs/cors v1.10.0 // indirect
6464
github.com/shoenig/go-m1cpu v0.1.6 // indirect
6565
github.com/signalfx/gohistogram v0.0.0-20160107210732-1ccfd2ff5083 // indirect
66-
github.com/signalfx/golib/v3 v3.3.47 // indirect
6766
github.com/signalfx/sapm-proto v0.13.0 // indirect
6867
github.com/tklauser/go-sysconf v0.3.12 // indirect
6968
github.com/tklauser/numcpus v0.6.1 // indirect

exporter/signalfxexporter/go.sum

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)