From 606f39c9c76ec49fc8c47d5587571b84c4111989 Mon Sep 17 00:00:00 2001 From: Nikita Salnikov-Tarnovski Date: Mon, 3 Jan 2022 12:17:40 +0200 Subject: [PATCH] Remove deprecated module (#4976) --- benchmark-e2e/build.gradle.kts | 24 ---- .../e2ebenchmark/AgentBenchmark.java | 128 ------------------ .../src/main/resources/collector-config.yml | 33 ----- settings.gradle.kts | 1 - 4 files changed, 186 deletions(-) delete mode 100644 benchmark-e2e/build.gradle.kts delete mode 100644 benchmark-e2e/src/main/java/io/opentelemetry/e2ebenchmark/AgentBenchmark.java delete mode 100644 benchmark-e2e/src/main/resources/collector-config.yml diff --git a/benchmark-e2e/build.gradle.kts b/benchmark-e2e/build.gradle.kts deleted file mode 100644 index 3f17786eb3..0000000000 --- a/benchmark-e2e/build.gradle.kts +++ /dev/null @@ -1,24 +0,0 @@ -import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar - -plugins { - id("otel.java-conventions") -} - -description = "e2e benchmark" - -dependencies { - implementation("org.junit.jupiter:junit-jupiter-api:5.3.1") - implementation("org.slf4j:slf4j-simple:1.6.1") - implementation("org.testcontainers:testcontainers:1.16.2") -} - -tasks { - test { - dependsOn(":javaagent:shadowJar") - maxParallelForks = 2 - - doFirst { - jvmArgs("-Dio.opentelemetry.smoketest.agent.shadowJar.path=${project(":javaagent").tasks.getByName("shadowJar").archivePath}") - } - } -} diff --git a/benchmark-e2e/src/main/java/io/opentelemetry/e2ebenchmark/AgentBenchmark.java b/benchmark-e2e/src/main/java/io/opentelemetry/e2ebenchmark/AgentBenchmark.java deleted file mode 100644 index a95661751f..0000000000 --- a/benchmark-e2e/src/main/java/io/opentelemetry/e2ebenchmark/AgentBenchmark.java +++ /dev/null @@ -1,128 +0,0 @@ -/* - * Copyright The OpenTelemetry Authors - * SPDX-License-Identifier: Apache-2.0 - */ - -package io.opentelemetry.e2ebenchmark; - -import java.util.AbstractMap; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; -import java.util.stream.Stream; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.testcontainers.containers.GenericContainer; -import org.testcontainers.containers.Network; -import org.testcontainers.containers.output.Slf4jLogConsumer; -import org.testcontainers.containers.wait.strategy.Wait; -import org.testcontainers.lifecycle.Startables; -import org.testcontainers.utility.DockerImageName; -import org.testcontainers.utility.MountableFile; - -public class AgentBenchmark { - private static final String APP_NAME = - System.getenv() - .getOrDefault( - "APP_IMAGE", - "ghcr.io/open-telemetry/opentelemetry-java-instrumentation/smoke-test-spring-boot:jdk8-20211213.1570880324"); - - private List> containers; - private static final Logger logger = LoggerFactory.getLogger(AgentBenchmark.class); - - // docker images - private static final DockerImageName APP_IMAGE = DockerImageName.parse(APP_NAME); - private static final DockerImageName OTLP_COLLECTOR_IMAGE = - DockerImageName.parse("otel/opentelemetry-collector-dev:latest"); - private static final DockerImageName WRK_IMAGE = DockerImageName.parse("quay.io/dim/wrk:stable"); - - @BeforeEach - void setUp() { - containers = new ArrayList<>(); - } - - @AfterEach - void tearDown() { - containers.forEach(GenericContainer::stop); - } - - @Test - void run() throws InterruptedException { - runBenchmark(); - } - - private void runBenchmark() throws InterruptedException { - String agentPath = System.getProperty("io.opentelemetry.smoketest.agent.shadowJar.path"); - - // otlp collector container - GenericContainer collector = - new GenericContainer<>(OTLP_COLLECTOR_IMAGE) - .withNetwork(Network.SHARED) - .withNetworkAliases("collector") - .withLogConsumer(new Slf4jLogConsumer(logger)) - .withExposedPorts(4317, 13133) - .waitingFor(Wait.forHttp("/").forPort(13133)) - .withCopyFileToContainer( - MountableFile.forClasspathResource("collector-config.yml"), - "/etc/collector/collector-config.yml") - .withCommand("--config /etc/collector/collector-config.yml --log-level=DEBUG"); - containers.add(collector); - - // sample app container - GenericContainer app = - new GenericContainer<>(APP_IMAGE) - .withNetwork(Network.SHARED) - .withLogConsumer(new Slf4jLogConsumer(logger)) - .withNetworkAliases("app") - .withCopyFileToContainer( - MountableFile.forHostPath(agentPath), "/opentelemetry-javaagent.jar") - .withEnv("OTEL_EXPORTER_OTLP_ENDPOINT", "collector:4317") - .withEnv("JAVA_TOOL_OPTIONS", "-javaagent:/opentelemetry-javaagent.jar") - .withExposedPorts(8080); - containers.add(app); - - // wrk benchmark container - GenericContainer wrk = - new GenericContainer<>(WRK_IMAGE) - .withNetwork(Network.SHARED) - .withLogConsumer(new Slf4jLogConsumer(logger)) - .withCreateContainerCmdModifier(it -> it.withEntrypoint("wrk")) - .withCommand("-t4 -c128 -d300s http://app:8080/ --latency"); - containers.add(wrk); - - wrk.dependsOn(app, collector); - Startables.deepStart(Stream.of(wrk)).join(); - - logger.info("Benchmark started"); - printContainerMapping(collector); - printContainerMapping(app); - - while (wrk.isRunning()) { - Thread.sleep(1000); - } - - Thread.sleep(5000); - logger.info("Benchmark complete, wrk output:"); - logger.info(wrk.getLogs().replace("\n\n", "\n")); - } - - static void printContainerMapping(GenericContainer container) { - logger.info( - "Container {} ports exposed at {}", - container.getDockerImageName(), - container.getExposedPorts().stream() - .map( - port -> - new AbstractMap.SimpleImmutableEntry<>( - port, - "http://" - + container.getContainerIpAddress() - + ":" - + container.getMappedPort(port))) - .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue))); - } -} diff --git a/benchmark-e2e/src/main/resources/collector-config.yml b/benchmark-e2e/src/main/resources/collector-config.yml deleted file mode 100644 index eba192edae..0000000000 --- a/benchmark-e2e/src/main/resources/collector-config.yml +++ /dev/null @@ -1,33 +0,0 @@ -receivers: - otlp: - protocols: - grpc: - endpoint: 0.0.0.0:4317 - -exporters: - logging: - loglevel: info - -processors: - batch: - -extensions: - health_check: - -service: - extensions: health_check - pipelines: - traces: - processors: - - batch - receivers: - - otlp - exporters: - - logging - metrics: - processors: - - batch - receivers: - - otlp - exporters: - - logging diff --git a/settings.gradle.kts b/settings.gradle.kts index 05100bd5b2..b442c2c3e2 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -396,6 +396,5 @@ include(":instrumentation:vertx:vertx-web-3.0:testing") include(":instrumentation:wicket-8.0:javaagent") // benchmark -include(":benchmark-e2e") include(":benchmark-overhead-jmh") include(":benchmark-jfr-analyzer")