diff --git a/pom.xml b/pom.xml index 6dc7f140da2..77ab83243d7 100755 --- a/pom.xml +++ b/pom.xml @@ -78,7 +78,7 @@ 5.1.0 1.7.36 1.10.4 - 7.0.0 + 4.9.10 4.13.2 diff --git a/zipkin-collector/rabbitmq/pom.xml b/zipkin-collector/rabbitmq/pom.xml index 1332cbf9434..3193286e6a8 100644 --- a/zipkin-collector/rabbitmq/pom.xml +++ b/zipkin-collector/rabbitmq/pom.xml @@ -29,6 +29,7 @@ ${project.basedir}/../.. + 4.12.0 diff --git a/zipkin-storage/mysql-v1/pom.xml b/zipkin-storage/mysql-v1/pom.xml index 0aff0ee8329..26f80cb3885 100644 --- a/zipkin-storage/mysql-v1/pom.xml +++ b/zipkin-storage/mysql-v1/pom.xml @@ -29,7 +29,9 @@ ${project.basedir}/../.. - 3.18.7 + + 3.14.16 -Xep:InconsistentCapitalization:OFF diff --git a/zipkin-storage/mysql-v1/src/main/java/zipkin2/storage/mysql/v1/internal/generated/DefaultCatalog.java b/zipkin-storage/mysql-v1/src/main/java/zipkin2/storage/mysql/v1/internal/generated/DefaultCatalog.java index 0babcad24c9..508a252b309 100644 --- a/zipkin-storage/mysql-v1/src/main/java/zipkin2/storage/mysql/v1/internal/generated/DefaultCatalog.java +++ b/zipkin-storage/mysql-v1/src/main/java/zipkin2/storage/mysql/v1/internal/generated/DefaultCatalog.java @@ -7,7 +7,6 @@ import java.util.Arrays; import java.util.List; -import org.jooq.Constants; import org.jooq.Schema; import org.jooq.impl.CatalogImpl; @@ -39,16 +38,7 @@ private DefaultCatalog() { @Override public final List getSchemas() { - return Arrays.asList( - Zipkin.ZIPKIN - ); + return Arrays.asList( + Zipkin.ZIPKIN); } - - /** - * A reference to the 3.18 minor release of the code generator. If this - * doesn't compile, it's because the runtime library uses an older minor - * release, namely: 3.18. You can turn off the generation of this reference - * by specifying /configuration/generator/generate/jooqVersionReference - */ - private static final String REQUIRE_RUNTIME_JOOQ_VERSION = Constants.VERSION_3_18; } diff --git a/zipkin-storage/mysql-v1/src/main/java/zipkin2/storage/mysql/v1/internal/generated/Keys.java b/zipkin-storage/mysql-v1/src/main/java/zipkin2/storage/mysql/v1/internal/generated/Keys.java index b406a696afd..7986fb0cd62 100644 --- a/zipkin-storage/mysql-v1/src/main/java/zipkin2/storage/mysql/v1/internal/generated/Keys.java +++ b/zipkin-storage/mysql-v1/src/main/java/zipkin2/storage/mysql/v1/internal/generated/Keys.java @@ -16,7 +16,7 @@ /** - * A class modelling foreign key relationships and constraints of tables in + * A class modelling foreign key relationships and constraints of tables in * zipkin. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) diff --git a/zipkin-storage/mysql-v1/src/main/java/zipkin2/storage/mysql/v1/internal/generated/Zipkin.java b/zipkin-storage/mysql-v1/src/main/java/zipkin2/storage/mysql/v1/internal/generated/Zipkin.java index 0da98e4c9ed..10d159c1fe8 100644 --- a/zipkin-storage/mysql-v1/src/main/java/zipkin2/storage/mysql/v1/internal/generated/Zipkin.java +++ b/zipkin-storage/mysql-v1/src/main/java/zipkin2/storage/mysql/v1/internal/generated/Zipkin.java @@ -59,10 +59,9 @@ public Catalog getCatalog() { @Override public final List> getTables() { - return Arrays.asList( + return Arrays.>asList( ZipkinAnnotations.ZIPKIN_ANNOTATIONS, ZipkinDependencies.ZIPKIN_DEPENDENCIES, - ZipkinSpans.ZIPKIN_SPANS - ); + ZipkinSpans.ZIPKIN_SPANS); } } diff --git a/zipkin-storage/mysql-v1/src/main/java/zipkin2/storage/mysql/v1/internal/generated/tables/ZipkinAnnotations.java b/zipkin-storage/mysql-v1/src/main/java/zipkin2/storage/mysql/v1/internal/generated/tables/ZipkinAnnotations.java index 06c90c6f08c..31f56b170a4 100644 --- a/zipkin-storage/mysql-v1/src/main/java/zipkin2/storage/mysql/v1/internal/generated/tables/ZipkinAnnotations.java +++ b/zipkin-storage/mysql-v1/src/main/java/zipkin2/storage/mysql/v1/internal/generated/tables/ZipkinAnnotations.java @@ -48,68 +48,57 @@ public Class getRecordType() { } /** - * The column zipkin.zipkin_annotations.trace_id_high. If non - * zero, this means the trace uses 128 bit traceIds instead of 64 bit + * The column zipkin.zipkin_annotations.trace_id_high. If non zero, this means the trace uses 128 bit traceIds instead of 64 bit */ public final TableField TRACE_ID_HIGH = createField(DSL.name("trace_id_high"), SQLDataType.BIGINT.nullable(false).defaultValue(DSL.inline("0", SQLDataType.BIGINT)), this, "If non zero, this means the trace uses 128 bit traceIds instead of 64 bit"); /** - * The column zipkin.zipkin_annotations.trace_id. coincides - * with zipkin_spans.trace_id + * The column zipkin.zipkin_annotations.trace_id. coincides with zipkin_spans.trace_id */ public final TableField TRACE_ID = createField(DSL.name("trace_id"), SQLDataType.BIGINT.nullable(false), this, "coincides with zipkin_spans.trace_id"); /** - * The column zipkin.zipkin_annotations.span_id. coincides with - * zipkin_spans.id + * The column zipkin.zipkin_annotations.span_id. coincides with zipkin_spans.id */ public final TableField SPAN_ID = createField(DSL.name("span_id"), SQLDataType.BIGINT.nullable(false), this, "coincides with zipkin_spans.id"); /** - * The column zipkin.zipkin_annotations.a_key. - * BinaryAnnotation.key or Annotation.value if type == -1 + * The column zipkin.zipkin_annotations.a_key. BinaryAnnotation.key or Annotation.value if type == -1 */ public final TableField A_KEY = createField(DSL.name("a_key"), SQLDataType.VARCHAR(255).nullable(false), this, "BinaryAnnotation.key or Annotation.value if type == -1"); /** - * The column zipkin.zipkin_annotations.a_value. - * BinaryAnnotation.value(), which must be smaller than 64KB + * The column zipkin.zipkin_annotations.a_value. BinaryAnnotation.value(), which must be smaller than 64KB */ public final TableField A_VALUE = createField(DSL.name("a_value"), SQLDataType.BLOB, this, "BinaryAnnotation.value(), which must be smaller than 64KB"); /** - * The column zipkin.zipkin_annotations.a_type. - * BinaryAnnotation.type() or -1 if Annotation + * The column zipkin.zipkin_annotations.a_type. BinaryAnnotation.type() or -1 if Annotation */ public final TableField A_TYPE = createField(DSL.name("a_type"), SQLDataType.INTEGER.nullable(false), this, "BinaryAnnotation.type() or -1 if Annotation"); /** - * The column zipkin.zipkin_annotations.a_timestamp. Used to - * implement TTL; Annotation.timestamp or zipkin_spans.timestamp + * The column zipkin.zipkin_annotations.a_timestamp. Used to implement TTL; Annotation.timestamp or zipkin_spans.timestamp */ public final TableField A_TIMESTAMP = createField(DSL.name("a_timestamp"), SQLDataType.BIGINT, this, "Used to implement TTL; Annotation.timestamp or zipkin_spans.timestamp"); /** - * The column zipkin.zipkin_annotations.endpoint_ipv4. Null - * when Binary/Annotation.endpoint is null + * The column zipkin.zipkin_annotations.endpoint_ipv4. Null when Binary/Annotation.endpoint is null */ public final TableField ENDPOINT_IPV4 = createField(DSL.name("endpoint_ipv4"), SQLDataType.INTEGER, this, "Null when Binary/Annotation.endpoint is null"); /** - * The column zipkin.zipkin_annotations.endpoint_ipv6. Null - * when Binary/Annotation.endpoint is null, or no IPv6 address + * The column zipkin.zipkin_annotations.endpoint_ipv6. Null when Binary/Annotation.endpoint is null, or no IPv6 address */ public final TableField ENDPOINT_IPV6 = createField(DSL.name("endpoint_ipv6"), SQLDataType.BINARY(16), this, "Null when Binary/Annotation.endpoint is null, or no IPv6 address"); /** - * The column zipkin.zipkin_annotations.endpoint_port. Null - * when Binary/Annotation.endpoint is null + * The column zipkin.zipkin_annotations.endpoint_port. Null when Binary/Annotation.endpoint is null */ public final TableField ENDPOINT_PORT = createField(DSL.name("endpoint_port"), SQLDataType.SMALLINT, this, "Null when Binary/Annotation.endpoint is null"); /** - * The column zipkin.zipkin_annotations.endpoint_service_name. - * Null when Binary/Annotation.endpoint is null + * The column zipkin.zipkin_annotations.endpoint_service_name. Null when Binary/Annotation.endpoint is null */ public final TableField ENDPOINT_SERVICE_NAME = createField(DSL.name("endpoint_service_name"), SQLDataType.VARCHAR(255), this, "Null when Binary/Annotation.endpoint is null"); @@ -148,17 +137,17 @@ public ZipkinAnnotations(Table child, ForeignKey getIndexes() { - return Arrays.asList(Indexes.ZIPKIN_ANNOTATIONS_A_KEY, Indexes.ZIPKIN_ANNOTATIONS_A_TYPE, Indexes.ZIPKIN_ANNOTATIONS_ENDPOINT_SERVICE_NAME, Indexes.ZIPKIN_ANNOTATIONS_TRACE_ID, Indexes.ZIPKIN_ANNOTATIONS_TRACE_ID_HIGH_2, Indexes.ZIPKIN_ANNOTATIONS_TRACE_ID_HIGH_3); + return Arrays.asList(Indexes.ZIPKIN_ANNOTATIONS_A_KEY, Indexes.ZIPKIN_ANNOTATIONS_A_TYPE, Indexes.ZIPKIN_ANNOTATIONS_ENDPOINT_SERVICE_NAME, Indexes.ZIPKIN_ANNOTATIONS_TRACE_ID, Indexes.ZIPKIN_ANNOTATIONS_TRACE_ID_HIGH_2, Indexes.ZIPKIN_ANNOTATIONS_TRACE_ID_HIGH_3); } @Override - public List> getUniqueKeys() { - return Arrays.asList(Keys.KEY_ZIPKIN_ANNOTATIONS_TRACE_ID_HIGH); + public List> getKeys() { + return Arrays.>asList(Keys.KEY_ZIPKIN_ANNOTATIONS_TRACE_ID_HIGH); } @Override @@ -171,11 +160,6 @@ public ZipkinAnnotations as(Name alias) { return new ZipkinAnnotations(alias, this); } - @Override - public ZipkinAnnotations as(Table alias) { - return new ZipkinAnnotations(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -191,12 +175,4 @@ public ZipkinAnnotations rename(String name) { public ZipkinAnnotations rename(Name name) { return new ZipkinAnnotations(name, null); } - - /** - * Rename this table - */ - @Override - public ZipkinAnnotations rename(Table name) { - return new ZipkinAnnotations(name.getQualifiedName(), null); - } } diff --git a/zipkin-storage/mysql-v1/src/main/java/zipkin2/storage/mysql/v1/internal/generated/tables/ZipkinDependencies.java b/zipkin-storage/mysql-v1/src/main/java/zipkin2/storage/mysql/v1/internal/generated/tables/ZipkinDependencies.java index eb6de94e12b..185abce139b 100644 --- a/zipkin-storage/mysql-v1/src/main/java/zipkin2/storage/mysql/v1/internal/generated/tables/ZipkinDependencies.java +++ b/zipkin-storage/mysql-v1/src/main/java/zipkin2/storage/mysql/v1/internal/generated/tables/ZipkinDependencies.java @@ -5,6 +5,8 @@ import java.time.LocalDate; +import java.util.Arrays; +import java.util.List; import org.jooq.Field; import org.jooq.ForeignKey; @@ -104,7 +106,7 @@ public ZipkinDependencies(Table child, ForeignKey getPrimaryKey() { return Keys.KEY_ZIPKIN_DEPENDENCIES_PRIMARY; } + @Override + public List> getKeys() { + return Arrays.>asList(Keys.KEY_ZIPKIN_DEPENDENCIES_PRIMARY); + } + @Override public ZipkinDependencies as(String alias) { return new ZipkinDependencies(DSL.name(alias), this); @@ -122,11 +129,6 @@ public ZipkinDependencies as(Name alias) { return new ZipkinDependencies(alias, this); } - @Override - public ZipkinDependencies as(Table alias) { - return new ZipkinDependencies(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -142,12 +144,4 @@ public ZipkinDependencies rename(String name) { public ZipkinDependencies rename(Name name) { return new ZipkinDependencies(name, null); } - - /** - * Rename this table - */ - @Override - public ZipkinDependencies rename(Table name) { - return new ZipkinDependencies(name.getQualifiedName(), null); - } } diff --git a/zipkin-storage/mysql-v1/src/main/java/zipkin2/storage/mysql/v1/internal/generated/tables/ZipkinSpans.java b/zipkin-storage/mysql-v1/src/main/java/zipkin2/storage/mysql/v1/internal/generated/tables/ZipkinSpans.java index de8cf301ff4..49ad4e06efd 100644 --- a/zipkin-storage/mysql-v1/src/main/java/zipkin2/storage/mysql/v1/internal/generated/tables/ZipkinSpans.java +++ b/zipkin-storage/mysql-v1/src/main/java/zipkin2/storage/mysql/v1/internal/generated/tables/ZipkinSpans.java @@ -48,8 +48,7 @@ public Class getRecordType() { } /** - * The column zipkin.zipkin_spans.trace_id_high. If non zero, - * this means the trace uses 128 bit traceIds instead of 64 bit + * The column zipkin.zipkin_spans.trace_id_high. If non zero, this means the trace uses 128 bit traceIds instead of 64 bit */ public final TableField TRACE_ID_HIGH = createField(DSL.name("trace_id_high"), SQLDataType.BIGINT.nullable(false).defaultValue(DSL.inline("0", SQLDataType.BIGINT)), this, "If non zero, this means the trace uses 128 bit traceIds instead of 64 bit"); @@ -84,14 +83,12 @@ public Class getRecordType() { public final TableField DEBUG = createField(DSL.name("debug"), SQLDataType.BIT, this, ""); /** - * The column zipkin.zipkin_spans.start_ts. Span.timestamp(): - * epoch micros used for endTs query and to implement TTL + * The column zipkin.zipkin_spans.start_ts. Span.timestamp(): epoch micros used for endTs query and to implement TTL */ public final TableField START_TS = createField(DSL.name("start_ts"), SQLDataType.BIGINT, this, "Span.timestamp(): epoch micros used for endTs query and to implement TTL"); /** - * The column zipkin.zipkin_spans.duration. Span.duration(): - * micros used for minDuration and maxDuration query + * The column zipkin.zipkin_spans.duration. Span.duration(): micros used for minDuration and maxDuration query */ public final TableField DURATION = createField(DSL.name("duration"), SQLDataType.BIGINT, this, "Span.duration(): micros used for minDuration and maxDuration query"); @@ -130,12 +127,12 @@ public ZipkinSpans(Table child, ForeignKey key) @Override public Schema getSchema() { - return aliased() ? null : Zipkin.ZIPKIN; + return Zipkin.ZIPKIN; } @Override public List getIndexes() { - return Arrays.asList(Indexes.ZIPKIN_SPANS_NAME, Indexes.ZIPKIN_SPANS_REMOTE_SERVICE_NAME, Indexes.ZIPKIN_SPANS_START_TS, Indexes.ZIPKIN_SPANS_TRACE_ID_HIGH); + return Arrays.asList(Indexes.ZIPKIN_SPANS_NAME, Indexes.ZIPKIN_SPANS_REMOTE_SERVICE_NAME, Indexes.ZIPKIN_SPANS_START_TS, Indexes.ZIPKIN_SPANS_TRACE_ID_HIGH); } @Override @@ -143,6 +140,11 @@ public UniqueKey getPrimaryKey() { return Keys.KEY_ZIPKIN_SPANS_PRIMARY; } + @Override + public List> getKeys() { + return Arrays.>asList(Keys.KEY_ZIPKIN_SPANS_PRIMARY); + } + @Override public ZipkinSpans as(String alias) { return new ZipkinSpans(DSL.name(alias), this); @@ -153,11 +155,6 @@ public ZipkinSpans as(Name alias) { return new ZipkinSpans(alias, this); } - @Override - public ZipkinSpans as(Table alias) { - return new ZipkinSpans(alias.getQualifiedName(), this); - } - /** * Rename this table */ @@ -173,12 +170,4 @@ public ZipkinSpans rename(String name) { public ZipkinSpans rename(Name name) { return new ZipkinSpans(name, null); } - - /** - * Rename this table - */ - @Override - public ZipkinSpans rename(Table name) { - return new ZipkinSpans(name.getQualifiedName(), null); - } }