From aed0c210e928acb1c25591a8daf0cb83b449bd1f Mon Sep 17 00:00:00 2001 From: Bryan Aguilar Date: Wed, 10 May 2023 15:15:28 -0700 Subject: [PATCH] Disable normalization featuregate --- README.md | 4 ++++ adot/collector/lambdacomponents/default.go | 11 +++++++++++ 2 files changed, 15 insertions(+) diff --git a/README.md b/README.md index 581936c52..c725a69d1 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,10 @@ As a downstream Repo of [opentelemetry-lambda](https://github.com/open-telemetry - Java-Agent layer [**aws-otel-java-agent--ver-1-24-0**](https://aws-otel.github.io/docs/getting-started/lambda/lambda-java-auto-instr) contains AWS Distro for OpenTelemetry Java Instrumentation `v1.24.0` and ADOT Collector for Lambda `v0.28.0` - Collector layer **aws-otel-collector--ver-0-74-0** contains ADOT Collector for Lambda `v0.28.0`. Compatible with [.NET](https://aws-otel.github.io/docs/getting-started/lambda/lambda-dotnet) and [Go](https://aws-otel.github.io/docs/getting-started/lambda/lambda-go) runtimes. +## Notice: ADOT Collector v0.31.0 Breaking Change +Users of the `prometheusremotewrite` exporter please reference GitHub Issue [Warning: ADOT Collector v0.31.0 breaking change](https://github.com/aws-observability/aws-otel-collector/issues/2043) +for information on an upcoming breaking change. + ## Sample Apps We provide [SAM and Terraform sample applications](sample-apps/) for AWS managed OpenTelemetry Lambda layers. You can play with these samples by the following: 1. Install AWS Cli, AWS SAM, Terraform, and configure AWS credentials correctly. diff --git a/adot/collector/lambdacomponents/default.go b/adot/collector/lambdacomponents/default.go index 2a2c000a0..4bf28bea0 100644 --- a/adot/collector/lambdacomponents/default.go +++ b/adot/collector/lambdacomponents/default.go @@ -18,6 +18,8 @@ package lambdacomponents //github.com/aws-observability/aws-otel-lambda/adot/collector/lambdacomponents import ( + "log" + "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsemfexporter" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/awsxrayexporter" "github.com/open-telemetry/opentelemetry-collector-contrib/exporter/prometheusremotewriteexporter" @@ -27,6 +29,7 @@ import ( "go.opentelemetry.io/collector/exporter/otlpexporter" "go.opentelemetry.io/collector/exporter/otlphttpexporter" "go.opentelemetry.io/collector/extension" + "go.opentelemetry.io/collector/featuregate" "go.opentelemetry.io/collector/otelcol" "go.opentelemetry.io/collector/receiver" "go.opentelemetry.io/collector/receiver/otlpreceiver" @@ -73,5 +76,13 @@ func Components() ( Exporters: exporters, } + // TODO: remove after ADOT Collector v0.30.0 is released + if err := featuregate.GlobalRegistry().Set("pkg.translator.prometheus.NormalizeName", false); err != nil { + return otelcol.Factories{}, err + } + log.Printf("attn: users of the prometheusremotewrite exporter please refer to " + + "https://github.com/aws-observability/aws-otel-collector/issues/2043 in regards to an ADOT Collector v0.31.0 " + + "breaking change") + return factories, errs }