Use a custom env var name for otel resource attributes

Thanks, Docker Compose! See docker/cli#4958 (comment)
electric-sql · Jun 18, 2024 · 7fc4792 · 7fc4792
1 parent c91642c
commit 7fc4792
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -88,7 +88,7 @@ jobs:
           ELECTRIC_IMAGE_NAME: electric-sql-ci/electric
           ELECTRIC_CLIENT_IMAGE_NAME: electric-sql-ci/electric-ws-client
           ELECTRIC_IMAGE_TAG: ${{ env.ELECTRIC_VERSION }}
-          OTEL_RESOURCE_ATTRIBUTES: deployment.environment=CI,ci.workflow=${{ github.workflow }},ci.job=${{ github.job }},ci.run=${{ github.run_id }},ci.branch=${{ github.head_ref }}
+          _OTEL_RESOURCE_ATTRIBUTES: deployment.environment=CI,ci.workflow=${{ github.workflow }},ci.job=${{ github.job }},ci.run=${{ github.run_id }},ci.branch=${{ github.head_ref }}
 
       - name: Upload lux logs
         uses: actions/upload-artifact@v3
@@ -179,7 +179,7 @@ jobs:
           ELECTRIC_IMAGE_NAME: electric-sql-ci/electric
           ELECTRIC_CLIENT_IMAGE_NAME: electric-sql-ci/electric-ws-client
           ELECTRIC_IMAGE_TAG: ${{ env.ELECTRIC_VERSION }}
-          OTEL_RESOURCE_ATTRIBUTES: deployment.environment=CI,ci.workflow=${{ github.workflow }},ci.job=${{ github.job }},ci.run=${{ github.run_id }},ci.branch=${{ github.head_ref }}
+          _OTEL_RESOURCE_ATTRIBUTES: deployment.environment=CI,ci.workflow=${{ github.workflow }},ci.job=${{ github.job }},ci.run=${{ github.run_id }},ci.branch=${{ github.head_ref }}
 
       - name: Upload lux logs
         uses: actions/upload-artifact@v3

diff --git a/e2e/tests/_shared.luxinc b/e2e/tests/_shared.luxinc
@@ -7,7 +7,7 @@
 
 [macro setup]
     [newshell otel_collector]
-        !OTEL_RESOURCE_ATTRIBUTES=ci.test_file=$test_file,$${OTEL_RESOURCE_ATTRIBUTES} \
+        !_OTEL_RESOURCE_ATTRIBUTES=ci.test_file=$test_file,$${_OTEL_RESOURCE_ATTRIBUTES} \
          make start_otel_collector
         ??Everything is ready. Begin running and processing data.
 

diff --git a/e2e/tests/compose.yaml b/e2e/tests/compose.yaml
@@ -76,7 +76,7 @@ services:
   otel-collector:
     image: otel/opentelemetry-collector-contrib
     environment:
-      OTEL_RESOURCE_ATTRIBUTES: "${OTEL_RESOURCE_ATTRIBUTES:-}"
+      OTEL_RESOURCE_ATTRIBUTES: "${_OTEL_RESOURCE_ATTRIBUTES:-}"
       HONEYCOMB_API_KEY: "${HONEYCOMB_API_KEY}"
     volumes:
       - ./otel-collector-config.yaml:/etc/otelcol-contrib/config.yaml