open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Overhead testing to use external db (#3762) 

* migrate away from in-memory db to external postgresql.

* use the PostgreSQLContainer abstraction container class

* address code review comments

* remove extra unnecessary/redundant configuration
This commit is contained in:
jason plumb 2021-08-05 23:28:42 -07:00 committed by GitHub
parent 5f59674a66
commit 5e18c4cd91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 219 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
testing-overhead/build.gradle.kts
View File

@ -8,6 +8,7 @@ repositories {
dependencies {
testImplementation("org.testcontainers:testcontainers:1.15.3")
testImplementation("org.testcontainers:postgresql:1.15.3")
testImplementation("org.junit.jupiter:junit-jupiter-api:5.7.2")
testImplementation("org.junit.jupiter:junit-jupiter-params:5.7.2")
testImplementation("com.squareup.okhttp3:okhttp:4.9.1")

7
testing-overhead/src/test/java/io/opentelemetry/OverheadTests.java
View File

@ -13,6 +13,7 @@ import io.opentelemetry.config.TestConfig;
import io.opentelemetry.containers.CollectorContainer;
import io.opentelemetry.containers.K6Container;
import io.opentelemetry.containers.PetClinicRestContainer;
import io.opentelemetry.containers.PostgresContainer;
import io.opentelemetry.results.AppPerfResults;
import io.opentelemetry.results.ConsoleResultsPersister;
import io.opentelemetry.results.ResultsCollector;
@ -67,6 +68,9 @@ public class OverheadTests {
}
void runAppOnce(TestConfig config, Agent agent) throws Exception {
GenericContainer<?> postgres = new PostgresContainer(NETWORK).build();
postgres.start();
GenericContainer<?> petclinic = new PetClinicRestContainer(NETWORK, collector, agent, namingConventions).build();
long start = System.currentTimeMillis();
petclinic.start();
@ -81,8 +85,7 @@ public class OverheadTests {
while (petclinic.isRunning()) {
TimeUnit.MILLISECONDS.sleep(500);
}
//TODO: Parse and aggregate the test results.
postgres.stop();
}
private void writeStartupTimeFile(Agent agent, long start) throws IOException {

12
testing-overhead/src/test/java/io/opentelemetry/containers/PetClinicRestContainer.java
View File

@ -4,15 +4,14 @@
*/
package io.opentelemetry.containers;
import io.opentelemetry.agents.Agent;
import io.opentelemetry.agents.AgentResolver;
import io.opentelemetry.util.NamingConventions;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
import io.opentelemetry.agents.Agent;
import io.opentelemetry.agents.AgentResolver;
import io.opentelemetry.util.NamingConventions;
import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -54,6 +53,11 @@ public class PetClinicRestContainer {
.withExposedPorts(PETCLINIC_PORT)
.withFileSystemBind(namingConventions.localResults(), namingConventions.containerResults())
.waitingFor(Wait.forHttp("/petclinic/actuator/health").forPort(PETCLINIC_PORT))
.withEnv("spring_profiles_active", "postgresql,spring-data-jpa")
.withEnv("spring_datasource_url", "jdbc:postgresql://postgres:5432/" + PostgresContainer.DATABASE_NAME)
.withEnv("spring_datasource_username", PostgresContainer.USERNAME)
.withEnv("spring_datasource_password", PostgresContainer.PASSWORD)
.withEnv("spring_jpa_hibernate_ddl-auto", "none")
.dependsOn(collector)
.withCommand(buildCommandline(agentJar));

42
testing-overhead/src/test/java/io/opentelemetry/containers/PostgresContainer.java Normal file
View File

@ -0,0 +1,42 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/
package io.opentelemetry.containers;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testcontainers.containers.Network;
import org.testcontainers.containers.PostgreSQLContainer;
import org.testcontainers.containers.output.Slf4jLogConsumer;
import org.testcontainers.utility.MountableFile;
public class PostgresContainer {
private static final Logger logger = LoggerFactory.getLogger(PostgresContainer.class);
public static final String PASSWORD = "petclinic";
public static final String USERNAME = "petclinic";
public static final String DATABASE_NAME = "petclinic";
private final Network network;
public PostgresContainer(Network network) {
this.network = network;
}
public PostgreSQLContainer<?> build() throws Exception {
return new PostgreSQLContainer<>("postgres:9.6.22")
.withNetwork(network)
.withNetworkAliases("postgres")
.withLogConsumer(new Slf4jLogConsumer(logger))
.withUsername(USERNAME)
.withPassword(PASSWORD)
.withDatabaseName(DATABASE_NAME)
.withCopyFileToContainer(
MountableFile.forClasspathResource("initDB.sql"), "/docker-entrypoint-initdb.d/initDB.sql")
.withCopyFileToContainer(
MountableFile.forClasspathResource("populateDB.sql"), "/docker-entrypoint-initdb.d/populateDB.sql")
.withReuse(false);
}
}

4
testing-overhead/src/test/resources/collector.yaml
View File

@ -20,7 +20,7 @@ service:
traces:
receivers: [ otlp ]
processors: [ batch ]
exporters: [ logging/logging_debug ]
exporters: [ logging/logging_info ]
metrics:
receivers: [ otlp ]
processors: [ batch ]
@ -28,6 +28,6 @@ service:
logs:
receivers: [ otlp ]
processors: [ batch ]
exporters: [ logging/logging_debug ]
exporters: [ logging/logging_info ]
extensions: [ health_check ]

102
testing-overhead/src/test/resources/initDB.sql Normal file
View File

@ -0,0 +1,102 @@
CREATE TABLE IF NOT EXISTS vets (
id SERIAL,
first_name VARCHAR(30),
last_name VARCHAR(30),
CONSTRAINT pk_vets PRIMARY KEY (id)
);
CREATE INDEX IF NOT EXISTS idx_vets_last_name ON vets (last_name);
ALTER SEQUENCE vets_id_seq RESTART WITH 100;
CREATE TABLE IF NOT EXISTS specialties (
id SERIAL,
name VARCHAR(80),
CONSTRAINT pk_specialties PRIMARY KEY (id)
);
CREATE INDEX IF NOT EXISTS idx_specialties_name ON specialties (name);
ALTER SEQUENCE specialties_id_seq RESTART WITH 100;
CREATE TABLE IF NOT EXISTS vet_specialties (
vet_id INT NOT NULL,
specialty_id INT NOT NULL,
FOREIGN KEY (vet_id) REFERENCES vets(id),
FOREIGN KEY (specialty_id) REFERENCES specialties(id),
CONSTRAINT unique_ids UNIQUE (vet_id,specialty_id)
);
CREATE TABLE IF NOT EXISTS types (
id SERIAL,
name VARCHAR(80),
CONSTRAINT pk_types PRIMARY KEY (id)
);
CREATE INDEX IF NOT EXISTS idx_types_name ON types (name);
ALTER SEQUENCE types_id_seq RESTART WITH 100;
CREATE TABLE IF NOT EXISTS owners (
id SERIAL,
first_name VARCHAR(30),
last_name VARCHAR(30),
address VARCHAR(255),
city VARCHAR(80),
telephone VARCHAR(20),
CONSTRAINT pk_owners PRIMARY KEY (id)
);
CREATE INDEX IF NOT EXISTS idx_owners_last_name ON owners (last_name);
ALTER SEQUENCE owners_id_seq RESTART WITH 100;
CREATE TABLE IF NOT EXISTS pets (
id SERIAL,
name VARCHAR(30),
birth_date DATE,
type_id INT NOT NULL,
owner_id INT NOT NULL,
FOREIGN KEY (owner_id) REFERENCES owners(id),
FOREIGN KEY (type_id) REFERENCES types(id),
CONSTRAINT pk_pets PRIMARY KEY (id)
);
CREATE INDEX IF NOT EXISTS idx_pets_name ON pets (name);
ALTER SEQUENCE pets_id_seq RESTART WITH 100;
CREATE TABLE IF NOT EXISTS visits (
id SERIAL,
pet_id INT NOT NULL,
visit_date DATE,
description VARCHAR(255),
FOREIGN KEY (pet_id) REFERENCES pets(id),
CONSTRAINT pk_visits PRIMARY KEY (id)
);
ALTER SEQUENCE visits_id_seq RESTART WITH 100;
CREATE TABLE IF NOT EXISTS users (
username VARCHAR(20) NOT NULL ,
password VARCHAR(20) NOT NULL ,
enabled boolean NOT NULL DEFAULT true ,
CONSTRAINT pk_users PRIMARY KEY (username)
);
CREATE TABLE IF NOT EXISTS roles (
id SERIAL,
username varchar(20) NOT NULL,
role varchar(20) NOT NULL,
CONSTRAINT pk_roles PRIMARY KEY (id),
FOREIGN KEY (username) REFERENCES users (username)
);
ALTER TABLE roles ADD CONSTRAINT uni_username_role UNIQUE (role,username);
ALTER SEQUENCE roles_id_seq RESTART WITH 100;

59
testing-overhead/src/test/resources/populateDB.sql Normal file
View File

@ -0,0 +1,59 @@
INSERT INTO vets VALUES (1, 'James', 'Carter') ON CONFLICT DO NOTHING;
INSERT INTO vets VALUES (2, 'Helen', 'Leary') ON CONFLICT DO NOTHING;
INSERT INTO vets VALUES (3, 'Linda', 'Douglas') ON CONFLICT DO NOTHING;
INSERT INTO vets VALUES (4, 'Rafael', 'Ortega') ON CONFLICT DO NOTHING;
INSERT INTO vets VALUES (5, 'Henry', 'Stevens') ON CONFLICT DO NOTHING;
INSERT INTO vets VALUES (6, 'Sharon', 'Jenkins') ON CONFLICT DO NOTHING;
INSERT INTO specialties VALUES (1, 'radiology') ON CONFLICT DO NOTHING;
INSERT INTO specialties VALUES (2, 'surgery') ON CONFLICT DO NOTHING;
INSERT INTO specialties VALUES (3, 'dentistry') ON CONFLICT DO NOTHING;
INSERT INTO vet_specialties VALUES (2, 1) ON CONFLICT DO NOTHING;
INSERT INTO vet_specialties VALUES (3, 2) ON CONFLICT DO NOTHING;
INSERT INTO vet_specialties VALUES (3, 3) ON CONFLICT DO NOTHING;
INSERT INTO vet_specialties VALUES (4, 2) ON CONFLICT DO NOTHING;
INSERT INTO vet_specialties VALUES (5, 1) ON CONFLICT DO NOTHING;
INSERT INTO types VALUES (1, 'cat') ON CONFLICT DO NOTHING;
INSERT INTO types VALUES (2, 'dog') ON CONFLICT DO NOTHING;
INSERT INTO types VALUES (3, 'lizard') ON CONFLICT DO NOTHING;
INSERT INTO types VALUES (4, 'snake') ON CONFLICT DO NOTHING;
INSERT INTO types VALUES (5, 'bird') ON CONFLICT DO NOTHING;
INSERT INTO types VALUES (6, 'hamster') ON CONFLICT DO NOTHING;
INSERT INTO owners VALUES (1, 'George', 'Franklin', '110 W. Liberty St.', 'Madison', '6085551023') ON CONFLICT DO NOTHING;
INSERT INTO owners VALUES (2, 'Betty', 'Davis', '638 Cardinal Ave.', 'Sun Prairie', '6085551749') ON CONFLICT DO NOTHING;
INSERT INTO owners VALUES (3, 'Eduardo', 'Rodriquez', '2693 Commerce St.', 'McFarland', '6085558763') ON CONFLICT DO NOTHING;
INSERT INTO owners VALUES (4, 'Harold', 'Davis', '563 Friendly St.', 'Windsor', '6085553198') ON CONFLICT DO NOTHING;
INSERT INTO owners VALUES (5, 'Peter', 'McTavish', '2387 S. Fair Way', 'Madison', '6085552765') ON CONFLICT DO NOTHING;
INSERT INTO owners VALUES (6, 'Jean', 'Coleman', '105 N. Lake St.', 'Monona', '6085552654') ON CONFLICT DO NOTHING;
INSERT INTO owners VALUES (7, 'Jeff', 'Black', '1450 Oak Blvd.', 'Monona', '6085555387') ON CONFLICT DO NOTHING;
INSERT INTO owners VALUES (8, 'Maria', 'Escobito', '345 Maple St.', 'Madison', '6085557683') ON CONFLICT DO NOTHING;
INSERT INTO owners VALUES (9, 'David', 'Schroeder', '2749 Blackhawk Trail', 'Madison', '6085559435') ON CONFLICT DO NOTHING;
INSERT INTO owners VALUES (10, 'Carlos', 'Estaban', '2335 Independence La.', 'Waunakee', '6085555487') ON CONFLICT DO NOTHING;
INSERT INTO pets VALUES (1, 'Leo', '2000-09-07', 1, 1) ON CONFLICT DO NOTHING;
INSERT INTO pets VALUES (2, 'Basil', '2002-08-06', 6, 2) ON CONFLICT DO NOTHING;
INSERT INTO pets VALUES (3, 'Rosy', '2001-04-17', 2, 3) ON CONFLICT DO NOTHING;
INSERT INTO pets VALUES (4, 'Jewel', '2000-03-07', 2, 3) ON CONFLICT DO NOTHING;
INSERT INTO pets VALUES (5, 'Iggy', '2000-11-30', 3, 4) ON CONFLICT DO NOTHING;
INSERT INTO pets VALUES (6, 'George', '2000-01-20', 4, 5) ON CONFLICT DO NOTHING;
INSERT INTO pets VALUES (7, 'Samantha', '1995-09-04', 1, 6) ON CONFLICT DO NOTHING;
INSERT INTO pets VALUES (8, 'Max', '1995-09-04', 1, 6) ON CONFLICT DO NOTHING;
INSERT INTO pets VALUES (9, 'Lucky', '1999-08-06', 5, 7) ON CONFLICT DO NOTHING;
INSERT INTO pets VALUES (10, 'Mulligan', '1997-02-24', 2, 8) ON CONFLICT DO NOTHING;
INSERT INTO pets VALUES (11, 'Freddy', '2000-03-09', 5, 9) ON CONFLICT DO NOTHING;
INSERT INTO pets VALUES (12, 'Lucky', '2000-06-24', 2, 10) ON CONFLICT DO NOTHING;
INSERT INTO pets VALUES (13, 'Sly', '2002-06-08', 1, 10) ON CONFLICT DO NOTHING;
INSERT INTO visits VALUES (1, 7, '2010-03-04', 'rabies shot') ON CONFLICT DO NOTHING;
INSERT INTO visits VALUES (2, 8, '2011-03-04', 'rabies shot') ON CONFLICT DO NOTHING;
INSERT INTO visits VALUES (3, 8, '2009-06-04', 'neutered') ON CONFLICT DO NOTHING;
INSERT INTO visits VALUES (4, 7, '2008-09-04', 'spayed') ON CONFLICT DO NOTHING;
INSERT INTO users(username,password,enabled) VALUES ('admin','{noop}admin', true) ON CONFLICT DO NOTHING;
INSERT INTO roles (username, role) VALUES ('admin', 'ROLE_OWNER_ADMIN') ON CONFLICT DO NOTHING;
INSERT INTO roles (username, role) VALUES ('admin', 'ROLE_VET_ADMIN') ON CONFLICT DO NOTHING;
INSERT INTO roles (username, role) VALUES ('admin', 'ROLE_ADMIN') ON CONFLICT DO NOTHING;