From 17b196536510c3263699fced0fda9ce4092166d8 Mon Sep 17 00:00:00 2001 From: Anthony Mirabella Date: Tue, 8 Oct 2024 14:12:34 -0400 Subject: [PATCH 1/2] Fix environment variable substitution syntax in configuration examples (#2866) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * make link to logging exporter permalink to last used release tag (#2862) Signed-off-by: Anthony J Mirabella * ECS configs changes: from BASH-style environment variables to ${} * ensure all example configs use ${env:...} replacement syntax Signed-off-by: Anthony J Mirabella --------- Signed-off-by: Anthony J Mirabella Co-authored-by: 이희성 --- README.md | 2 +- config/ecs/ecs-amp-prometheus.yaml | 6 +++--- config/ecs/ecs-amp-xray-prometheus.yaml | 6 +++--- config/ecs/ecs-amp-xray.yaml | 4 ++-- config/ecs/ecs-amp.yaml | 4 ++-- examples/ecs/aws-prometheus/ecs-ec2-adot-config.yaml | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 0c52c7e4f..adc9c11f6 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ This table represents the supported components of the ADOT Collector. The highli | [prometheusreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/prometheusreceiver#prometheus-receiver) | [attributesprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/attributesprocessor#attributes-processor) | [`awsxrayexporter`](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/awsxrayexporter) | [healthcheckextension](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/healthcheckextension#health-check) | | [otlpreceiver](https://github.com/open-telemetry/opentelemetry-collector/tree/main/receiver/otlpreceiver#otlp-receiver) | [resourceprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/resourceprocessor#resource-processor) | [`awsemfexporter`](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/awsemfexporter) | [pprofextension](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/pprofextension#performance-profiler) | | [`awsecscontainermetricsreceiver`](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/awsecscontainermetricsreceiver) | [batchprocessor](https://github.com/open-telemetry/opentelemetry-collector/tree/main/processor/batchprocessor#batch-processor) | [prometheusremotewriteexporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/prometheusremotewriteexporter#prometheus-remote-write-exporter) | [zpagesextension](https://github.com/open-telemetry/opentelemetry-collector/tree/main/extension/zpagesextension#zpages) | -| [`awsxrayreceiver`](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/awsxrayreceiver) | [memorylimiterprocessor](https://github.com/open-telemetry/opentelemetry-collector/tree/main/processor/memorylimiterprocessor#memory-limiter-processor) | [loggingexporter](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter/loggingexporter#logging-exporter) | [`ecsobserver`](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/observer/ecsobserver) | +| [`awsxrayreceiver`](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/awsxrayreceiver) | [memorylimiterprocessor](https://github.com/open-telemetry/opentelemetry-collector/tree/main/processor/memorylimiterprocessor#memory-limiter-processor) | [loggingexporter](https://github.com/open-telemetry/opentelemetry-collector/tree/v0.109.0/exporter/loggingexporter#logging-exporter) | [`ecsobserver`](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/observer/ecsobserver) | | [statsdreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/statsdreceiver#statsd-receiver) | [probabilisticsamplerprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/probabilisticsamplerprocessor#probabilistic-sampling-processor) | [otlpexporter](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter/otlpexporter) | [`awsproxy`](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/awsproxy) | | [zipkinreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/zipkinreceiver#zipkin-receiver) | [metricstransformprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/metricstransformprocessor#metrics-transform-processor) | [fileexporter](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/exporter/fileexporter#file-exporter) | [ballastextension](https://github.com/open-telemetry/opentelemetry-collector/tree/v0.108.1/extension/ballastextension#memory-ballast) | | [jaegerreceiver](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/receiver/jaegerreceiver#jaeger-receiver) | [spanprocessor](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/processor/spanprocessor#span-processor) | [otlphttpexporter](https://github.com/open-telemetry/opentelemetry-collector/tree/main/exporter/otlphttpexporter#otlphttp-exporter) | [`sigv4authextension`](https://github.com/open-telemetry/opentelemetry-collector-contrib/tree/main/extension/sigv4authextension) | diff --git a/config/ecs/ecs-amp-prometheus.yaml b/config/ecs/ecs-amp-prometheus.yaml index 87667f057..ed794db9e 100644 --- a/config/ecs/ecs-amp-prometheus.yaml +++ b/config/ecs/ecs-amp-prometheus.yaml @@ -1,7 +1,7 @@ extensions: health_check: sigv4auth: - region: $AWS_REGION + region: ${env:AWS_REGION} receivers: awsecscontainermetrics: @@ -13,7 +13,7 @@ receivers: scrape_configs: - job_name: "otel-collector" static_configs: - - targets: [$AWS_PROMETHEUS_SCRAPING_ENDPOINT] + - targets: [${env:AWS_PROMETHEUS_SCRAPING_ENDPOINT}] processors: batch/metrics: @@ -41,7 +41,7 @@ processors: exporters: prometheusremotewrite: - endpoint: $AWS_PROMETHEUS_ENDPOINT + endpoint: ${env:AWS_PROMETHEUS_ENDPOINT} auth: authenticator: sigv4auth resource_to_telemetry_conversion: diff --git a/config/ecs/ecs-amp-xray-prometheus.yaml b/config/ecs/ecs-amp-xray-prometheus.yaml index 3b38b2c9c..5534b963a 100644 --- a/config/ecs/ecs-amp-xray-prometheus.yaml +++ b/config/ecs/ecs-amp-xray-prometheus.yaml @@ -1,7 +1,7 @@ extensions: health_check: sigv4auth: - region: $AWS_REGION + region: ${env:AWS_REGION} receivers: otlp: @@ -19,7 +19,7 @@ receivers: scrape_configs: - job_name: "otel-collector" static_configs: - - targets: [$AWS_PROMETHEUS_SCRAPING_ENDPOINT] + - targets: [${env:AWS_PROMETHEUS_SCRAPING_ENDPOINT}] processors: batch/traces: @@ -51,7 +51,7 @@ processors: exporters: awsxray: prometheusremotewrite: - endpoint: $AWS_PROMETHEUS_ENDPOINT + endpoint: ${env:AWS_PROMETHEUS_ENDPOINT} auth: authenticator: sigv4auth resource_to_telemetry_conversion: diff --git a/config/ecs/ecs-amp-xray.yaml b/config/ecs/ecs-amp-xray.yaml index d0f2f15ca..e583990d6 100644 --- a/config/ecs/ecs-amp-xray.yaml +++ b/config/ecs/ecs-amp-xray.yaml @@ -1,7 +1,7 @@ extensions: health_check: sigv4auth: - region: $AWS_REGION + region: ${env:AWS_REGION} receivers: otlp: @@ -42,7 +42,7 @@ processors: exporters: awsxray: prometheusremotewrite: - endpoint: $AWS_PROMETHEUS_ENDPOINT + endpoint: ${env:AWS_PROMETHEUS_ENDPOINT} auth: authenticator: sigv4auth resource_to_telemetry_conversion: diff --git a/config/ecs/ecs-amp.yaml b/config/ecs/ecs-amp.yaml index 743e8a9cc..4d5f88c49 100644 --- a/config/ecs/ecs-amp.yaml +++ b/config/ecs/ecs-amp.yaml @@ -1,7 +1,7 @@ extensions: health_check: sigv4auth: - region: $AWS_REGION + region: ${env:AWS_REGION} receivers: otlp: @@ -38,7 +38,7 @@ processors: exporters: prometheusremotewrite: - endpoint: $AWS_PROMETHEUS_ENDPOINT + endpoint: ${env:AWS_PROMETHEUS_ENDPOINT} auth: authenticator: sigv4auth resource_to_telemetry_conversion: diff --git a/examples/ecs/aws-prometheus/ecs-ec2-adot-config.yaml b/examples/ecs/aws-prometheus/ecs-ec2-adot-config.yaml index 86a33ade8..09e60e685 100644 --- a/examples/ecs/aws-prometheus/ecs-ec2-adot-config.yaml +++ b/examples/ecs/aws-prometheus/ecs-ec2-adot-config.yaml @@ -7,7 +7,7 @@ receivers: scrape_configs: - job_name: "test-prometheus-sample-app" static_configs: - - targets: [ $PROMETHEUS_SAMPLE_APP ] + - targets: [ ${env:PROMETHEUS_SAMPLE_APP} ] awsecscontainermetrics: collection_interval: 20s From 2ffec33bac4d7bb849515d3865983c94b5cd39f2 Mon Sep 17 00:00:00 2001 From: Roy Chiang Date: Tue, 15 Oct 2024 12:35:37 -0700 Subject: [PATCH 2/2] bump version to v0.41.1 --- VERSION | 2 +- docs/releases/v0.41.1.md | 7 +++++++ tools/packaging/windows/aws-otel-collector.wxs | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 docs/releases/v0.41.1.md diff --git a/VERSION b/VERSION index 9dedf1e9b..d0cca40aa 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v0.41.0 +v0.41.1 diff --git a/docs/releases/v0.41.1.md b/docs/releases/v0.41.1.md new file mode 100644 index 000000000..ff3599482 --- /dev/null +++ b/docs/releases/v0.41.1.md @@ -0,0 +1,7 @@ +# Changelog + +## [v0.41.1](https://github.com/aws-observability/aws-otel-collector/tree/v0.41.1) (2024-10-15) + +[Full Changelog](https://github.com/aws-observability/aws-otel-collector/compare/v0.41.0...v0.41.1) + +* Fix environment variable substitution syntax in configuration examples (#2866) diff --git a/tools/packaging/windows/aws-otel-collector.wxs b/tools/packaging/windows/aws-otel-collector.wxs index 27f1e90eb..47ed0ce49 100644 --- a/tools/packaging/windows/aws-otel-collector.wxs +++ b/tools/packaging/windows/aws-otel-collector.wxs @@ -3,7 +3,7 @@