Merge pull request #39 from alphagov/dependabot/docker/amazon/aws-ote…

…l-collector-v0.42.0

Bump amazon/aws-otel-collector from v0.41.0 to v0.42.0

Dockerfile

@@ -1,4 +1,4 @@
-FROM amazon/aws-otel-collector:v0.41.0@sha256:7edf4972419b52c3259d1118a9506d883e15dbb7bfb4cc7d90dfc16b68594233
+FROM amazon/aws-otel-collector:v0.42.0@sha256:cd481b72f3b98710ba69c27dca5a329a9d57808d9c74b288cb26c177938cbcf1
 
 ENV OTEL_LOG_LEVEL=INFO
 

config.yml

@@ -140,8 +140,8 @@ exporters:
         enabled: true
     auth:
       authenticator: sigv4auth
-  logging:
-    verbosity: normal # 'detailed' to debug
+  debug:
+    verbosity: normal # 'detailed' to verbosely log pipeline data
   awsemf:
     namespace: ECS/ContainerInsights
     log_group_name:  '/aws/ecs/containerinsights/{ClusterName}/performance'
@@ -188,7 +188,7 @@ service:
         - resource/deleteUnrequired
         - resource/rename
       exporters:
-        - logging
+        - debug
         - prometheusremotewrite
     metrics:
       receivers: 

tests/test-config.yml

@@ -52,7 +52,7 @@ exporters:
     add_metric_suffixes: false
     resource_to_telemetry_conversion:
         enabled: true
-  logging:
+  debug:
     verbosity: normal
 
 service:
@@ -71,5 +71,5 @@ service:
         - resource/deleteUnrequired
         - resource/rename
       exporters:
-        - logging
+        - debug
         - prometheusremotewrite

tests/test.sh

@@ -13,7 +13,21 @@ echo "Building images"
 docker compose build
 
 echo "Bringing up test environment"
-docker compose up -d
+if ! docker compose up -d --wait; then
+  echo "Error starting up test environment."
+  echo
+
+  for APP in adot-sidecar test-app prometheus; do
+    CONTAINER_STATUS=$(docker compose ps "$APP" --format json | jq -r '.State')
+    if [ "${CONTAINER_STATUS}" != "running" ]; then
+      echo "$APP did not start up correctly. Logs for the container follow"
+      echo "==============================================================================================="
+      docker compose logs "$APP" --no-color --no-log-prefix
+      echo "==============================================================================================="
+    fi
+  done
+  exit 1
+fi
 
 # Wait to ensure everything is alive
 echo "Waiting a few seconds to make sure everything is alive"