Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Removing metrics service implementation #133

Merged
merged 3 commits into from
Aug 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions phileas-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,6 @@
<artifactId>phileas-processors-images</artifactId>
<version>${project.version}</version>
</dependency>-->
<dependency>
<groupId>ai.philterd</groupId>
<artifactId>phileas-services-metrics</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>ai.philterd</groupId>
<artifactId>phileas-services-disambiguation</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
*/
package ai.philterd.phileas.services;

import ai.philterd.phileas.metrics.PhileasMetricsService;
import ai.philterd.phileas.model.configuration.PhileasConfiguration;
import ai.philterd.phileas.model.domain.Domain;
import ai.philterd.phileas.model.domain.HealthDomain;
Expand All @@ -38,6 +37,7 @@
import ai.philterd.phileas.services.alerts.AlertServiceFactory;
import ai.philterd.phileas.services.anonymization.cache.AnonymizationCacheServiceFactory;
import ai.philterd.phileas.services.disambiguation.VectorBasedSpanDisambiguationService;
import ai.philterd.phileas.services.metrics.NoOpMetricsService;
import ai.philterd.phileas.services.policies.LocalPolicyService;
import ai.philterd.phileas.services.policies.S3PolicyService;
import ai.philterd.phileas.services.policies.utils.PolicyUtils;
Expand Down Expand Up @@ -76,6 +76,10 @@ public class PhileasFilterService implements FilterService {
//private final ImageProcessor imageProcessor;

public PhileasFilterService(final PhileasConfiguration phileasConfiguration) throws IOException {
this(phileasConfiguration, new NoOpMetricsService());
}

public PhileasFilterService(final PhileasConfiguration phileasConfiguration, final MetricsService metricsService) throws IOException {

LOGGER.info("Initializing Phileas engine.");

Expand All @@ -86,9 +90,6 @@ public PhileasFilterService(final PhileasConfiguration phileasConfiguration) thr
gsonBuilder.registerTypeAdapter(String.class, new PlaceholderDeserializer());
final Gson gson = gsonBuilder.create();

// Configure metrics.
MetricsService metricsService = new PhileasMetricsService(phileasConfiguration);

// Set the policy services.
this.policyService = buildPolicyService(phileasConfiguration);
this.policyUtils = new PolicyUtils(policyService, gson);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
/*
* Copyright 2024 Philterd, LLC @ https://www.philterd.ai
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package ai.philterd.phileas.services.metrics;

import ai.philterd.phileas.model.enums.FilterType;
import ai.philterd.phileas.model.services.MetricsService;

/**
* An implementation of {@link MetricsService} that does nothing with the metrics.
*/
public class NoOpMetricsService implements MetricsService {

@Override
public void incrementProcessed() {

}

@Override
public void incrementProcessed(long count) {

}

@Override
public void incrementFilterType(FilterType filterType) {

}

@Override
public void logFilterTime(FilterType filterType, long timeMs) {

}

}
Original file line number Diff line number Diff line change
Expand Up @@ -145,59 +145,6 @@ public String policiesS3Region() {
return getProperty("filter.policies.s3.region", "us-east-1");
}

// Metrics

public String metricsPrefix() {
return getProperty("metrics.prefix", applicationName);
}

// See: https://github.com/micrometer-metrics/micrometer/blob/master/implementations/micrometer-registry-prometheus/src/main/java/io/micrometer/prometheus/PrometheusConfig.java
// The step size to use in computing windowed statistics like max. The default is 1 minute.
// To get the most out of these statistics, align the step interval to be close to your scrape interval.
public int metricsStep() {
return Integer.parseInt(getProperty("metrics.step", "60"));
}

public boolean metricsJmxEnabled() {
return Boolean.parseBoolean(getProperty("metrics.jmx.enabled", "false"));
}

public boolean metricsPrometheusEnabled() {
return Boolean.parseBoolean(getProperty("metrics.prometheus.enabled", "false"));
}

public int metricsPrometheusPort() {
return Integer.parseInt(getProperty("metrics.prometheus.port", "9100"));
}

public String metricsPrometheusContext() {
return getProperty("metrics.prometheus.context", "metrics");
}

public boolean metricsDataDogEnabled() {
return Boolean.parseBoolean(getProperty("metrics.datadog.enabled", "false"));
}

public String metricsDataDogApiKey() {
return getProperty("metrics.datadog.apikey", "metrics");
}

public boolean metricsCloudWatchEnabled() {
return Boolean.parseBoolean(getProperty("metrics.cloudwatch.enabled", "false"));
}

public String metricsCloudWatchRegion() {
return String.valueOf(getProperty("metrics.cloudwatch.region", "us-east-1"));
}

public String metricsCloudWatchNamespace() {
return String.valueOf(getProperty("metrics.cloudwatch.namespace", applicationName));
}

public String metricsHostname() {
return String.valueOf(getProperty("metrics.hostname", ""));
}

private String getProperty(final String property, final String defaultValue) {

final String environmentVariableValue = getEnvironmentVariable(property);
Expand Down
49 changes: 0 additions & 49 deletions phileas-services/phileas-services-metrics/pom.xml

This file was deleted.

Loading
Loading