From 5f5fd400749c57552855aade0d24120ab248dc6a Mon Sep 17 00:00:00 2001 From: Mikko Viitanen Date: Wed, 31 Jan 2024 13:14:36 +0200 Subject: [PATCH] Fix CHANGELOG. Update docker-compose.minimal.yml --- CHANGELOG.md | 15 +++++++++------ docker-compose.minimal.yml | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c04e70476..e6edda65ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,9 @@ # Changelog Please update changelog as part of any significant pull request. Place short -description of your change into "Unreleased" section. As part of release process -content of "Unreleased" section content will generate release notes for the -release. +description of your change into "Unreleased" section. As part of release +process content of "Unreleased" section content will generate release notes for +the release. ## Unreleased @@ -23,13 +23,16 @@ release. ([#1346](https://github.com/open-telemetry/opentelemetry-demo/pull/1346)) * [productcatalogservice] update wiki link ([#1346](https://github.com/open-telemetry/opentelemetry-demo/pull/1346)) -* [adservice] added group and anonymous read permission to opentelemetry-javaagent.jar +* [adservice] added group and anonymous read permission to + opentelemetry-javaagent.jar ([#1348](https://github.com/open-telemetry/opentelemetry-demo/pull/1348)) -* [frauddetectionservice] added group and anonymous read permission to opentelemetry-javaagent.jar +* [frauddetectionservice] added group and anonymous read permission to + opentelemetry-javaagent.jar ([#1348](https://github.com/open-telemetry/opentelemetry-demo/pull/1348)) * [adservice] Major version update for Java instrumentation, version 2.0.0 ([#1352](https://github.com/open-telemetry/opentelemetry-demo/pull/1352)) -* [frauddetectionservice] Major version update for Java instrumentation, version 2.0.0 +* [frauddetectionservice] Major version update for Java instrumentation, + version 2.0.0 ([#1352](https://github.com/open-telemetry/opentelemetry-demo/pull/1352)) * [kafka] Major version update for Java instrumentation, version 2.0.0 ([#1352](https://github.com/open-telemetry/opentelemetry-demo/pull/1352)) diff --git a/docker-compose.minimal.yml b/docker-compose.minimal.yml index a79f6a1119..850a1876ba 100644 --- a/docker-compose.minimal.yml +++ b/docker-compose.minimal.yml @@ -36,7 +36,7 @@ services: - "${AD_SERVICE_PORT}" environment: - AD_SERVICE_PORT - - OTEL_EXPORTER_OTLP_ENDPOINT + - OTEL_EXPORTER_OTLP_ENDPOINT=http://${OTEL_COLLECTOR_HOST}:${OTEL_COLLECTOR_PORT_HTTP} - OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE - OTEL_RESOURCE_ATTRIBUTES - OTEL_LOGS_EXPORTER=otlp