Skip to content

Commit 4095848

Browse files
committed
Remove observer manager and utils
1 parent 72c66f0 commit 4095848

File tree

14 files changed

+0
-571
lines changed

14 files changed

+0
-571
lines changed

internal/signalfx-agent/pkg/core/config/text.go

Lines changed: 0 additions & 101 deletions
This file was deleted.

internal/signalfx-agent/pkg/observers/diagnostics.go

Lines changed: 0 additions & 26 deletions
This file was deleted.

internal/signalfx-agent/pkg/observers/manager.go

Lines changed: 0 additions & 147 deletions
This file was deleted.

internal/signalfx-agent/pkg/observers/observer.go

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,9 @@
1010
package observers
1111

1212
import (
13-
"fmt"
14-
1513
log "github.com/sirupsen/logrus"
1614

17-
"github.com/signalfx/signalfx-agent/pkg/core/config"
18-
"github.com/signalfx/signalfx-agent/pkg/core/config/validation"
1915
"github.com/signalfx/signalfx-agent/pkg/core/services"
20-
"github.com/signalfx/signalfx-agent/pkg/utils"
2116
)
2217

2318
// Shutdownable describes an observer that has a shutdown routine. Observers
@@ -56,21 +51,3 @@ type ServiceCallbacks struct {
5651
Added func(services.Endpoint)
5752
Removed func(services.Endpoint)
5853
}
59-
60-
func configureObserver(observer interface{}, conf *config.ObserverConfig) error {
61-
log.WithFields(log.Fields{
62-
"config": *conf,
63-
}).Debug("Configuring observer")
64-
65-
finalConfig := utils.CloneInterface(ConfigTemplates[conf.Type])
66-
67-
if err := config.FillInConfigTemplate("ObserverConfig", finalConfig, conf); err != nil {
68-
return err
69-
}
70-
71-
if err := validation.ValidateCustomConfig(finalConfig); err != nil {
72-
return fmt.Errorf("observer config is invalid: %w", err)
73-
}
74-
75-
return config.CallConfigure(observer, finalConfig)
76-
}

internal/signalfx-agent/pkg/observers/servicediffer_test.go

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 0 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,9 @@
11
package utils
22

33
import (
4-
"fmt"
5-
"sort"
6-
"strings"
7-
8-
"github.com/olekukonko/tablewriter"
94
"github.com/signalfx/golib/v3/datapoint"
105
)
116

12-
func sortedDimensionString(dims map[string]string) string {
13-
var keys []string
14-
for k := range dims {
15-
keys = append(keys, k)
16-
}
17-
sort.Strings(keys)
18-
19-
tableString := &strings.Builder{}
20-
table := tablewriter.NewWriter(tableString)
21-
22-
table.SetHeader(keys)
23-
var vals []string
24-
for _, k := range keys {
25-
vals = append(vals, dims[k])
26-
}
27-
table.Append(vals)
28-
table.SetAutoFormatHeaders(false)
29-
30-
table.Render()
31-
return tableString.String()
32-
}
33-
34-
func dpTypeToString(t datapoint.MetricType) string {
35-
switch t {
36-
case datapoint.Gauge:
37-
return "gauge"
38-
case datapoint.Count:
39-
return "counter"
40-
case datapoint.Counter:
41-
return "cumulative counter"
42-
default:
43-
return fmt.Sprintf("unsupported type %d", t)
44-
}
45-
}
46-
47-
// DatapointToString pretty prints a datapoint in a consistent manner for
48-
// logging purposes. The most important thing here is to sort the dimension
49-
// dict so it is consistent so that it is easier to visually scan a large list
50-
// of datapoints.
51-
func DatapointToString(dp *datapoint.Datapoint) string {
52-
var tsStr string
53-
if !dp.Timestamp.IsZero() {
54-
tsStr = dp.Timestamp.String()
55-
}
56-
return fmt.Sprintf("%s: %s (%s) %s\n%s\n", dp.Metric, dp.Value, strings.ToUpper(dpTypeToString(dp.MetricType)), tsStr, sortedDimensionString(dp.Dimensions))
57-
}
58-
597
// BoolToInt returns 1 if b is true and 0 otherwise. It is useful for
608
// datapoints which track a binary value since we don't support boolean
619
// datapoint directly.
@@ -92,15 +40,3 @@ func SetDatapointMeta(dp *datapoint.Datapoint, name interface{}, val interface{}
9240
}
9341
dp.Meta[name] = val
9442
}
95-
96-
func CloneDatapoint(dp *datapoint.Datapoint) *datapoint.Datapoint {
97-
return datapoint.NewWithMeta(dp.Metric, CloneStringMap(dp.Dimensions), CloneFullInterfaceMap(dp.Meta), dp.Value, dp.MetricType, dp.Timestamp)
98-
}
99-
100-
func CloneDatapointSlice(dps []*datapoint.Datapoint) []*datapoint.Datapoint {
101-
out := make([]*datapoint.Datapoint, len(dps))
102-
for i := range dps {
103-
out[i] = CloneDatapoint(dps[i])
104-
}
105-
return out
106-
}

0 commit comments

Comments
 (0)