Merge branch 'main' into frauddetection.span-links

CHANGELOG.md

@@ -12,6 +12,7 @@ the release.
 
 ## 1.9.0
 
+* [chore] docker compose: add container name as tag attribute to container logs
 * [featureflag] deprecate in favor of flagd
   ([#1338](https://github.com/open-telemetry/opentelemetry-demo/pull/1388))
 * [checkoutservice] add producer interceptor for tracing

docker-compose.minimal.yml

@@ -7,6 +7,7 @@ x-default-logging: &logging
   options:
     max-size: "5m"
     max-file: "2"
+    tag: "{{.Name}}"
 
 networks:
   default:

docker-compose.yml

@@ -7,6 +7,7 @@ x-default-logging: &logging
   options:
     max-size: "5m"
     max-file: "2"
+    tag: "{{.Name}}"
 
 networks:
   default:
@@ -592,7 +593,7 @@ services:
       - OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE
       - OTEL_RESOURCE_ATTRIBUTES
       - OTEL_SERVICE_NAME=kafka
-      - KAFKA_HEAP_OPTS=-Xmx200m -Xms200m
+      - KAFKA_HEAP_OPTS=-Xmx250m -Xms250m
     healthcheck:
       test: nc -z kafka 9092
       start_period: 10s

src/kafka/Dockerfile

@@ -2,10 +2,10 @@
 # SPDX-License-Identifier: Apache-2.0
 
 
-FROM confluentinc/cp-kafka:7.5.2
+FROM apache/kafka:3.7.0
 
 USER root
-ARG version=2.0.0
+ARG version=2.2.0
 ADD https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/download/v$version/opentelemetry-javaagent.jar /tmp/opentelemetry-javaagent.jar
 RUN chmod go+r /tmp/opentelemetry-javaagent.jar