chore(otel-node): sort these config blocks; fix a doc typo (#569)

elastic · Jan 28, 2025 · db5b042 · db5b042
1 parent d81e59c
commit db5b042
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 61 deletions.
diff --git a/.github/workflows/test-edot.yml b/.github/workflows/test-edot.yml
@@ -44,6 +44,14 @@ jobs:
     runs-on: ubuntu-24.04
 
     services:
+      cassandra:
+        image: cassandra:3
+        env:
+          MAX_HEAP_SIZE: "1G"
+          HEAP_NEWSIZE: 400m
+        ports:
+          - "9042:9042"
+
       elasticsearch:
         image: docker.elastic.co/elasticsearch/elasticsearch:8.17.1
         env:
@@ -55,16 +63,19 @@ jobs:
         ports:
           - 9200:9200
 
-      redis:
-        image: redis:7
-        ports:
-          - 6379:6379
-
       mongodb:
         image: mongo:7
         ports:
           - 27017:27017
 
+      mssql:
+        image: mcr.microsoft.com/mssql/server:2022-latest
+        env:
+          ACCEPT_EULA: 'Y'
+          MSSQL_SA_PASSWORD: 'Very(!)Secure'
+        ports:
+          - "1433:1433"
+
       mysql:
         image: mysql:5.7
         ports:
@@ -87,21 +98,11 @@ jobs:
           POSTGRES_HOST_AUTH_METHOD: 'trust'
           POSTGRES_USER: 'postgres'
 
-      mssql:
-        image: mcr.microsoft.com/mssql/server:2022-latest
-        env:
-          ACCEPT_EULA: 'Y'
-          MSSQL_SA_PASSWORD: 'Very(!)Secure'
+      redis:
+        image: redis:7
         ports:
-          - "1433:1433"
+          - 6379:6379
 
-      cassandra:
-        image: cassandra:3
-        env:
-          MAX_HEAP_SIZE: "1G"
-          HEAP_NEWSIZE: 400m
-        ports:
-          - "9042:9042"
 
     steps:
     - uses: actions/checkout@v4

diff --git a/packages/opentelemetry-node/docs/supported-technologies.md b/packages/opentelemetry-node/docs/supported-technologies.md
@@ -69,7 +69,7 @@ requires:
 
 ## Native Instrumentations
 
-"Native" instrumentation refers to OpenTelemetry instrumentation that is built into a library. When a library includes native OTel instrumentation, it will provide telemetry data to providers registered by a running OTel SDK. Native instrumentions of note are listed in the table below. To benefit from these instrumentations you only need to (a) use the library and (b) start the EDOT Node.js SDK:
+"Native" instrumentation refers to OpenTelemetry instrumentation that is built into a library. When a library includes native OTel instrumentation, it will provide telemetry data to providers registered by a running OTel SDK. Native instrumentations of note are listed in the table below. To benefit from these instrumentations you only need to (a) use the library and (b) start the EDOT Node.js SDK:
 
 ```bash
 node --import @elastic/opentelemetry-node my-app.js

diff --git a/packages/opentelemetry-node/test/docker-compose.yaml b/packages/opentelemetry-node/test/docker-compose.yaml
@@ -11,6 +11,19 @@
 name: edot-nodejs-test-services
 
 services:
+  cassandra:
+    image: cassandra:3
+    environment:
+      MAX_HEAP_SIZE: "1G"
+      HEAP_NEWSIZE: 400m
+    ports:
+      - "9042:9042"
+    healthcheck:
+      test: ["CMD-SHELL", "[ $$(nodetool statusgossip) = running ]"]
+      interval: 1s
+      timeout: 10s
+      retries: 30
+
   elasticsearch:
     image: docker.elastic.co/elasticsearch/elasticsearch:8.17.1
     environment:
@@ -27,16 +40,6 @@ services:
       timeout: 10s
       retries: 30
 
-  redis:
-    image: redis:7
-    ports:
-      - "6379:6379"
-    healthcheck:
-      test: ["CMD", "redis-cli", "ping"]
-      interval: 1s
-      timeout: 10s
-      retries: 30
-
   mongodb:
     image: mongo:7
     ports:
@@ -47,32 +50,6 @@ services:
       timeout: 10s
       retries: 30
 
-  ollama:
-    # A light fork of Ollama to float some in-progress contributions related
-    # to more closely matching OpenAI behavior.
-    image: ghcr.io/elastic/ollama/ollama:testing
-    ports:
-      - "11434:11434"
-    healthcheck:
-      test: ["CMD", "ollama", "ls"]
-      interval: 1s
-      timeout: 10s
-      retries: 30
-
-  postgres:
-    # https://github.com/docker-library/docs/blob/master/postgres/README.md#how-to-extend-this-image
-    image: postgres:16
-    ports:
-      - "5432:5432"
-    environment:
-      POSTGRES_HOST_AUTH_METHOD: 'trust'
-      POSTGRES_USER: 'postgres'
-    healthcheck:
-      test: ["CMD", "pg_isready"]
-      interval: 1s
-      timeout: 10s
-      retries: 30
-
   mssql:
     # Tags listed at https://hub.docker.com/r/microsoft/mssql-server
     # Docs: https://learn.microsoft.com/en-us/sql/linux/quickstart-install-connect-docker
@@ -103,15 +80,38 @@ services:
       timeout: 10s
       retries: 30
 
-  cassandra:
-    image: cassandra:3
+  ollama:
+    # A light fork of Ollama to float some in-progress contributions related
+    # to more closely matching OpenAI behavior.
+    image: ghcr.io/elastic/ollama/ollama:testing
+    ports:
+      - "11434:11434"
+    healthcheck:
+      test: ["CMD", "ollama", "ls"]
+      interval: 1s
+      timeout: 10s
+      retries: 30
+
+  postgres:
+    # https://github.com/docker-library/docs/blob/master/postgres/README.md#how-to-extend-this-image
+    image: postgres:16
+    ports:
+      - "5432:5432"
     environment:
-      MAX_HEAP_SIZE: "1G"
-      HEAP_NEWSIZE: 400m
+      POSTGRES_HOST_AUTH_METHOD: 'trust'
+      POSTGRES_USER: 'postgres'
+    healthcheck:
+      test: ["CMD", "pg_isready"]
+      interval: 1s
+      timeout: 10s
+      retries: 30
+
+  redis:
+    image: redis:7
     ports:
-      - "9042:9042"
+      - "6379:6379"
     healthcheck:
-      test: ["CMD-SHELL", "[ $$(nodetool statusgossip) = running ]"]
+      test: ["CMD", "redis-cli", "ping"]
       interval: 1s
       timeout: 10s
       retries: 30