Skip to content
This repository was archived by the owner on Nov 8, 2022. It is now read-only.

Commit 32e5356

Browse files
jcooklinjcooklin
authored
Merge pull request #1199 from kindermoumoute/snap_separator
Add an arbitrary separator for plugin keys
2 parents b3778cf + 8ad971e commit 32e5356

File tree

12 files changed

+67
-58
lines changed

12 files changed

+67
-58
lines changed

‎control/available_plugin.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ func newAvailablePlugin(resp plugin.Response, emitter gomit.Emitter, ep executab
9494
lastHitTime: time.Now(),
9595
ePlugin: ep,
9696
}
97-
ap.key = fmt.Sprintf("%s:%s:%d", ap.pluginType.String(), ap.name, ap.version)
97+
ap.key = fmt.Sprintf("%s"+core.Separator+"%s"+core.Separator+"%d", ap.pluginType.String(), ap.name, ap.version)
9898

9999
listenURL := fmt.Sprintf("http://%v/rpc", resp.ListenAddress)
100100
// Create RPC Client
@@ -327,7 +327,7 @@ func (ap *availablePlugins) insert(pl *availablePlugin) error {
327327
ap.Lock()
328328
defer ap.Unlock()
329329

330-
key := fmt.Sprintf("%s:%s:%d", pl.TypeName(), pl.name, pl.version)
330+
key := fmt.Sprintf("%s"+core.Separator+"%s"+core.Separator+"%d", pl.TypeName(), pl.name, pl.version)
331331
_, exists := ap.table[key]
332332
if !exists {
333333
p, err := strategy.NewPool(key, pl)
@@ -348,7 +348,7 @@ func (ap *availablePlugins) getPool(key string) (strategy.Pool, serror.SnapError
348348
defer ap.RUnlock()
349349
pool, ok := ap.table[key]
350350
if !ok {
351-
tnv := strings.Split(key, ":")
351+
tnv := strings.Split(key, core.Separator)
352352
if len(tnv) != 3 {
353353
return nil, serror.New(ErrBadKey, map[string]interface{}{
354354
"key": key,
@@ -441,7 +441,7 @@ func (ap *availablePlugins) collectMetrics(pluginKey string, metricTypes []core.
441441

442442
func (ap *availablePlugins) publishMetrics(metrics []core.Metric, pluginName string, pluginVersion int, config map[string]ctypes.ConfigValue, taskID string) []error {
443443
var errs []error
444-
key := strings.Join([]string{plugin.PublisherPluginType.String(), pluginName, strconv.Itoa(pluginVersion)}, ":")
444+
key := strings.Join([]string{plugin.PublisherPluginType.String(), pluginName, strconv.Itoa(pluginVersion)}, core.Separator)
445445
pool, serr := ap.getPool(key)
446446
if serr != nil {
447447
errs = append(errs, serr)
@@ -476,7 +476,7 @@ func (ap *availablePlugins) publishMetrics(metrics []core.Metric, pluginName str
476476

477477
func (ap *availablePlugins) processMetrics(metrics []core.Metric, pluginName string, pluginVersion int, config map[string]ctypes.ConfigValue, taskID string) ([]core.Metric, []error) {
478478
var errs []error
479-
key := strings.Join([]string{plugin.ProcessorPluginType.String(), pluginName, strconv.Itoa(pluginVersion)}, ":")
479+
key := strings.Join([]string{plugin.ProcessorPluginType.String(), pluginName, strconv.Itoa(pluginVersion)}, core.Separator)
480480
pool, serr := ap.getPool(key)
481481
if serr != nil {
482482
errs = append(errs, serr)
@@ -512,15 +512,15 @@ func (ap *availablePlugins) findLatestPool(pType, name string) (strategy.Pool, s
512512
// see if there exists a pool at all which matches name version.
513513
var latest strategy.Pool
514514
for key, pool := range ap.table {
515-
tnv := strings.Split(key, ":")
515+
tnv := strings.Split(key, core.Separator)
516516
if tnv[0] == pType && tnv[1] == name {
517517
latest = pool
518518
break
519519
}
520520
}
521521
if latest != nil {
522522
for key, pool := range ap.table {
523-
tnv := strings.Split(key, ":")
523+
tnv := strings.Split(key, core.Separator)
524524
if tnv[0] == pType && tnv[1] == name && pool.Version() > latest.Version() {
525525
latest = pool
526526
}

‎control/available_plugin_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import (
2828

2929
"github.com/intelsdi-x/snap/control/fixtures"
3030
"github.com/intelsdi-x/snap/control/plugin"
31+
"github.com/intelsdi-x/snap/core"
3132
. "github.com/smartystreets/goconvey/convey"
3233
)
3334

@@ -84,7 +85,7 @@ func TestAvailablePlugins(t *testing.T) {
8485
err := aps.insert(ap)
8586
So(err, ShouldBeNil)
8687

87-
pool, err := aps.getPool("collector:test:1")
88+
pool, err := aps.getPool("collector" + core.Separator + "test" + core.Separator + "1")
8889
So(err, ShouldBeNil)
8990
nap, ok := pool.Plugins()[ap.id]
9091
So(ok, ShouldBeTrue)

‎control/config.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ func (p *pluginConfig) deletePluginConfigDataNodeField(pluginType core.PluginTyp
444444

445445
func (p *pluginConfig) getPluginConfigDataNode(pluginType core.PluginType, name string, ver int) *cdata.ConfigDataNode {
446446
// check cache
447-
key := fmt.Sprintf("%d:%s:%d", pluginType, name, ver)
447+
key := fmt.Sprintf("%d"+core.Separator+"%s"+core.Separator+"%d", pluginType, name, ver)
448448
if res, ok := p.pluginCache[key]; ok {
449449
return res
450450
}

‎control/control_test.go‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -813,7 +813,7 @@ func TestMetricConfig(t *testing.T) {
813813
So(errs, ShouldBeNil)
814814
})
815815
Convey("So mock should have name: bob config from defaults", func() {
816-
So(c.Config.Plugins.pluginCache["0:mock:1"].Table()["name"], ShouldResemble, ctypes.ConfigValueStr{Value: "bob"})
816+
So(c.Config.Plugins.pluginCache["0"+core.Separator+"mock"+core.Separator+"1"].Table()["name"], ShouldResemble, ctypes.ConfigValueStr{Value: "bob"})
817817
})
818818

819819
c.Stop()
@@ -893,10 +893,10 @@ func TestRoutingCachingStrategy(t *testing.T) {
893893
cdt.Add([]string{"intel", "mock"}, node)
894894

895895
Convey("Start the plugins", func() {
896-
lp, err := c.pluginManager.get("collector:mock:2")
896+
lp, err := c.pluginManager.get("collector" + core.Separator + "mock" + core.Separator + "2")
897897
So(err, ShouldBeNil)
898898
So(lp, ShouldNotBeNil)
899-
pool, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector:mock:2")
899+
pool, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector" + core.Separator + "mock" + core.Separator + "2")
900900
So(errp, ShouldBeNil)
901901
So(pool, ShouldNotBeNil)
902902
tasks := []string{
@@ -965,10 +965,10 @@ func TestRoutingCachingStrategy(t *testing.T) {
965965
cdt.Add([]string{"intel", "mock"}, node)
966966

967967
Convey("Start the plugins", func() {
968-
lp, err := c.pluginManager.get("collector:mock:1")
968+
lp, err := c.pluginManager.get("collector" + core.Separator + "mock" + core.Separator + "1")
969969
So(err, ShouldBeNil)
970970
So(lp, ShouldNotBeNil)
971-
pool, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector:mock:1")
971+
pool, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector" + core.Separator + "mock" + core.Separator + "1")
972972
time.Sleep(1 * time.Second)
973973
So(errp, ShouldBeNil)
974974
So(pool, ShouldNotBeNil)
@@ -1056,10 +1056,10 @@ func TestCollectDynamicMetrics(t *testing.T) {
10561056
cdt := cdata.NewTree()
10571057

10581058
Convey("collects metrics from plugin using native client", func() {
1059-
lp, err := c.pluginManager.get("collector:mock:2")
1059+
lp, err := c.pluginManager.get("collector" + core.Separator + "mock" + core.Separator + "2")
10601060
So(err, ShouldBeNil)
10611061
So(lp, ShouldNotBeNil)
1062-
pool, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector:mock:2")
1062+
pool, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector" + core.Separator + "mock" + core.Separator + "2")
10631063
So(errp, ShouldBeNil)
10641064
So(pool, ShouldNotBeNil)
10651065
taskID := uuid.New()
@@ -1150,12 +1150,12 @@ func TestFailedPlugin(t *testing.T) {
11501150
So(serrs, ShouldBeNil)
11511151

11521152
// retrieve loaded plugin
1153-
lp, err := c.pluginManager.get("collector:mock:2")
1153+
lp, err := c.pluginManager.get("collector" + core.Separator + "mock" + core.Separator + "2")
11541154
So(err, ShouldBeNil)
11551155
So(lp, ShouldNotBeNil)
11561156

11571157
Convey("create a pool, add subscriptions and start plugins", func() {
1158-
pool, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector:mock:2")
1158+
pool, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector" + core.Separator + "mock" + core.Separator + "2")
11591159
So(errp, ShouldBeNil)
11601160
Convey("collect metrics against a plugin that will panic", func() {
11611161
So(pool.Count(), ShouldEqual, 1)
@@ -1231,7 +1231,7 @@ func TestCollectMetrics(t *testing.T) {
12311231
}
12321232

12331233
// retrieve loaded plugin
1234-
lp, err := c.pluginManager.get("collector:mock:1")
1234+
lp, err := c.pluginManager.get("collector" + core.Separator + "mock" + core.Separator + "1")
12351235
So(err, ShouldBeNil)
12361236
So(lp, ShouldNotBeNil)
12371237

@@ -1251,7 +1251,7 @@ func TestCollectMetrics(t *testing.T) {
12511251
serrs = c.SubscribeDeps(taskNonHit, r, []core.SubscribedPlugin{subscribedPlugin{typeName: "collector", name: "mock", version: 1}}, cdt)
12521252
So(serrs, ShouldBeNil)
12531253

1254-
pool, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector:mock:1")
1254+
pool, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector" + core.Separator + "mock" + core.Separator + "1")
12551255
So(errp, ShouldBeNil)
12561256

12571257
Convey("collect metrics", func() {
@@ -1299,7 +1299,7 @@ func TestPublishMetrics(t *testing.T) {
12991299
So(err, ShouldBeNil)
13001300
<-lpe.done
13011301
So(len(c.pluginManager.all()), ShouldEqual, 1)
1302-
lp, err2 := c.pluginManager.get("publisher:mock-file:3")
1302+
lp, err2 := c.pluginManager.get("publisher" + core.Separator + "mock-file" + core.Separator + "3")
13031303
So(err2, ShouldBeNil)
13041304
So(lp.Name(), ShouldResemble, "mock-file")
13051305
So(lp.ConfigPolicy, ShouldNotBeNil)
@@ -1346,7 +1346,7 @@ func TestProcessMetrics(t *testing.T) {
13461346
So(err, ShouldBeNil)
13471347
<-lpe.done
13481348
So(len(c.pluginManager.all()), ShouldEqual, 1)
1349-
lp, err2 := c.pluginManager.get("processor:passthru:1")
1349+
lp, err2 := c.pluginManager.get("processor" + core.Separator + "passthru" + core.Separator + "1")
13501350
So(err2, ShouldBeNil)
13511351
So(lp.Name(), ShouldResemble, "passthru")
13521352
So(lp.ConfigPolicy, ShouldNotBeNil)
@@ -1428,7 +1428,7 @@ func TestMetricSubscriptionToNewVersion(t *testing.T) {
14281428
<-lpe.load
14291429
So(err, ShouldBeNil)
14301430
So(len(c.pluginManager.all()), ShouldEqual, 1)
1431-
lp, err2 := c.pluginManager.get("collector:mock:1")
1431+
lp, err2 := c.pluginManager.get("collector" + core.Separator + "mock" + core.Separator + "1")
14321432
So(err2, ShouldBeNil)
14331433
So(lp.Name(), ShouldResemble, "mock")
14341434
//Subscribe deps to create pools.
@@ -1465,11 +1465,11 @@ func TestMetricSubscriptionToNewVersion(t *testing.T) {
14651465
So(false, ShouldEqual, true)
14661466
}
14671467

1468-
pool1, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector:mock:1")
1468+
pool1, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector" + core.Separator + "mock" + core.Separator + "1")
14691469
So(errp, ShouldBeNil)
14701470
So(pool1.SubscriptionCount(), ShouldEqual, 0)
14711471

1472-
pool2, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector:mock:2")
1472+
pool2, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector" + core.Separator + "mock" + core.Separator + "2")
14731473
So(errp, ShouldBeNil)
14741474
So(pool2.SubscriptionCount(), ShouldEqual, 1)
14751475

@@ -1494,7 +1494,7 @@ func TestMetricSubscriptionToOlderVersion(t *testing.T) {
14941494
<-lpe.load
14951495
So(err, ShouldBeNil)
14961496
So(len(c.pluginManager.all()), ShouldEqual, 1)
1497-
lp, err2 := c.pluginManager.get("collector:mock:2")
1497+
lp, err2 := c.pluginManager.get("collector" + core.Separator + "mock" + core.Separator + "2")
14981498
So(err2, ShouldBeNil)
14991499
So(lp.Name(), ShouldResemble, "mock")
15001500
requestedMetric := fixtures.NewMockRequestedMetric(
@@ -1540,11 +1540,11 @@ func TestMetricSubscriptionToOlderVersion(t *testing.T) {
15401540
var pool1 strategy.Pool
15411541
var errp error
15421542
ap := c.pluginRunner.AvailablePlugins()
1543-
pool1, errp = ap.getOrCreatePool("collector:mock:2")
1543+
pool1, errp = ap.getOrCreatePool("collector" + core.Separator + "mock" + core.Separator + "2")
15441544
So(errp, ShouldBeNil)
15451545
So(pool1.SubscriptionCount(), ShouldEqual, 0)
15461546

1547-
pool2, errp := ap.getOrCreatePool("collector:mock:1")
1547+
pool2, errp := ap.getOrCreatePool("collector" + core.Separator + "mock" + core.Separator + "1")
15481548
So(errp, ShouldBeNil)
15491549
So(pool2.SubscriptionCount(), ShouldEqual, 1)
15501550

@@ -1571,7 +1571,7 @@ func TestDynamicMetricSubscriptionLoad(t *testing.T) {
15711571
_, err := load(c, path.Join(fixtures.SnapPath, "plugin", "snap-plugin-collector-mock1"))
15721572
So(err, ShouldBeNil)
15731573
So(len(c.pluginManager.all()), ShouldEqual, 1)
1574-
lp, err2 := c.pluginManager.get("collector:mock:1")
1574+
lp, err2 := c.pluginManager.get("collector" + core.Separator + "mock" + core.Separator + "1")
15751575
So(err2, ShouldBeNil)
15761576
So(lp.Name(), ShouldResemble, "mock")
15771577
//Subscribe deps to create pools.
@@ -1600,11 +1600,11 @@ func TestDynamicMetricSubscriptionLoad(t *testing.T) {
16001600
<-lpe.load // wait for load event
16011601
<-lpe.sub // wait for subscription event
16021602

1603-
pool1, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector:mock:1")
1603+
pool1, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector" + core.Separator + "mock" + core.Separator + "1")
16041604
So(errp, ShouldBeNil)
16051605
So(pool1.SubscriptionCount(), ShouldEqual, 1)
16061606

1607-
pool2, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector:anothermock:1")
1607+
pool2, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector" + core.Separator + "anothermock" + core.Separator + "1")
16081608
So(errp, ShouldBeNil)
16091609
So(pool2.SubscriptionCount(), ShouldEqual, 1)
16101610

@@ -1628,10 +1628,10 @@ func TestDynamicMetricSubscriptionUnload(t *testing.T) {
16281628
_, err = load(c, path.Join(fixtures.SnapPath, "plugin", "snap-plugin-collector-anothermock1"))
16291629
So(err, ShouldBeNil)
16301630
So(len(c.pluginManager.all()), ShouldEqual, 2)
1631-
lpMock, err2 := c.pluginManager.get("collector:mock:1")
1631+
lpMock, err2 := c.pluginManager.get("collector" + core.Separator + "mock" + core.Separator + "1")
16321632
So(err2, ShouldBeNil)
16331633
So(lpMock.Name(), ShouldResemble, "mock")
1634-
lpAMock, err3 := c.pluginManager.get("collector:anothermock:1")
1634+
lpAMock, err3 := c.pluginManager.get("collector" + core.Separator + "anothermock" + core.Separator + "1")
16351635
So(err3, ShouldBeNil)
16361636
So(lpAMock.Name(), ShouldResemble, "anothermock")
16371637

@@ -1666,15 +1666,15 @@ func TestDynamicMetricSubscriptionUnload(t *testing.T) {
16661666
So(errs, ShouldBeNil)
16671667
So(len(mts1), ShouldBeGreaterThan, 1)
16681668
Convey("Unloading mock plugin should remove its subscriptions", func() {
1669-
pool1, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector:mock:1")
1669+
pool1, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector" + core.Separator + "mock" + core.Separator + "1")
16701670
So(errp, ShouldBeNil)
16711671
So(pool1.SubscriptionCount(), ShouldEqual, 1)
16721672
_, err = c.Unload(lpMock)
16731673
So(err, ShouldBeNil)
16741674
<-lpe.unsub
16751675
<-lpe.sub
16761676
So(pool1.SubscriptionCount(), ShouldEqual, 0)
1677-
pool2, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector:anothermock:1")
1677+
pool2, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector" + core.Separator + "anothermock" + core.Separator + "1")
16781678
So(errp, ShouldBeNil)
16791679
So(pool2.SubscriptionCount(), ShouldEqual, 1)
16801680
mts2, errs := c.CollectMetrics("testTaskID", nil)
@@ -1704,7 +1704,7 @@ func TestDynamicMetricSubscriptionLoadLessMetrics(t *testing.T) {
17041704
_, err := load(c, path.Join(fixtures.SnapPath, "plugin", "snap-plugin-collector-mock1"))
17051705
So(err, ShouldBeNil)
17061706
So(len(c.pluginManager.all()), ShouldEqual, 1)
1707-
lp, err2 := c.pluginManager.get("collector:mock:1")
1707+
lp, err2 := c.pluginManager.get("collector" + core.Separator + "mock" + core.Separator + "1")
17081708
So(err2, ShouldBeNil)
17091709
So(lp.Name(), ShouldResemble, "mock")
17101710
//Subscribe deps to create pools.
@@ -1720,7 +1720,7 @@ func TestDynamicMetricSubscriptionLoadLessMetrics(t *testing.T) {
17201720
<-lpe.load // wait for load event
17211721
<-lpe.sub // wait for subscription event
17221722
So(serr, ShouldBeNil)
1723-
lpMock, err2 := c.pluginManager.get("collector:mock:1")
1723+
lpMock, err2 := c.pluginManager.get("collector" + core.Separator + "mock" + core.Separator + "1")
17241724
So(err2, ShouldBeNil)
17251725
So(lpMock.Name(), ShouldResemble, "mock")
17261726
// collect metrics as a sanity check that everything is setup correctly
@@ -1748,11 +1748,11 @@ func TestDynamicMetricSubscriptionLoadLessMetrics(t *testing.T) {
17481748
<-lpe.load // wait for load event
17491749
<-lpe.sub // wait for subscription event
17501750

1751-
pool1, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector:mock:1")
1751+
pool1, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector" + core.Separator + "mock" + core.Separator + "1")
17521752
So(errp, ShouldBeNil)
17531753
So(pool1.SubscriptionCount(), ShouldEqual, 1)
17541754

1755-
pool2, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector:mock:2")
1755+
pool2, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector" + core.Separator + "mock" + core.Separator + "2")
17561756
So(errp, ShouldBeNil)
17571757
So(pool2.SubscriptionCount(), ShouldEqual, 1)
17581758

@@ -1779,11 +1779,11 @@ func TestDynamicMetricSubscriptionLoadLessMetrics(t *testing.T) {
17791779
So(err, ShouldBeNil)
17801780
<-lpe.unsub
17811781

1782-
pool1, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector:mock:1")
1782+
pool1, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector" + core.Separator + "mock" + core.Separator + "1")
17831783
So(errp, ShouldBeNil)
17841784
So(pool1.SubscriptionCount(), ShouldEqual, 0)
17851785

1786-
pool2, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector:mock:2")
1786+
pool2, errp := c.pluginRunner.AvailablePlugins().getOrCreatePool("collector" + core.Separator + "mock" + core.Separator + "2")
17871787
So(errp, ShouldBeNil)
17881788
So(pool2.SubscriptionCount(), ShouldEqual, 1)
17891789

‎control/plugin_manager.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ func (l *loadedPlugins) get(key string) (*loadedPlugin, error) {
106106

107107
lp, ok := l.table[key]
108108
if !ok {
109-
tnv := strings.Split(key, ":")
109+
tnv := strings.Split(key, core.Separator)
110110
if len(tnv) != 3 {
111111
return nil, ErrBadKey
112112
}
@@ -191,7 +191,7 @@ func (lp *loadedPlugin) PluginPath() string {
191191

192192
// Key returns plugin type, name and version
193193
func (lp *loadedPlugin) Key() string {
194-
return fmt.Sprintf("%s:%s:%d", lp.TypeName(), lp.Name(), lp.Version())
194+
return fmt.Sprintf("%s"+core.Separator+"%s"+core.Separator+"%d", lp.TypeName(), lp.Name(), lp.Version())
195195
}
196196

197197
// Version returns plugin version
@@ -507,7 +507,7 @@ func (p *pluginManager) LoadPlugin(details *pluginDetails, emitter gomit.Emitter
507507

508508
// UnloadPlugin unloads a plugin from the LoadedPlugins table
509509
func (p *pluginManager) UnloadPlugin(pl core.Plugin) (*loadedPlugin, serror.SnapError) {
510-
plugin, err := p.loadedPlugins.get(fmt.Sprintf("%s:%s:%d", pl.TypeName(), pl.Name(), pl.Version()))
510+
plugin, err := p.loadedPlugins.get(fmt.Sprintf("%s"+core.Separator+"%s"+core.Separator+"%d", pl.TypeName(), pl.Name(), pl.Version()))
511511
if err != nil {
512512
se := serror.New(ErrPluginNotFound, map[string]interface{}{
513513
"plugin-name": pl.Name(),

‎control/plugin_manager_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func TestLoadedPlugins(t *testing.T) {
5858
Convey("returns an error when index is out of range", func() {
5959
lp := newLoadedPlugins()
6060

61-
_, err := lp.get("not:found:1")
61+
_, err := lp.get("not" + core.Separator + "found" + core.Separator + "1")
6262
So(err, ShouldResemble, errors.New("plugin not found"))
6363

6464
})
@@ -183,7 +183,7 @@ func TestUnloadPlugin(t *testing.T) {
183183

184184
numPluginsLoaded := len(p.all())
185185
So(numPluginsLoaded, ShouldEqual, 1)
186-
lp, _ := p.get("collector:mock:2")
186+
lp, _ := p.get("collector" + core.Separator + "mock" + core.Separator + "2")
187187
_, err = p.UnloadPlugin(lp)
188188

189189
So(err, ShouldBeNil)
@@ -196,7 +196,7 @@ func TestUnloadPlugin(t *testing.T) {
196196
p := newPluginManager()
197197
p.SetMetricCatalog(newMetricCatalog())
198198
lp, err := loadPlugin(p, fixtures.PluginPath)
199-
glp, err2 := p.get("collector:mock:2")
199+
glp, err2 := p.get("collector" + core.Separator + "mock" + core.Separator + "2")
200200
So(err2, ShouldBeNil)
201201
glp.State = DetectedState
202202
_, err = p.UnloadPlugin(lp)
@@ -210,7 +210,7 @@ func TestUnloadPlugin(t *testing.T) {
210210
p.SetMetricCatalog(newMetricCatalog())
211211
_, err := loadPlugin(p, fixtures.PluginPath)
212212

213-
lp, err2 := p.get("collector:mock:2")
213+
lp, err2 := p.get("collector" + core.Separator + "mock" + core.Separator + "2")
214214
So(err2, ShouldBeNil)
215215
_, err = p.UnloadPlugin(lp)
216216

0 commit comments

Comments
 (0)