Updated

solarwinds · Jul 22, 2024 · 5032a83 · 5032a83
1 parent c78f6be
commit 5032a83
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 369 deletions.
diff --git a/collector/extension/solarwindsapmsettingsextension/extension.go b/collector/extension/solarwindsapmsettingsextension/extension.go
@@ -21,7 +21,7 @@ import (
 
 const (
 	JSONOutputFile      = "/tmp/solarwinds-apm-settings.json"
-	GrpcContextDeadline = time.Duration(10) * time.Second
+	GrpcContextDeadline = time.Duration(5) * time.Second
 )
 
 type solarwindsapmSettingsExtension struct {
@@ -176,12 +176,14 @@ func (extension *solarwindsapmSettingsExtension) Start(ctx context.Context, _ co
 	ctx, extension.cancel = context.WithCancel(ctx)
 	systemCertPool, err := x509.SystemCertPool()
 	if err != nil {
+		extension.logger.Error("Getting system cert pool failed: ", zap.Error(err))
 		return err
 	}
 	subjects := systemCertPool.Subjects()
 	extension.logger.Info("Loading system certificates", zap.Int("numberOfCertificates", len(subjects)))
 	extension.conn, err = grpc.NewClient(extension.config.Endpoint, grpc.WithTransportCredentials(credentials.NewTLS(&tls.Config{RootCAs: systemCertPool})))
 	if err != nil {
+		extension.logger.Error("grpc.NewClient creation failed: ", zap.Error(err))
 		return err
 	}
 	extension.logger.Info("Created a grpc.NewClient", zap.String("endpoint", extension.config.Endpoint))

diff --git a/collector/lambdacomponents/go.mod b/collector/lambdacomponents/go.mod
@@ -128,6 +128,7 @@ require (
 	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/sampling v0.102.0 // indirect
 	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheus v0.102.0 // indirect
 	github.com/open-telemetry/opentelemetry-collector-contrib/pkg/translator/prometheusremotewrite v0.102.0 // indirect
+	github.com/open-telemetry/opentelemetry-lambda/collector v0.0.0-00010101000000-000000000000 // indirect
 	github.com/open-telemetry/opentelemetry-lambda/collector/lambdalifecycle v0.0.0-00010101000000-000000000000 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.1.0 // indirect

diff --git a/collector/receiver/telemetryapireceiver/go.mod b/collector/receiver/telemetryapireceiver/go.mod
@@ -4,8 +4,11 @@ go 1.21.0
 
 toolchain go1.21.4
 
+replace github.com/open-telemetry/opentelemetry-lambda/collector => ../../
+
 require (
 	github.com/golang-collections/go-datastructures v0.0.0-20150211160725-59788d5eb259
+	github.com/open-telemetry/opentelemetry-lambda/collector v0.0.0-00010101000000-000000000000
 	github.com/stretchr/testify v1.9.0
 	go.opentelemetry.io/collector/component v0.102.1
 	go.opentelemetry.io/collector/confmap v0.102.1

diff --git a/collector/receiver/telemetryapireceiver/internal/telemetryapi/client.go b/collector/receiver/telemetryapireceiver/internal/telemetryapi/client.go
diff --git a/collector/receiver/telemetryapireceiver/internal/telemetryapi/listener.go b/collector/receiver/telemetryapireceiver/internal/telemetryapi/listener.go