Skip to content

Commit

Permalink
Fix test case
Browse files Browse the repository at this point in the history
Signed-off-by: Gagan Juneja <gjjuneja@amazon.com>
  • Loading branch information
Gagan Juneja committed Sep 26, 2023
1 parent 5f53750 commit df1429c
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import org.opensearch.common.settings.Settings;
import org.opensearch.common.util.FeatureFlags;
import org.opensearch.telemetry.metrics.MetricsTelemetry;
import org.opensearch.telemetry.metrics.OTelMetricsTelemetryTests;
import org.opensearch.telemetry.metrics.OTelMetricsTelemetry;
import org.opensearch.telemetry.tracing.OTelTracingTelemetry;
import org.opensearch.telemetry.tracing.TracingTelemetry;
import org.opensearch.test.OpenSearchTestCase;
Expand Down Expand Up @@ -65,7 +65,7 @@ public void testGetTelemetry() {
ClusterSettings.FEATURE_FLAGGED_CLUSTER_SETTINGS.get(List.of(FeatureFlags.TELEMETRY)).stream().forEach((allTracerSettings::add));
assertEquals(OTEL_TRACER_NAME, oTelTelemetryModulePlugin.getName());
assertTrue(tracingTelemetry instanceof OTelTracingTelemetry);
assertTrue(metricsTelemetry instanceof OTelMetricsTelemetryTests);
assertTrue(metricsTelemetry instanceof OTelMetricsTelemetry);
assertEquals(
Arrays.asList(
TRACER_EXPORTER_BATCH_SIZE_SETTING,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public void testCounterNegativeValue() {

Counter counter = metricsTelemetry.createCounter(counterName, description, unit);
counter.add(-1.0);
verify(mockOTelDoubleCounter).add(1.0);
verify(mockOTelDoubleCounter).add(-1.0);
}

public void testUpDownCounter() {
Expand All @@ -99,6 +99,6 @@ public void testUpDownCounter() {
verify(mockOTelUpDownDoubleCounter).add(1.0);
Attributes attributes = Attributes.create().addAttribute("test", "test");
counter.add(-2.0, attributes);
verify(mockOTelUpDownDoubleCounter).add(-2.0, OTelAttributesConverter.convert(attributes));
verify(mockOTelUpDownDoubleCounter).add((-2.0), OTelAttributesConverter.convert(attributes));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import io.opentelemetry.sdk.trace.samplers.Sampler;

import static org.opensearch.telemetry.OTelTelemetrySettings.TRACER_EXPORTER_DELAY_SETTING;
import static org.opensearch.telemetry.TelemetrySettings.METRICS_ENABLED_SETTING;
import static org.opensearch.telemetry.TelemetrySettings.TRACER_ENABLED_SETTING;
import static org.opensearch.telemetry.TelemetrySettings.TRACER_SAMPLER_PROBABILITY;

Expand All @@ -33,7 +34,7 @@ public void testDefaultGetSampler() {
Settings settings = Settings.builder().put(TRACER_EXPORTER_DELAY_SETTING.getKey(), "1s").build();
TelemetrySettings telemetrySettings = new TelemetrySettings(
Settings.EMPTY,
new ClusterSettings(settings, Set.of(TRACER_SAMPLER_PROBABILITY, TRACER_ENABLED_SETTING))
new ClusterSettings(settings, Set.of(TRACER_SAMPLER_PROBABILITY, TRACER_ENABLED_SETTING, METRICS_ENABLED_SETTING))
);

// Probabilistic Sampler
Expand All @@ -47,7 +48,7 @@ public void testGetSamplerWithUpdatedSamplingRatio() {
Settings settings = Settings.builder().put(TRACER_EXPORTER_DELAY_SETTING.getKey(), "1s").build();
TelemetrySettings telemetrySettings = new TelemetrySettings(
Settings.EMPTY,
new ClusterSettings(settings, Set.of(TRACER_SAMPLER_PROBABILITY, TRACER_ENABLED_SETTING))
new ClusterSettings(settings, Set.of(TRACER_SAMPLER_PROBABILITY, TRACER_ENABLED_SETTING, METRICS_ENABLED_SETTING))
);

// Probabilistic Sampler
Expand Down

0 comments on commit df1429c

Please sign in to comment.