Skip to content

Commit

Permalink
Adds massive stuff here to see if it fixes the build. later will be p…
Browse files Browse the repository at this point in the history 
…ulled out
  • Loading branch information
adriancole committed Oct 20, 2020
1 parent e295b82 commit 3599fe5
Show file tree
Hide file tree
Showing 34 changed files with 2,579 additions and 1,810 deletions.
7 changes: 2 additions & 5 deletions ...ge/cassandra-v1/src/test/java/zipkin2/storage/cassandra/v1/CassandraStorageExtension.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import java.util.List;
import java.util.Optional;
import java.util.concurrent.TimeUnit;
import org.junit.jupiter.api.TestInfo;
import org.junit.jupiter.api.extension.AfterAllCallback;
import org.junit.jupiter.api.extension.BeforeAllCallback;
import org.junit.jupiter.api.extension.ExtensionContext;
Expand Down Expand Up @@ -79,6 +78,7 @@ public class CassandraStorageExtension implements BeforeAllCallback, AfterAllCal
container = null; // try with local connection instead
globalSession = tryToInitializeSession(contactPoint());
}
LOGGER.info("Using contactPoint " + contactPoint());
}

// Builds a session without trying to use a namespace or init UDTs
Expand All @@ -96,10 +96,7 @@ static CqlSession tryToInitializeSession(String contactPoint) {
return session;
}

CassandraStorage.Builder newStorageBuilder(TestInfo testInfo) {
if (testInfo.getTestMethod().isPresent()) {
LOGGER.info("Building CassandraStorage for: " + testInfo.getTestMethod().get().getName());
}
CassandraStorage.Builder newStorageBuilder() {
return newStorageBuilder(contactPoint());
}

Expand Down
107 changes: 22 additions & 85 deletions ...n-storage/cassandra-v1/src/test/java/zipkin2/storage/cassandra/v1/ITCassandraStorage.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,17 @@
*/
package zipkin2.storage.cassandra.v1;

import com.datastax.oss.driver.api.core.CqlSession;
import java.io.IOException;
import java.util.List;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInfo;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.extension.RegisterExtension;
import zipkin2.Endpoint;
import zipkin2.Span;
import zipkin2.TestObjects;
import zipkin2.storage.QueryRequest;
import zipkin2.storage.StorageComponent;

import static java.util.Arrays.asList;
import static org.assertj.core.api.Assertions.assertThat;
import static zipkin2.TestObjects.TODAY;
import static zipkin2.storage.cassandra.v1.InternalForTests.writeDependencyLinks;

@TestInstance(TestInstance.Lifecycle.PER_CLASS)
Expand All @@ -53,11 +45,11 @@ class ITCassandraStorage {
@Nested
class ITTraces extends zipkin2.storage.ITTraces<CassandraStorage> {
@Override protected StorageComponent.Builder newStorageBuilder(TestInfo testInfo) {
return backend.newStorageBuilder(testInfo);
return backend.newStorageBuilder();
}

@Override @Test @Disabled("No consumer-side span deduplication")
public void getTrace_deduplicates() {
public void getTrace_deduplicates(TestInfo testInfo) {
}

@Override protected void blockWhileInFlight() {
Expand All @@ -72,57 +64,39 @@ public void getTrace_deduplicates() {
@Nested
class ITSpanStore extends zipkin2.storage.ITSpanStore<CassandraStorage> {
@Override protected StorageComponent.Builder newStorageBuilder(TestInfo testInfo) {
return backend.newStorageBuilder(testInfo);
return backend.newStorageBuilder();
}

@Override @Test @Disabled("All services query unsupported when combined with other qualifiers")
public void getTraces_tags() {
public void getTraces_tags(TestInfo testInfo) {
}

@Override @Test @Disabled("All services query unsupported when combined with other qualifiers")
public void getTraces_serviceNames() {
public void getTraces_serviceNames(TestInfo testInfo) {
}

@Override @Test @Disabled("All services query unsupported when combined with other qualifiers")
public void getTraces_spanName() {
public void getTraces_spanName(TestInfo testInfo) {
}

@Override @Test @Disabled("Duration unsupported") public void getTraces_duration() {
@Override @Test @Disabled("All services query unsupported when combined with other qualifiers")
public void getTraces_spanName_mixedTraceIdLength(TestInfo testInfo) {
}

@Override @Test @Disabled("Duration unsupported") public void getTraces_minDuration() {
@Override @Test @Disabled("Duration unsupported")
public void getTraces_duration(TestInfo testInfo) {
}

@Override @Test @Disabled("Duration unsupported") public void getTraces_maxDuration() {
@Override @Test @Disabled("Duration unsupported")
public void getTraces_minDuration(TestInfo testInfo) {
}

@Override @Test @Disabled("Duration unsupported") public void getTraces_lateDuration() {
@Override @Test @Disabled("Duration unsupported")
public void getTraces_maxDuration(TestInfo testInfo) {
}

@Test void searchingByAnnotationShouldFilterBeforeLimiting() throws IOException {
int queryLimit = 2;
int nbTraceFetched = queryLimit * storage.indexFetchMultiplier;

for (int i = 0; i < nbTraceFetched; i++) {
accept(TestObjects.LOTS_OF_SPANS[i++].toBuilder().timestamp((TODAY - i) * 1000L).build());
}

// Add two traces with the tag we're looking for before the preceding ones
Endpoint endpoint = TestObjects.LOTS_OF_SPANS[0].localEndpoint();
for (int i = 0; i < 2; i++) {
int j = nbTraceFetched + i;
accept(TestObjects.LOTS_OF_SPANS[j].toBuilder()
.timestamp((TODAY - j) * 1000L)
.localEndpoint(endpoint)
.putTag("host.name", "host1")
.build());
}
QueryRequest queryRequest = requestBuilder()
.parseAnnotationQuery("host.name=host1")
.serviceName(endpoint.serviceName())
.limit(queryLimit)
.build();
assertThat(store().getTraces(queryRequest).execute()).hasSize(queryLimit);
@Override @Test @Disabled("Duration unsupported")
public void getTraces_lateDuration(TestInfo testInfo) {
}

@Override protected void blockWhileInFlight() {
Expand All @@ -134,26 +108,10 @@ public void getTraces_spanName() {
}
}

@Nested
class ITLargeTraceTests extends zipkin2.storage.cassandra.v1.ITLargeTraceTests {
@Override protected StorageComponent.Builder newStorageBuilder(TestInfo testInfo) {
return backend.newStorageBuilder(testInfo).keyspace(InternalForTests.keyspace(testInfo));
}

@Override protected void blockWhileInFlight() {
CassandraStorageExtension.blockWhileInFlight(storage);
}

@Override public void clear() {
// Intentionally don't clean up as each method runs in an isolated keyspace. This prevents
// adding more load to the shared Cassandra instance used for all tests.
}
}

@Nested
class ITSearchEnabledFalse extends zipkin2.storage.ITSearchEnabledFalse<CassandraStorage> {
@Override protected StorageComponent.Builder newStorageBuilder(TestInfo testInfo) {
return backend.newStorageBuilder(testInfo);
return backend.newStorageBuilder();
}

@Override protected void blockWhileInFlight() {
Expand All @@ -168,7 +126,7 @@ class ITSearchEnabledFalse extends zipkin2.storage.ITSearchEnabledFalse<Cassandr
@Nested
class ITStrictTraceIdFalse extends zipkin2.storage.ITStrictTraceIdFalse<CassandraStorage> {
@Override protected StorageComponent.Builder newStorageBuilder(TestInfo testInfo) {
return backend.newStorageBuilder(testInfo);
return backend.newStorageBuilder();
}

@Override protected void blockWhileInFlight() {
Expand All @@ -183,7 +141,7 @@ class ITStrictTraceIdFalse extends zipkin2.storage.ITStrictTraceIdFalse<Cassandr
@Nested
class ITServiceAndSpanNames extends zipkin2.storage.ITServiceAndSpanNames<CassandraStorage> {
@Override protected StorageComponent.Builder newStorageBuilder(TestInfo testInfo) {
return backend.newStorageBuilder(testInfo);
return backend.newStorageBuilder();
}

@Override protected void blockWhileInFlight() {
Expand All @@ -198,7 +156,7 @@ class ITServiceAndSpanNames extends zipkin2.storage.ITServiceAndSpanNames<Cassan
@Nested
class ITAutocompleteTags extends zipkin2.storage.ITAutocompleteTags<CassandraStorage> {
@Override protected StorageComponent.Builder newStorageBuilder(TestInfo testInfo) {
return backend.newStorageBuilder(testInfo);
return backend.newStorageBuilder();
}

@Override protected void blockWhileInFlight() {
Expand All @@ -213,7 +171,7 @@ class ITAutocompleteTags extends zipkin2.storage.ITAutocompleteTags<CassandraSto
@Nested
class ITDependencies extends zipkin2.storage.ITDependencies<CassandraStorage> {
@Override protected StorageComponent.Builder newStorageBuilder(TestInfo testInfo) {
return backend.newStorageBuilder(testInfo);
return backend.newStorageBuilder();
}

@Override protected void blockWhileInFlight() {
Expand All @@ -235,31 +193,10 @@ class ITDependencies extends zipkin2.storage.ITDependencies<CassandraStorage> {
}
}

@Nested
class ITEnsureSchema extends zipkin2.storage.cassandra.v1.ITEnsureSchema {
TestInfo testInfo;

@BeforeEach void setTestInfo(TestInfo testInfo) {
this.testInfo = testInfo;
}

@Override protected String keyspace() {
return InternalForTests.keyspace(testInfo);
}

@Override protected CqlSession session() {
return backend.globalSession;
}

@Override protected String contactPoint() {
return backend.contactPoint();
}
}

@Nested
class ITSpanConsumer extends zipkin2.storage.cassandra.v1.ITSpanConsumer {
@Override protected StorageComponent.Builder newStorageBuilder(TestInfo testInfo) {
return backend.newStorageBuilder(testInfo);
return backend.newStorageBuilder();
}

@Override protected void blockWhileInFlight() {
Expand Down
Loading

0 comments on commit 3599fe5

Please sign in to comment.