fix readme, gofmt, go version upgrade

DiversionCompany · Mar 19, 2021 · e24eb63 · e24eb63
1 parent 77dc11b
commit e24eb63
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 86 deletions.
diff --git a/collector/Makefile b/collector/Makefile
@@ -9,7 +9,7 @@ GOBUILD=GO111MODULE=on CGO_ENABLED=0 installsuffix=cgo go build -trimpath
 BUILD_INFO_IMPORT_PATH=main
 
 LDFLAGS=-ldflags "-s -w -X $(BUILD_INFO_IMPORT_PATH).GitHash=$(GIT_SHA) -X $(BUILD_INFO_IMPORT_PATH).Version=$(VERSION) \
--X github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter.collectorDistribution=aws-otel-collector-lambda"
+-X github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter.collectorDistribution=opentelemetry-collector-lambda"
 
 clean:
 	rm -rf build/

diff --git a/collector/README.md b/collector/README.md
@@ -1,6 +1,6 @@
 # OpenTelemetry Collector AWS Lambda Extension layer
 
-The OpenTelemetry Collector Lambda Extension provides a mechanism to export telemetry aynchronously from AWS Lambdas. It does this by embedding an [AWS Distro for OpenTelemetry Collector(AWS OTel Collector)](https://github.com/aws-observability/aws-otel-collector) inside an [AWS Extension Layer](https://aws.amazon.com/blogs/compute/introducing-aws-lambda-extensions-in-preview/). This allows lambdas to use the OpenTelemetry Collector Exporter to send traces and metrics to any configured backend.
+The OpenTelemetry Collector Lambda Extension provides a mechanism to export telemetry aynchronously from AWS Lambdas. It does this by embedding a stripped-down version of [OpenTelemetry Collector Contrib](https://github.com/open-telemetry/opentelemetry-collector-contrib) inside an [AWS Extension Layer](https://aws.amazon.com/blogs/compute/introducing-aws-lambda-extensions-in-preview/). This allows lambdas to use the OpenTelemetry Collector Exporter to send traces and metrics to any configured backend.
 
 
 ## Build your OpenTelemetry Collector Lambda layer from scratch
@@ -62,7 +62,7 @@ Once the file has been deployed with a Lambda, configuring the `OPENTELEMETRY_CO
 aws lambda update-function-configuration --function-name Function --environment Variables={OPENTELEMETRY_COLLECTOR_CONFIG_FILE=/var/task/collector.yaml}
 ```
 
-You can configure environment variables via yaml as well:
+You can configure environment variables via cloudformation template as well:
 
 ```yaml
   Function:
@@ -73,7 +73,3 @@ You can configure environment variables via yaml as well:
         Variables:
           OPENTELEMETRY_COLLECTOR_CONFIG_FILE: /var/task/collector.yaml
 ```
-
-## License
-
-This project is licensed under the Apache-2.0 License.
diff --git a/collector/defaultcomponents/default.go b/collector/defaultcomponents/default.go
@@ -1,46 +1,46 @@
 package defaultcomponents
 
- import (
-	 "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter"
-	 "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter"
-	 "go.opentelemetry.io/collector/component"
-	 "go.opentelemetry.io/collector/consumer/consumererror"
-	 "go.opentelemetry.io/collector/exporter/loggingexporter"
-	 "go.opentelemetry.io/collector/exporter/otlpexporter"
-	 "go.opentelemetry.io/collector/exporter/otlphttpexporter"
-	 "go.opentelemetry.io/collector/exporter/prometheusexporter"
-	 "go.opentelemetry.io/collector/receiver/otlpreceiver"
- )
- 
- func Components() (
-	 component.Factories,
-	 error,
- ) {
-	 var errs []error
- 
-	 receivers, err := component.MakeReceiverFactoryMap(
-		 otlpreceiver.NewFactory(),
-	 )
-	 if err != nil {
-		 errs = append(errs, err)
-	 }
- 
-	 exporters, err := component.MakeExporterFactoryMap(
-		 awsxrayexporter.NewFactory(),
-		 awsemfexporter.NewFactory(),
-		 prometheusexporter.NewFactory(),
-		 loggingexporter.NewFactory(),
-		 otlpexporter.NewFactory(),
-		 otlphttpexporter.NewFactory(),
-	 )
-	 if err != nil {
-		 errs = append(errs, err)
-	 }
- 
-	 factories := component.Factories{
-		 Receivers:  receivers,
-		 Exporters:  exporters,
-	 }
- 
-	 return factories, consumererror.CombineErrors(errs)
- }
+import (
+	"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter"
+	"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter"
+	"go.opentelemetry.io/collector/component"
+	"go.opentelemetry.io/collector/consumer/consumererror"
+	"go.opentelemetry.io/collector/exporter/loggingexporter"
+	"go.opentelemetry.io/collector/exporter/otlpexporter"
+	"go.opentelemetry.io/collector/exporter/otlphttpexporter"
+	"go.opentelemetry.io/collector/exporter/prometheusexporter"
+	"go.opentelemetry.io/collector/receiver/otlpreceiver"
+)
+
+func Components() (
+	component.Factories,
+	error,
+) {
+	var errs []error
+
+	receivers, err := component.MakeReceiverFactoryMap(
+		otlpreceiver.NewFactory(),
+	)
+	if err != nil {
+		errs = append(errs, err)
+	}
+
+	exporters, err := component.MakeExporterFactoryMap(
+		awsxrayexporter.NewFactory(),
+		awsemfexporter.NewFactory(),
+		prometheusexporter.NewFactory(),
+		loggingexporter.NewFactory(),
+		otlpexporter.NewFactory(),
+		otlphttpexporter.NewFactory(),
+	)
+	if err != nil {
+		errs = append(errs, err)
+	}
+
+	factories := component.Factories{
+		Receivers: receivers,
+		Exporters: exporters,
+	}
+
+	return factories, consumererror.CombineErrors(errs)
+}
diff --git a/collector/go.mod b/collector/go.mod
@@ -1,6 +1,6 @@
 module github.com/open-telemetry/opentelemetry-lambda/collector
 
-go 1.14
+go 1.16
 
 require (
 	github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter v0.22.0