forked from opensearch-project/OpenSearch
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Showing
38 changed files
with
714 additions
and
63 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
65 changes: 65 additions & 0 deletions
65
...alClusterTest/java/org/opensearch/telemetry/metrics/InMemorySingletonMetricsExporter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| /* | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * | ||
| * The OpenSearch Contributors require contributions made to | ||
| * this file be licensed under the Apache-2.0 license or a | ||
| * compatible open source license. | ||
| */ | ||
|
|
||
| package org.opensearch.telemetry.metrics; | ||
|
|
||
| import java.util.Collection; | ||
| import java.util.List; | ||
|
|
||
| import io.opentelemetry.sdk.common.CompletableResultCode; | ||
| import io.opentelemetry.sdk.metrics.InstrumentType; | ||
| import io.opentelemetry.sdk.metrics.data.AggregationTemporality; | ||
| import io.opentelemetry.sdk.metrics.data.MetricData; | ||
| import io.opentelemetry.sdk.metrics.export.MetricExporter; | ||
| import io.opentelemetry.sdk.testing.exporter.InMemoryMetricExporter; | ||
|
|
||
| public class InMemorySingletonMetricsExporter implements MetricExporter { | ||
|
|
||
| public static final InMemorySingletonMetricsExporter INSTANCE = new InMemorySingletonMetricsExporter(InMemoryMetricExporter.create()); | ||
|
|
||
| private static InMemoryMetricExporter delegate; | ||
|
|
||
| public static InMemorySingletonMetricsExporter create() { | ||
| return INSTANCE; | ||
| } | ||
|
|
||
| private InMemorySingletonMetricsExporter(InMemoryMetricExporter delegate) { | ||
| InMemorySingletonMetricsExporter.delegate = delegate; | ||
| } | ||
|
|
||
| @Override | ||
| public CompletableResultCode export(Collection<MetricData> metrics) { | ||
| return delegate.export(metrics); | ||
| } | ||
|
|
||
| @Override | ||
| public CompletableResultCode flush() { | ||
| return delegate.flush(); | ||
| } | ||
|
|
||
| @Override | ||
| public CompletableResultCode shutdown() { | ||
| return delegate.shutdown(); | ||
| } | ||
|
|
||
| public List<MetricData> getFinishedMetricItems() { | ||
| return delegate.getFinishedMetricItems(); | ||
| } | ||
|
|
||
| /** | ||
| * Clears the state. | ||
| */ | ||
| public void reset() { | ||
| delegate.reset(); | ||
| } | ||
|
|
||
| @Override | ||
| public AggregationTemporality getAggregationTemporality(InstrumentType instrumentType) { | ||
| return delegate.getAggregationTemporality(instrumentType); | ||
| } | ||
| } |
62 changes: 62 additions & 0 deletions
62
...alClusterTest/java/org/opensearch/telemetry/metrics/TelemetryMetricsDisabledSanityIT.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| /* | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * | ||
| * The OpenSearch Contributors require contributions made to | ||
| * this file be licensed under the Apache-2.0 license or a | ||
| * compatible open source license. | ||
| */ | ||
|
|
||
| package org.opensearch.telemetry.metrics; | ||
|
|
||
| import org.opensearch.common.settings.Settings; | ||
| import org.opensearch.common.unit.TimeValue; | ||
| import org.opensearch.plugins.Plugin; | ||
| import org.opensearch.telemetry.IntegrationTestOTelTelemetryPlugin; | ||
| import org.opensearch.telemetry.OTelTelemetrySettings; | ||
| import org.opensearch.telemetry.TelemetrySettings; | ||
| import org.opensearch.telemetry.metrics.noop.NoopCounter; | ||
| import org.opensearch.telemetry.metrics.noop.NoopMetricsRegistry; | ||
| import org.opensearch.test.OpenSearchIntegTestCase; | ||
|
|
||
| import java.util.Arrays; | ||
| import java.util.Collection; | ||
|
|
||
| @OpenSearchIntegTestCase.ClusterScope(scope = OpenSearchIntegTestCase.Scope.TEST, minNumDataNodes = 1) | ||
| public class TelemetryMetricsDisabledSanityIT extends OpenSearchIntegTestCase { | ||
|
|
||
| @Override | ||
| protected Settings nodeSettings(int nodeOrdinal) { | ||
| return Settings.builder() | ||
| .put(super.nodeSettings(nodeOrdinal)) | ||
| .put(TelemetrySettings.METRICS_FEATURE_ENABLED_SETTING.getKey(), false) | ||
| .put( | ||
| OTelTelemetrySettings.OTEL_METRICS_EXPORTER_CLASS_SETTING.getKey(), | ||
| "org.opensearch.telemetry.metrics.InMemorySingletonMetricsExporter" | ||
| ) | ||
| .put(TelemetrySettings.METRICS_PUBLISH_INTERVAL_SETTING.getKey(), TimeValue.timeValueSeconds(1)) | ||
| .build(); | ||
| } | ||
|
|
||
| @Override | ||
| protected Collection<Class<? extends Plugin>> nodePlugins() { | ||
| return Arrays.asList(IntegrationTestOTelTelemetryPlugin.class); | ||
| } | ||
|
|
||
| @Override | ||
| protected boolean addMockTelemetryPlugin() { | ||
| return false; | ||
| } | ||
|
|
||
| public void testSanityChecksWhenMetricsDisabled() throws Exception { | ||
| MetricsRegistry metricsRegistry = internalCluster().getInstance(MetricsRegistry.class); | ||
|
|
||
| Counter counter = metricsRegistry.createCounter("test-counter", "test", "1"); | ||
| counter.add(1.0); | ||
|
|
||
| Thread.sleep(2000); | ||
|
|
||
| assertTrue(metricsRegistry instanceof NoopMetricsRegistry); | ||
| assertTrue(counter instanceof NoopCounter); | ||
| } | ||
|
|
||
| } |
99 changes: 99 additions & 0 deletions
99
...nalClusterTest/java/org/opensearch/telemetry/metrics/TelemetryMetricsEnabledSanityIT.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| /* | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| * | ||
| * The OpenSearch Contributors require contributions made to | ||
| * this file be licensed under the Apache-2.0 license or a | ||
| * compatible open source license. | ||
| */ | ||
|
|
||
| package org.opensearch.telemetry.metrics; | ||
|
|
||
| import org.opensearch.common.settings.Settings; | ||
| import org.opensearch.common.unit.TimeValue; | ||
| import org.opensearch.plugins.Plugin; | ||
| import org.opensearch.telemetry.IntegrationTestOTelTelemetryPlugin; | ||
| import org.opensearch.telemetry.OTelTelemetrySettings; | ||
| import org.opensearch.telemetry.TelemetrySettings; | ||
| import org.opensearch.test.OpenSearchIntegTestCase; | ||
| import org.junit.After; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Arrays; | ||
| import java.util.Collection; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| import io.opentelemetry.sdk.metrics.data.DoublePointData; | ||
|
|
||
| @OpenSearchIntegTestCase.ClusterScope(scope = OpenSearchIntegTestCase.Scope.SUITE, minNumDataNodes = 1) | ||
| public class TelemetryMetricsEnabledSanityIT extends OpenSearchIntegTestCase { | ||
|
|
||
| @Override | ||
| protected Settings nodeSettings(int nodeOrdinal) { | ||
| return Settings.builder() | ||
| .put(super.nodeSettings(nodeOrdinal)) | ||
| .put(TelemetrySettings.METRICS_FEATURE_ENABLED_SETTING.getKey(), true) | ||
| .put( | ||
| OTelTelemetrySettings.OTEL_METRICS_EXPORTER_CLASS_SETTING.getKey(), | ||
| "org.opensearch.telemetry.metrics.InMemorySingletonMetricsExporter" | ||
| ) | ||
| .put(TelemetrySettings.METRICS_PUBLISH_INTERVAL_SETTING.getKey(), TimeValue.timeValueSeconds(1)) | ||
| .build(); | ||
| } | ||
|
|
||
| @Override | ||
| protected Collection<Class<? extends Plugin>> nodePlugins() { | ||
| return Arrays.asList(IntegrationTestOTelTelemetryPlugin.class); | ||
| } | ||
|
|
||
| @Override | ||
| protected boolean addMockTelemetryPlugin() { | ||
| return false; | ||
| } | ||
|
|
||
| public void testCounter() throws Exception { | ||
| MetricsRegistry metricsRegistry = internalCluster().getInstance(MetricsRegistry.class); | ||
| InMemorySingletonMetricsExporter.INSTANCE.reset(); | ||
|
|
||
| Counter counter = metricsRegistry.createCounter("test-counter", "test", "1"); | ||
| counter.add(1.0); | ||
| // Sleep for about 2s to wait for metrics to be published. | ||
| Thread.sleep(2000); | ||
|
|
||
| InMemorySingletonMetricsExporter exporter = InMemorySingletonMetricsExporter.INSTANCE; | ||
| double value = ((DoublePointData) ((ArrayList) exporter.getFinishedMetricItems() | ||
| .stream() | ||
| .filter(a -> a.getName().equals("test-counter")) | ||
| .collect(Collectors.toList()) | ||
| .get(0) | ||
| .getDoubleSumData() | ||
| .getPoints()).get(0)).getValue(); | ||
| assertEquals(1.0, value, 0.0); | ||
| } | ||
|
|
||
| public void testUpDownCounter() throws Exception { | ||
|
|
||
| MetricsRegistry metricsRegistry = internalCluster().getInstance(MetricsRegistry.class); | ||
| InMemorySingletonMetricsExporter.INSTANCE.reset(); | ||
|
|
||
| Counter counter = metricsRegistry.createUpDownCounter("test-up-down-counter", "test", "1"); | ||
| counter.add(1.0); | ||
| counter.add(-2.0); | ||
| // Sleep for about 2s to wait for metrics to be published. | ||
| Thread.sleep(2000); | ||
|
|
||
| InMemorySingletonMetricsExporter exporter = InMemorySingletonMetricsExporter.INSTANCE; | ||
| double value = ((DoublePointData) ((ArrayList) exporter.getFinishedMetricItems() | ||
| .stream() | ||
| .filter(a -> a.getName().equals("test-up-down-counter")) | ||
| .collect(Collectors.toList()) | ||
| .get(0) | ||
| .getDoubleSumData() | ||
| .getPoints()).get(0)).getValue(); | ||
| assertEquals(-1.0, value, 0.0); | ||
| } | ||
|
|
||
| @After | ||
| public void reset() { | ||
| InMemorySingletonMetricsExporter.INSTANCE.reset(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.