From a939f4dfc52cd9a8ea52fe15b50ca14a9ea4ac70 Mon Sep 17 00:00:00 2001 From: David Venable Date: Mon, 28 Jul 2025 19:15:11 -0500 Subject: [PATCH] Cleans up old Docker files and configurations for the old approach to smoke tests. Now that they use end-to-end tests these are no longer necessary. Signed-off-by: David Venable --- .../config/data-prepper-config.yaml | 1 - .../data-prepper/config/pipelines.yaml | 50 ------------------- release/smoke-tests/docker-compose.yml | 47 ----------------- .../http-log-generation/entrypoint.sh | 41 --------------- .../otel-collector-config.yml | 25 ---------- .../smoke-tests/otel-span-exporter/Dockerfile | 12 ----- release/smoke-tests/otel-span-exporter/app.py | 32 ------------ .../otel-span-exporter/requirements.txt | 19 ------- 8 files changed, 227 deletions(-) delete mode 100644 release/smoke-tests/data-prepper/config/data-prepper-config.yaml delete mode 100644 release/smoke-tests/data-prepper/config/pipelines.yaml delete mode 100644 release/smoke-tests/docker-compose.yml delete mode 100755 release/smoke-tests/http-log-generation/entrypoint.sh delete mode 100644 release/smoke-tests/opentelemetry-collector/otel-collector-config.yml delete mode 100644 release/smoke-tests/otel-span-exporter/Dockerfile delete mode 100644 release/smoke-tests/otel-span-exporter/app.py delete mode 100644 release/smoke-tests/otel-span-exporter/requirements.txt diff --git a/release/smoke-tests/data-prepper/config/data-prepper-config.yaml b/release/smoke-tests/data-prepper/config/data-prepper-config.yaml deleted file mode 100644 index 7462c0a70e..0000000000 --- a/release/smoke-tests/data-prepper/config/data-prepper-config.yaml +++ /dev/null @@ -1 +0,0 @@ -ssl: false diff --git a/release/smoke-tests/data-prepper/config/pipelines.yaml b/release/smoke-tests/data-prepper/config/pipelines.yaml deleted file mode 100644 index 8ab9c14ce0..0000000000 --- a/release/smoke-tests/data-prepper/config/pipelines.yaml +++ /dev/null @@ -1,50 +0,0 @@ -grok-pipeline: - source: - http: - processor: - - grok: - match: - log: [ "%{COMMONAPACHELOG}" ] - sink: - - opensearch: - hosts: [ "https://node-0.example.com:9200" ] - username: "admin" - password: "myStrongPassword123!" - index: "test-grok-index" - -entry-pipeline: - source: - otel_trace_source: - ssl: false - sink: - - pipeline: - name: "raw-pipeline" - - pipeline: - name: "service-map-pipeline" - -raw-pipeline: - source: - pipeline: - name: "entry-pipeline" - processor: - - otel_trace_raw: - sink: - - opensearch: - hosts: [ "https://node-0.example.com:9200" ] - username: "admin" - password: "myStrongPassword123!" - index_type: trace-analytics-raw - -service-map-pipeline: - delay: "100" - source: - pipeline: - name: "entry-pipeline" - processor: - - service_map_stateful: - sink: - - opensearch: - hosts: ["https://node-0.example.com:9200"] - username: "admin" - password: "myStrongPassword123!" - index_type: trace-analytics-service-map diff --git a/release/smoke-tests/docker-compose.yml b/release/smoke-tests/docker-compose.yml deleted file mode 100644 index 5794c987fc..0000000000 --- a/release/smoke-tests/docker-compose.yml +++ /dev/null @@ -1,47 +0,0 @@ -version: "3.9" - -services: - data-prepper: - restart: unless-stopped - image: ${DOCKER_IMAGE} - working_dir: /usr/share/data-prepper/ - volumes: - - ./data-prepper/config/data-prepper-config.yaml:/usr/share/data-prepper/config/data-prepper-config.yaml - - ./data-prepper/config/pipelines.yaml:/usr/share/data-prepper/pipelines/pipelines.yaml - - ../../shared-config/log4j2.properties:/usr/share/data-prepper/config/log4j.properties - depends_on: - - opensearch - ports: - - "2021:2021" - - opensearch: - image: opensearchproject/opensearch:${OPENSEARCH_VERSION} - container_name: node-0.example.com - environment: - - discovery.type=single-node - ports: - - "9200:9200" - - http-log-generation: - restart: unless-stopped - image: alpine - volumes: - - ./http-log-generation/entrypoint.sh:/entrypoint.sh - command: /bin/sh -c 'set -x; apk --no-cache add curl && /bin/sh -f /entrypoint.sh' - - otel-collector: - restart: unless-stopped - image: otel/opentelemetry-collector:0.40.0 - command: ["--config=/etc/otel-collector-config.yml"] - volumes: - - ./opentelemetry-collector/otel-collector-config.yml:/etc/otel-collector-config.yml - depends_on: - - data-prepper - ports: - - "4317:4317" - - otel-span-exporter: - restart: unless-stopped - build: ./otel-span-exporter - depends_on: - - otel-collector diff --git a/release/smoke-tests/http-log-generation/entrypoint.sh b/release/smoke-tests/http-log-generation/entrypoint.sh deleted file mode 100755 index 4cf3e6af3f..0000000000 --- a/release/smoke-tests/http-log-generation/entrypoint.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -# -# Copyright OpenSearch Contributors -# SPDX-License-Identifier: Apache-2.0 -# - -DATA_PREPPER_HOST="data-prepper" -DATA_PREPPER_PORT="2021" -OPENSEARCH_HOST="node-0.example.com:9200" - -echo "Waiting for startup" - -WAITING_FOR_OPENSEARCH=true - -while ${WAITING_FOR_OPENSEARCH} -do - if curl -s -k -H "Content-Type: application/json" -d '[{"log": "test log"}]' "http://${DATA_PREPPER_HOST}:${DATA_PREPPER_PORT}/log/ingest" > /dev/null - then - WAITING_FOR_OPENSEARCH=false - else - echo "Waiting for Data Prepper to start at http://${DATA_PREPPER_HOST}:${DATA_PREPPER_PORT}" - fi - sleep 1s -done - -echo "Data Prepper started!" - -set -x - -echo "Starting to send cURL requests to ${DATA_PREPPER_HOST}" - -i=0 -while [ $i -lt 10 ] -do - curl -k \ - -H "Content-Type: application/json" \ - -d "[{\"log\": \"smoke test log ${i}\"}]" \ - "http://${DATA_PREPPER_HOST}:${DATA_PREPPER_PORT}/log/ingest" - i=$((i+1)) -done diff --git a/release/smoke-tests/opentelemetry-collector/otel-collector-config.yml b/release/smoke-tests/opentelemetry-collector/otel-collector-config.yml deleted file mode 100644 index e1c435b9cd..0000000000 --- a/release/smoke-tests/opentelemetry-collector/otel-collector-config.yml +++ /dev/null @@ -1,25 +0,0 @@ -receivers: - otlp: - protocols: - grpc: - http: - -processors: - batch: - -exporters: - logging: - otlp: - endpoint: data-prepper:21890 - tls: - insecure: true - -service: - telemetry: - logs: - level: "debug" - pipelines: - traces: - receivers: [otlp] - processors: [batch] - exporters: [logging, otlp] diff --git a/release/smoke-tests/otel-span-exporter/Dockerfile b/release/smoke-tests/otel-span-exporter/Dockerfile deleted file mode 100644 index 9fb4a1f8ff..0000000000 --- a/release/smoke-tests/otel-span-exporter/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM python:alpine - -RUN apk add --no-cache build-base g++ gcc python3-dev linux-headers - -RUN python3 -m pip install --upgrade pip - -COPY ./requirements.txt . -RUN python3 -m pip install -r requirements.txt - -COPY ./app.py . - -ENTRYPOINT python3 ./app.py diff --git a/release/smoke-tests/otel-span-exporter/app.py b/release/smoke-tests/otel-span-exporter/app.py deleted file mode 100644 index 3cd26af052..0000000000 --- a/release/smoke-tests/otel-span-exporter/app.py +++ /dev/null @@ -1,32 +0,0 @@ -from opentelemetry import trace -from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter -from opentelemetry.sdk.resources import Resource -from opentelemetry.sdk.trace import TracerProvider -from opentelemetry.sdk.trace.export import BatchSpanProcessor -from grpc import ssl_channel_credentials - -resource = Resource(attributes={ - "service.name": "PythonService" -}) - -trace_provider = TracerProvider(resource=resource, ) - -otlp_exporter = OTLPSpanExporter( - endpoint="otel-collector:4317", -) - -trace_provider.add_span_processor(BatchSpanProcessor(otlp_exporter)) - -trace.set_tracer_provider(trace_provider) - -span = trace.get_current_span() -span.set_attribute("user_id", "9999") - -def run(): - tracer = trace.get_tracer(__name__) - with tracer.start_as_current_span("http-handler"): - with tracer.start_as_current_span("my-cool-function"): - print("I'm doing something!") - -if __name__ == "__main__": - run() diff --git a/release/smoke-tests/otel-span-exporter/requirements.txt b/release/smoke-tests/otel-span-exporter/requirements.txt deleted file mode 100644 index 4cc2d45c97..0000000000 --- a/release/smoke-tests/otel-span-exporter/requirements.txt +++ /dev/null @@ -1,19 +0,0 @@ -backoff==1.10.0 -certifi==2024.07.04 -charset-normalizer==2.0.9 -Deprecated==1.2.13 -googleapis-common-protos==1.53.0 -grpcio==1.53.2 -idna==3.7 -opentelemetry-api==1.25.0 -opentelemetry-exporter-otlp==1.25.0 -opentelemetry-exporter-otlp-proto-grpc==1.25.0 -opentelemetry-exporter-otlp-proto-http==1.25.0 -opentelemetry-proto==1.25.0 -opentelemetry-sdk==1.25.0 -opentelemetry-semantic-conventions==0.46b0 -protobuf==4.25.8 -requests==2.32.4 -six==1.16.0 -urllib3==2.5.0 -wrapt==1.13.3