Skip to content

Commit 3dac036

Browse files
authored
[chore] Mark github.com/signalfx/signalfx-agent module as local (#6189)
Going forward we need to update all the usages of github.com/signalfx/signalfx-agent to github.com/signalfx/splunk-otel-collector/internal/signalfx-agent
1 parent 333fb3b commit 3dac036

File tree

148 files changed

+224
-78
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

148 files changed

+224
-78
lines changed

.golangci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ linters-settings:
7575
goimports:
7676
# put imports beginning with prefix after 3rd-party packages;
7777
# it's a comma-separated list of prefixes
78-
local-prefixes: github.com/signalfx/splunk-otel-collector
78+
local-prefixes: github.com/signalfx/splunk-otel-collector,github.com/signalfx/signalfx-agent
7979

8080
misspell:
8181
# Correct spellings using locale preferences for US or UK.

Makefile.Common

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ checklinks:
133133
.PHONY: fmt
134134
fmt: addlicense misspell-correction
135135
gofmt -w -s .
136-
goimports -w -local github.com/signalfx/splunk-otel-collector ./
136+
goimports -w -local github.com/signalfx/splunk-otel-collector,github.com/signalfx/signalfx-agent ./
137137
fieldalignment -fix ./... || true
138138

139139
.PHONY: lint

internal/signalfx-agent/cmd/monitorcodegen/genmetadata.tmpl

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
package {{.goPackage}}
44

55
import (
6-
{{if .metrics}}
6+
{{- if .metrics }}
77
"github.com/signalfx/golib/v3/datapoint"
8-
{{- end}}
8+
9+
{{ end -}}
910
"github.com/signalfx/signalfx-agent/pkg/monitors"
1011
)
1112

internal/signalfx-agent/pkg/core/config/validation/validator.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@ import (
77

88
"github.com/go-playground/locales/en"
99
ut "github.com/go-playground/universal-translator"
10-
"github.com/signalfx/signalfx-agent/pkg/utils"
1110
validator "gopkg.in/go-playground/validator.v9"
1211
en_translations "gopkg.in/go-playground/validator.v9/translations/en"
12+
13+
"github.com/signalfx/signalfx-agent/pkg/utils"
1314
)
1415

1516
// Validatable should be implemented by config structs that want to provide

internal/signalfx-agent/pkg/core/dpfilters/overridable.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ import (
44
"errors"
55

66
"github.com/signalfx/golib/v3/datapoint"
7-
"github.com/signalfx/signalfx-agent/pkg/utils/filter"
87
"go.opentelemetry.io/collector/pdata/pcommon"
8+
9+
"github.com/signalfx/signalfx-agent/pkg/utils/filter"
910
)
1011

1112
type overridableDatapointFilter struct {

internal/signalfx-agent/pkg/monitors/appmesh/genmetadata.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/signalfx-agent/pkg/monitors/cadvisor/cadvisor.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ import (
66

77
"github.com/google/cadvisor/client"
88
info "github.com/google/cadvisor/info/v1"
9+
stats "k8s.io/kubelet/pkg/apis/stats/v1alpha1"
10+
911
"github.com/signalfx/signalfx-agent/pkg/core/config"
1012
"github.com/signalfx/signalfx-agent/pkg/monitors"
1113
"github.com/signalfx/signalfx-agent/pkg/monitors/types"
12-
stats "k8s.io/kubelet/pkg/apis/stats/v1alpha1"
1314
)
1415

1516
func init() {

internal/signalfx-agent/pkg/monitors/cadvisor/genmetadata.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/signalfx-agent/pkg/monitors/cgroups/genmetadata.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/signalfx-agent/pkg/monitors/cloudfoundry/genmetadata.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/signalfx-agent/pkg/monitors/collectd/activemq/activemq.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
package activemq
66

77
import (
8+
yaml "gopkg.in/yaml.v2"
9+
810
"github.com/signalfx/signalfx-agent/pkg/monitors"
911
"github.com/signalfx/signalfx-agent/pkg/monitors/collectd/genericjmx"
10-
yaml "gopkg.in/yaml.v2"
1112
)
1213

1314
var serviceName = "activemq"

internal/signalfx-agent/pkg/monitors/collectd/activemq/genmetadata.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/signalfx-agent/pkg/monitors/collectd/apache/genmetadata.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/signalfx-agent/pkg/monitors/collectd/cassandra/cassandra.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
package cassandra
55

66
import (
7+
yaml "gopkg.in/yaml.v2"
8+
79
"github.com/signalfx/signalfx-agent/pkg/monitors"
810
"github.com/signalfx/signalfx-agent/pkg/monitors/collectd/genericjmx"
9-
yaml "gopkg.in/yaml.v2"
1011
)
1112

1213
var serviceName = "cassandra"

internal/signalfx-agent/pkg/monitors/collectd/cassandra/genmetadata.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/signalfx-agent/pkg/monitors/collectd/consul/genmetadata.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/signalfx-agent/pkg/monitors/collectd/couchbase/genmetadata.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/signalfx-agent/pkg/monitors/collectd/cpu/genmetadata.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/signalfx-agent/pkg/monitors/collectd/cpufreq/genmetadata.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/signalfx-agent/pkg/monitors/collectd/genericjmx/genmetadata.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/signalfx-agent/pkg/monitors/collectd/genericjmx/monitor.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
package genericjmx
55

66
import (
7-
"github.com/signalfx/signalfx-agent/pkg/monitors"
87
yaml "gopkg.in/yaml.v2"
8+
9+
"github.com/signalfx/signalfx-agent/pkg/monitors"
910
)
1011

1112
// Monitor is the main type that represents the monitor

internal/signalfx-agent/pkg/monitors/collectd/hadoop/genmetadata.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/signalfx-agent/pkg/monitors/collectd/hadoopjmx/genmetadata.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/signalfx-agent/pkg/monitors/collectd/hadoopjmx/hadoopjmx.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ package hadoopjmx
66
import (
77
"fmt"
88

9+
yaml "gopkg.in/yaml.v2"
10+
911
"github.com/signalfx/signalfx-agent/pkg/monitors"
1012
"github.com/signalfx/signalfx-agent/pkg/monitors/collectd/genericjmx"
11-
yaml "gopkg.in/yaml.v2"
1213
)
1314

1415
var serviceName = "hadoop"

internal/signalfx-agent/pkg/monitors/collectd/jenkins/genmetadata.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/signalfx-agent/pkg/monitors/collectd/kafka/genmetadata.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/signalfx-agent/pkg/monitors/collectd/kafka/kafka.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
package kafka
55

66
import (
7+
yaml "gopkg.in/yaml.v2"
8+
79
"github.com/signalfx/signalfx-agent/pkg/monitors"
810
"github.com/signalfx/signalfx-agent/pkg/monitors/collectd/genericjmx"
9-
yaml "gopkg.in/yaml.v2"
1011
)
1112

1213
var serviceName = "kafka"

internal/signalfx-agent/pkg/monitors/collectd/kafkaconsumer/genmetadata.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/signalfx-agent/pkg/monitors/collectd/kafkaconsumer/kafkaconsumer.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
package kafkaconsumer
55

66
import (
7+
yaml "gopkg.in/yaml.v2"
8+
79
"github.com/signalfx/signalfx-agent/pkg/monitors"
810
"github.com/signalfx/signalfx-agent/pkg/monitors/collectd/genericjmx"
9-
yaml "gopkg.in/yaml.v2"
1011
)
1112

1213
var serviceName = "kafka_consumer"

internal/signalfx-agent/pkg/monitors/collectd/kafkaproducer/genmetadata.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/signalfx-agent/pkg/monitors/collectd/kafkaproducer/kafkaproducer.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44
package kafkaproducer
55

66
import (
7+
yaml "gopkg.in/yaml.v2"
8+
79
"github.com/signalfx/signalfx-agent/pkg/monitors"
810
"github.com/signalfx/signalfx-agent/pkg/monitors/collectd/genericjmx"
9-
yaml "gopkg.in/yaml.v2"
1011
)
1112

1213
var serviceName = "kafka_producer"

internal/signalfx-agent/pkg/monitors/collectd/memcached/genmetadata.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/signalfx-agent/pkg/monitors/collectd/memory/genmetadata.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/signalfx-agent/pkg/monitors/collectd/mysql/genmetadata.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/signalfx-agent/pkg/monitors/collectd/nginx/genmetadata.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/signalfx-agent/pkg/monitors/collectd/opcache/genmetadata.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/signalfx-agent/pkg/monitors/collectd/openstack/genmetadata.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/signalfx-agent/pkg/monitors/collectd/openstack/openstack.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@ package openstack
33
import (
44
"fmt"
55

6+
"gopkg.in/yaml.v2"
7+
68
"github.com/signalfx/signalfx-agent/pkg/core/config"
79
"github.com/signalfx/signalfx-agent/pkg/monitors/collectd"
8-
"gopkg.in/yaml.v2"
910

1011
"github.com/signalfx/signalfx-agent/pkg/monitors"
1112
"github.com/signalfx/signalfx-agent/pkg/monitors/collectd/python"

internal/signalfx-agent/pkg/monitors/collectd/php/genmetadata.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/signalfx-agent/pkg/monitors/collectd/processes/genmetadata.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/signalfx-agent/pkg/monitors/collectd/protocols/genmetadata.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/signalfx-agent/pkg/monitors/collectd/rabbitmq/genmetadata.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/signalfx-agent/pkg/monitors/collectd/redis/genmetadata.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)