diff --git a/.github/workflows/skywalking.yaml b/.github/workflows/skywalking.yaml index c59e93939d..52d62f79ec 100644 --- a/.github/workflows/skywalking.yaml +++ b/.github/workflows/skywalking.yaml @@ -331,6 +331,8 @@ jobs: needs: [docker] runs-on: ${{ matrix.test.runs-on || 'ubuntu-latest' }} timeout-minutes: 60 + env: + OTEL_COLLECTOR_VERSION: 0.92.0 strategy: fail-fast: false matrix: diff --git a/docs/en/changes/changes.md b/docs/en/changes/changes.md index 0d7f14ceea..98d09b5e62 100644 --- a/docs/en/changes/changes.md +++ b/docs/en/changes/changes.md @@ -3,6 +3,7 @@ #### Project * Support Java 21 runtime. * Support oap-java21 image for Java 21 runtime. +* Upgrade `OTEL collector` version to `0.92.0` in all e2e tests. #### OAP Server diff --git a/test/e2e-v2/cases/apisix/otel-collector/docker-compose.yml b/test/e2e-v2/cases/apisix/otel-collector/docker-compose.yml index 8bb5c54794..908a827938 100644 --- a/test/e2e-v2/cases/apisix/otel-collector/docker-compose.yml +++ b/test/e2e-v2/cases/apisix/otel-collector/docker-compose.yml @@ -25,7 +25,7 @@ services: networks: e2e: otel-collector: - image: otel/opentelemetry-collector:0.50.0 + image: otel/opentelemetry-collector:${OTEL_COLLECTOR_VERSION} command: [ "--config=/etc/otel-collector-config.yaml" ] volumes: - ./otel-collector-config.yaml:/etc/otel-collector-config.yaml diff --git a/test/e2e-v2/cases/elasticsearch/docker-compose.yml b/test/e2e-v2/cases/elasticsearch/docker-compose.yml index 4b18f201b8..e44b801c72 100644 --- a/test/e2e-v2/cases/elasticsearch/docker-compose.yml +++ b/test/e2e-v2/cases/elasticsearch/docker-compose.yml @@ -68,7 +68,7 @@ services: retries: 120 test: ["CMD", "sh", "-c", "nc -vz localhost 9114"] otel-collector: - image: otel/opentelemetry-collector:0.72.0 + image: otel/opentelemetry-collector:${OTEL_COLLECTOR_VERSION} networks: - e2e command: [ "--config=/etc/otel-collector-config.yaml" ] diff --git a/test/e2e-v2/cases/kafka/kafka-monitoring/docker-compose.yml b/test/e2e-v2/cases/kafka/kafka-monitoring/docker-compose.yml index f035d37125..b24e4de9a4 100644 --- a/test/e2e-v2/cases/kafka/kafka-monitoring/docker-compose.yml +++ b/test/e2e-v2/cases/kafka/kafka-monitoring/docker-compose.yml @@ -107,7 +107,7 @@ services: kafka-consumer-perf-test.sh --broker-list broker1:9092,broker2:9093 --topic perftest --messages 100000 otel-collector: - image: otel/opentelemetry-collector:0.50.0 + image: otel/opentelemetry-collector:${OTEL_COLLECTOR_VERSION} networks: - e2e command: [ "--config=/etc/otel-collector-config.yaml" ] diff --git a/test/e2e-v2/cases/kafka/kafka-monitoring/otel-collector-config.yaml b/test/e2e-v2/cases/kafka/kafka-monitoring/otel-collector-config.yaml index 11dd27a1d3..de90eec55f 100644 --- a/test/e2e-v2/cases/kafka/kafka-monitoring/otel-collector-config.yaml +++ b/test/e2e-v2/cases/kafka/kafka-monitoring/otel-collector-config.yaml @@ -46,7 +46,7 @@ exporters: #insecure: true # Exports data to the console logging: - logLevel: debug + loglevel: debug service: pipelines: diff --git a/test/e2e-v2/cases/mariadb/mariadb-slowsql/docker-compose.yaml b/test/e2e-v2/cases/mariadb/mariadb-slowsql/docker-compose.yaml index e990cec192..e63c54c5f0 100644 --- a/test/e2e-v2/cases/mariadb/mariadb-slowsql/docker-compose.yaml +++ b/test/e2e-v2/cases/mariadb/mariadb-slowsql/docker-compose.yaml @@ -104,7 +104,7 @@ services: condition: service_healthy otel-collector: - image: otel/opentelemetry-collector:0.50.0 + image: otel/opentelemetry-collector:${OTEL_COLLECTOR_VERSION} networks: - e2e command: [ "--config=/etc/otel-collector-config.yaml" ] diff --git a/test/e2e-v2/cases/mongodb/docker-compose.yml b/test/e2e-v2/cases/mongodb/docker-compose.yml index 7a8b4ae974..6d851fdff7 100644 --- a/test/e2e-v2/cases/mongodb/docker-compose.yml +++ b/test/e2e-v2/cases/mongodb/docker-compose.yml @@ -80,7 +80,7 @@ services: - '--collector.diagnosticdata' - '--collector.replicasetstatus' otel-collector: - image: otel/opentelemetry-collector:0.72.0 + image: otel/opentelemetry-collector:${OTEL_COLLECTOR_VERSION} networks: - e2e command: [ "--config=/etc/otel-collector-config.yaml" ] diff --git a/test/e2e-v2/cases/mysql/mysql-slowsql/docker-compose.yaml b/test/e2e-v2/cases/mysql/mysql-slowsql/docker-compose.yaml index a0acd7a2cb..c3dc306bd9 100644 --- a/test/e2e-v2/cases/mysql/mysql-slowsql/docker-compose.yaml +++ b/test/e2e-v2/cases/mysql/mysql-slowsql/docker-compose.yaml @@ -148,7 +148,7 @@ services: depends_on: - mysql_3 otel-collector: - image: otel/opentelemetry-collector:0.50.0 + image: otel/opentelemetry-collector:${OTEL_COLLECTOR_VERSION} networks: - e2e command: [ "--config=/etc/otel-collector-config.yaml" ] diff --git a/test/e2e-v2/cases/nginx/docker-compose.yml b/test/e2e-v2/cases/nginx/docker-compose.yml index 64d57a3632..7d2cecfb5f 100644 --- a/test/e2e-v2/cases/nginx/docker-compose.yml +++ b/test/e2e-v2/cases/nginx/docker-compose.yml @@ -56,7 +56,7 @@ services: - e2e otel-collector: - image: otel/opentelemetry-collector:0.50.0 + image: otel/opentelemetry-collector:${OTEL_COLLECTOR_VERSION} command: [ "--config=/etc/otel-collector-config.yaml" ] volumes: - ./otel-collector-config.yaml:/etc/otel-collector-config.yaml diff --git a/test/e2e-v2/cases/postgresql/postgres-exporter/docker-compose.yml b/test/e2e-v2/cases/postgresql/postgres-exporter/docker-compose.yml index 95f5c7e80b..cfd4955668 100644 --- a/test/e2e-v2/cases/postgresql/postgres-exporter/docker-compose.yml +++ b/test/e2e-v2/cases/postgresql/postgres-exporter/docker-compose.yml @@ -131,7 +131,7 @@ services: condition: service_healthy otel-collector: - image: otel/opentelemetry-collector:0.50.0 + image: otel/opentelemetry-collector:${OTEL_COLLECTOR_VERSION} networks: - e2e command: [ "--config=/etc/otel-collector-config.yaml" ] diff --git a/test/e2e-v2/cases/pulsar/docker-compose.yml b/test/e2e-v2/cases/pulsar/docker-compose.yml index 80b870d1dd..2187458694 100644 --- a/test/e2e-v2/cases/pulsar/docker-compose.yml +++ b/test/e2e-v2/cases/pulsar/docker-compose.yml @@ -122,7 +122,7 @@ services: command: bash -c "bin/pulsar-perf produce -m 100000 my-topic" otel-collector: - image: otel/opentelemetry-collector:0.87.0 + image: otel/opentelemetry-collector:${OTEL_COLLECTOR_VERSION} networks: - e2e command: [ "--config=/etc/otel-collector-config.yaml" ] diff --git a/test/e2e-v2/cases/rabbitmq/docker-compose.yml b/test/e2e-v2/cases/rabbitmq/docker-compose.yml index 3af9505cf8..b279d3e530 100644 --- a/test/e2e-v2/cases/rabbitmq/docker-compose.yml +++ b/test/e2e-v2/cases/rabbitmq/docker-compose.yml @@ -175,7 +175,7 @@ services: METRICS_PROMETHEUS: "true" otel-collector: - image: otel/opentelemetry-collector:0.72.0 + image: otel/opentelemetry-collector:${OTEL_COLLECTOR_VERSION} networks: - e2e command: [ "--config=/etc/otel-collector-config.yaml" ] diff --git a/test/e2e-v2/cases/redis/redis-exporter/docker-compose.yml b/test/e2e-v2/cases/redis/redis-exporter/docker-compose.yml index 4d56ef7006..d79cbbb06b 100644 --- a/test/e2e-v2/cases/redis/redis-exporter/docker-compose.yml +++ b/test/e2e-v2/cases/redis/redis-exporter/docker-compose.yml @@ -80,7 +80,7 @@ services: environment: - REDIS_ADDR=redis_3:6379 otel-collector: - image: otel/opentelemetry-collector:0.50.0 + image: otel/opentelemetry-collector:${OTEL_COLLECTOR_VERSION} networks: - e2e command: [ "--config=/etc/otel-collector-config.yaml" ] diff --git a/test/e2e-v2/cases/so11y/docker-compose.yml b/test/e2e-v2/cases/so11y/docker-compose.yml index 480b440cf8..38d9518a27 100644 --- a/test/e2e-v2/cases/so11y/docker-compose.yml +++ b/test/e2e-v2/cases/so11y/docker-compose.yml @@ -55,7 +55,7 @@ services: condition: service_healthy otel-collector: - image: otel/opentelemetry-collector:0.50.0 + image: otel/opentelemetry-collector:${OTEL_COLLECTOR_VERSION} networks: - e2e command: [ "--config=/etc/otel-collector-config.yaml" ] diff --git a/test/e2e-v2/cases/so11y/otel-collector-config.yaml b/test/e2e-v2/cases/so11y/otel-collector-config.yaml index 3a11fb3cc1..3593d72f44 100644 --- a/test/e2e-v2/cases/so11y/otel-collector-config.yaml +++ b/test/e2e-v2/cases/so11y/otel-collector-config.yaml @@ -33,7 +33,7 @@ exporters: tls: insecure: true logging: - logLevel: debug + loglevel: debug service: pipelines: diff --git a/test/e2e-v2/cases/vm/prometheus-node-exporter/docker-compose.yml b/test/e2e-v2/cases/vm/prometheus-node-exporter/docker-compose.yml index 4acac23fa2..cf1627700b 100644 --- a/test/e2e-v2/cases/vm/prometheus-node-exporter/docker-compose.yml +++ b/test/e2e-v2/cases/vm/prometheus-node-exporter/docker-compose.yml @@ -36,7 +36,7 @@ services: - 9100 otel-collector: - image: otel/opentelemetry-collector:0.50.0 + image: otel/opentelemetry-collector:${OTEL_COLLECTOR_VERSION} networks: - e2e command: [ "--config=/etc/otel-collector-config.yaml" ]