Skip to content

Commit 25d8121

Browse files
committed
Working version for Lambda - Prometheus integration - collector changes - pabcol@
1 parent 5593c75 commit 25d8121

File tree

6 files changed

+20
-2
lines changed

6 files changed

+20
-2
lines changed

collector/Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ GOBUILD=GO111MODULE=on CGO_ENABLED=0 installsuffix=cgo go build -trimpath
1010
BUILD_INFO_IMPORT_PATH=main
1111

1212
LDFLAGS=-ldflags "-s -w -X $(BUILD_INFO_IMPORT_PATH).GitHash=$(GIT_SHA) -X $(BUILD_INFO_IMPORT_PATH).Version=$(VERSION) \
13-
-X github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter.collectorDistribution=opentelemetry-collector-lambda"
13+
-X github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter.collectorDistribution=opentelemetry-collector-lambda \
14+
-X github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsprometheusremotewriteexporter.collectorDistribution=opentelemetry-collector-lambda"
1415

1516
clean:
1617
rm -rf build/

collector/config.yaml

+6-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ receivers:
77
exporters:
88
logging:
99
loglevel: debug
10+
awsprometheusremotewrite:
11+
endpoint: "https://aps-workspaces.eu-west-1.amazonaws.com/workspaces/ws-f95ea95b-5b07-4072-ba9e-4dcee1538d73/api/v1/remote_write"
12+
aws_auth:
13+
service: "aps"
14+
region: "eu-west-1"
1015

1116
service:
1217
pipelines:
@@ -15,4 +20,4 @@ service:
1520
exporters: [logging]
1621
metrics:
1722
receivers: [otlp]
18-
exporters: [logging]
23+
exporters: [logging, awsprometheusremotewrite]

collector/go.mod

+3
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ require (
1313
cloud.google.com/go/compute v1.6.0 // indirect
1414
contrib.go.opencensus.io/exporter/prometheus v0.4.1 // indirect
1515
github.com/antonmedv/expr v1.9.0 // indirect
16+
github.com/aws/aws-sdk-go v1.44.11 // indirect
1617
github.com/beorn7/perks v1.0.1 // indirect
1718
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
1819
github.com/cespare/xxhash/v2 v2.1.2 // indirect
@@ -31,6 +32,7 @@ require (
3132
github.com/hashicorp/errwrap v1.1.0 // indirect
3233
github.com/hashicorp/go-multierror v1.1.1 // indirect
3334
github.com/inconshreveable/mousetrap v1.0.0 // indirect
35+
github.com/jmespath/go-jmespath v0.4.0 // indirect
3436
github.com/json-iterator/go v1.1.12 // indirect
3537
github.com/klauspost/compress v1.15.3 // indirect
3638
github.com/knadh/koanf v1.4.1 // indirect
@@ -43,6 +45,7 @@ require (
4345
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4446
github.com/modern-go/reflect2 v1.0.2 // indirect
4547
github.com/mostynb/go-grpc-compression v1.1.16 // indirect
48+
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsprometheusremotewriteexporter v0.51.0 // indirect
4649
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.51.0 // indirect
4750
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.51.0 // indirect
4851
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry v0.51.0 // indirect

collector/go.sum

+6
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,8 @@ github.com/aws/aws-sdk-go v1.40.11/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm
198198
github.com/aws/aws-sdk-go v1.42.31/go.mod h1:OGr6lGMAKGlG9CVrYnWYDKIyb829c6EVBRjxqjmPepc=
199199
github.com/aws/aws-sdk-go v1.43.11/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
200200
github.com/aws/aws-sdk-go v1.43.31/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
201+
github.com/aws/aws-sdk-go v1.44.11 h1:eIC59RrNY7xXYmGy/kKkLj4PGB325Jca22lcxZwbpBE=
202+
github.com/aws/aws-sdk-go v1.44.11/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=
201203
github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
202204
github.com/aws/aws-sdk-go-v2 v1.9.2/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4=
203205
github.com/aws/aws-sdk-go-v2/config v1.8.3/go.mod h1:4AEiLtAb8kLs7vgw2ZV3p2VZ1+hBavOc84hqxVNpCyw=
@@ -952,7 +954,9 @@ github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht
952954
github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
953955
github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
954956
github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik=
957+
github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
955958
github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
959+
github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
956960
github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
957961
github.com/joefitzgerald/rainbow-reporter v0.1.0/go.mod h1:481CNgqmVHQZzdIbN52CupLJyoVwB10FQ/IQlF1pdL8=
958962
github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc=
@@ -1186,6 +1190,8 @@ github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y
11861190
github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc=
11871191
github.com/onsi/gomega v1.15.0/go.mod h1:cIuvLEne0aoVhAgh/O6ac0Op8WWw9H6eYCriF+tEHG0=
11881192
github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
1193+
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsprometheusremotewriteexporter v0.51.0 h1:z/qJ3Lkp/fCjLjXAQLHxQoEepeoEblvEHGQD8Qj9owI=
1194+
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsprometheusremotewriteexporter v0.51.0/go.mod h1:3KW/KsZb2QPxANoDhpfLIRVmxLWp4ITGVPBRvAgQboM=
11891195
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.51.0 h1:dYTzPgICn/zrS4mwvO2H7pWtOxc/mWR0hyMva1KeGB8=
11901196
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.51.0/go.mod h1:8EM88Rm2bwLSWadU8/jqEi/o3LwMcqXMLLwis4MCFMg=
11911197
github.com/open-telemetry/opentelemetry-collector-contrib/internal/coreinternal v0.51.0 h1:fOaDqCw89M+GDEsCWGWuWZB3qPZek81to/fLshHArNg=

collector/lambdacomponents/default.go

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"go.opentelemetry.io/collector/receiver/otlpreceiver"
2424
"go.uber.org/multierr"
2525

26+
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsprometheusremotewriteexporter"
2627
"github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter"
2728
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor"
2829
"github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor"
@@ -46,6 +47,7 @@ func Components() (component.Factories, error) {
4647
otlpexporter.NewFactory(),
4748
otlphttpexporter.NewFactory(),
4849
prometheusremotewriteexporter.NewFactory(),
50+
awsprometheusremotewriteexporter.NewFactory(),
4951
)
5052
if err != nil {
5153
errs = append(errs, err)

collector/lambdacomponents/go.mod

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ go 1.17
44

55
require (
66
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter v0.51.0
7+
github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsprometheusremotewriteexporter v0.51.0
78
github.com/open-telemetry/opentelemetry-collector-contrib/processor/attributesprocessor v0.51.0
89
github.com/open-telemetry/opentelemetry-collector-contrib/processor/filterprocessor v0.51.0
910
github.com/open-telemetry/opentelemetry-collector-contrib/processor/probabilisticsamplerprocessor v0.51.0

0 commit comments

Comments
 (0)