Skip to content

Commit

Permalink
Enabled extension test and delete SignatureKey from arguments
Browse files Browse the repository at this point in the history
  • Loading branch information
jerrytfleung committed Jan 17, 2024
1 parent d68daa1 commit ddd3881
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 14 deletions.
17 changes: 11 additions & 6 deletions extension/solarwindsapmsettingsextension/extension.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"github.com/gogo/protobuf/proto"
"github.com/solarwindscloud/apm-proto/go/collectorpb"
"go.opentelemetry.io/collector/component"
"go.opentelemetry.io/collector/extension"
"go.uber.org/zap"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
Expand All @@ -32,6 +33,14 @@ type solarwindsapmSettingsExtension struct {
client collectorpb.TraceCollectorClient
}

func newSolarwindsApmSettingsExtension(extensionCfg *Config, logger *zap.Logger) (extension.Extension, error) {
settingsExtension := &solarwindsapmSettingsExtension{
config: extensionCfg,
logger: logger,
}
return settingsExtension, nil
}

func Refresh(extension *solarwindsapmSettingsExtension) {
extension.logger.Info("Time to refresh from " + extension.config.Endpoint)
if hostname, err := os.Hostname(); err != nil {
Expand Down Expand Up @@ -135,12 +144,8 @@ func Refresh(extension *solarwindsapmSettingsExtension) {
if value, ok := item.Arguments["ProfilingInterval"]; ok {
arguments["ProfilingInterval"] = int32(binary.LittleEndian.Uint32(value))
}
/**
* We don't want to expose SignatureKey now
*/
//if value, ok := item.Arguments["SignatureKey"]; ok {
// arguments["SignatureKey"] = string(value)
//}
// Remove SignatureKey from collector response
delete(arguments, "SignatureKey")
}
settings = append(settings, setting)
}
Expand Down
28 changes: 28 additions & 0 deletions extension/solarwindsapmsettingsextension/extension_test.go
Original file line number Diff line number Diff line change
@@ -1 +1,29 @@
package solarwindsapmsettingsextension

import (
"context"
"github.com/stretchr/testify/require"
"go.opentelemetry.io/collector/extension"
"go.uber.org/zap"
"testing"
)

func TestCreateExtension(t *testing.T) {
conf := &Config{
Endpoint: "apm.collector.cloud.solarwinds.com:443",
Key: "vlEW1JtimSH2LlBsNrPdeEjBxNl5z8Bp7gX55bNTk3_GIxHWedgj42GDFBWpRe2ne7TffHk:jerry_test",
Interval: "1s",
}
ex := createAnExtension(conf, t)
ex.Shutdown(context.TODO())
}

// create extension
func createAnExtension(c *Config, t *testing.T) extension.Extension {
logger, err := zap.NewProduction()
ex, err := newSolarwindsApmSettingsExtension(c, logger)
require.NoError(t, err)
err = ex.Start(context.TODO(), nil)
require.NoError(t, err)
return ex
}
9 changes: 1 addition & 8 deletions extension/solarwindsapmsettingsextension/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,7 @@ func createDefaultConfig() component.Config {
}

func createExtension(_ context.Context, settings extension.CreateSettings, cfg component.Config) (extension.Extension, error) {
logger := settings.Logger
extensionCfg := cfg.(*Config)

settingsExtension := &solarwindsapmSettingsExtension{
logger: logger,
config: extensionCfg,
}
return settingsExtension, nil
return newSolarwindsApmSettingsExtension(cfg.(*Config), settings.Logger)
}

func NewFactory() extension.Factory {
Expand Down

0 comments on commit ddd3881

Please sign in to comment.