Skip to content

Commit

Permalink
IGNITE-20752 Bump opencensus version to latest 0.31.1 (#11187)
Browse files Browse the repository at this point in the history
Co-authored-by: ZhangJian He <[email protected]>
  • Loading branch information
nao-it and shoothzj authored Jan 19, 2024
1 parent 9e2e2a6 commit b192870
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import java.util.stream.Stream;
import io.opencensus.common.Functions;
import io.opencensus.trace.AttributeValue;
import io.opencensus.trace.Span;
import io.opencensus.trace.SpanId;
import io.opencensus.trace.Tracing;
import io.opencensus.trace.export.SpanData;
Expand All @@ -40,7 +39,6 @@
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteInterruptedCheckedException;
import org.apache.ignite.internal.processors.tracing.SpanType;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.spi.tracing.Scope;
import org.apache.ignite.spi.tracing.TracingConfigurationCoordinates;
import org.apache.ignite.spi.tracing.TracingConfigurationManager;
Expand All @@ -56,6 +54,7 @@
import static org.apache.ignite.spi.tracing.Scope.COMMUNICATION;
import static org.apache.ignite.spi.tracing.Scope.EXCHANGE;
import static org.apache.ignite.spi.tracing.Scope.TX;
import static org.apache.ignite.testframework.GridTestUtils.waitForCondition;

/**
* Abstract class for open census tracing tests.
Expand All @@ -64,8 +63,17 @@ public abstract class AbstractTracingTest extends GridCommonAbstractTest {
/** Grid count. */
static final int GRID_CNT = 3;

/** Span buffer count - hardcode in open census. */
private static final int SPAN_BUFFER_COUNT = 32;
/**
* Span buffer count - hardcode in open census.
* @see ExportComponentImpl
*/
private static final int SPAN_BUFFER_COUNT = 2500;

/**
* Enforces that trace export exports data at least once every 5 seconds - hardcode in open census.
* @see ExportComponentImpl
*/
private static final long EXPORTER_SCHEDULE_DELAY = 5_000;

/** Default configuration map. */
static final Map<TracingConfigurationCoordinates, TracingConfigurationParameters> DFLT_CONFIG_MAP =
Expand Down Expand Up @@ -427,16 +435,15 @@ Stream<SpanData> spansReportedByNode(String igniteInstanceName) {
*/
void flush() throws IgniteInterruptedCheckedException {
// There is hardcoded invariant, that ended spans will be passed to exporter in 2 cases:
// By 5 seconds timeout and if buffer size exceeds 32 spans.
// By {@code EXPORTER_SCHEDULE_DELAY} seconds timeout and if buffer size exceeds {@code SPAN_BUFFER_COUNT} spans.
// There is no ability to change this behavior in Opencensus, so this hack is needed to "flush" real spans to exporter.
// @see io.opencensus.implcore.trace.export.ExportComponentImpl.
for (int i = 0; i < SPAN_BUFFER_COUNT; i++) {
Span span = Tracing.getTracer().spanBuilder("test-" + i).setSampler(Samplers.alwaysSample()).startSpan();

U.sleep(10); // See same hack in OpenCensusSpanAdapter#end() method.
for (int i = 0; i < SPAN_BUFFER_COUNT; i++)
Tracing.getTracer().spanBuilder("test-" + i).setSampler(Samplers.alwaysSample()).startSpan().end();

span.end();
}
assertTrue(waitForCondition(
() -> allSpans().anyMatch(span -> span.getName().equals("test-" + (SPAN_BUFFER_COUNT - 1))),
2 * EXPORTER_SCHEDULE_DELAY));
}

/** Clears collected spans. */
Expand Down
2 changes: 1 addition & 1 deletion parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
<zkclient.version>0.5</zkclient.version>
<zookeeper.version>3.8.3</zookeeper.version>
<zstd.version>1.5.5-5</zstd.version>
<opencensus.version>0.22.0</opencensus.version>
<opencensus.version>0.31.1</opencensus.version>
<commons.lang3.version>3.9</commons.lang3.version>
<ignite-kafka-ext.version>1.0.0</ignite-kafka-ext.version>

Expand Down

0 comments on commit b192870

Please sign in to comment.