diff --git a/airbyte-commons-worker/src/main/kotlin/io/airbyte/workers/config/StatsDRegistryConfigurer.kt b/airbyte-commons-worker/src/main/kotlin/io/airbyte/workers/config/StatsDRegistryConfigurer.kt index a163607de4c..7bce2bc1c63 100644 --- a/airbyte-commons-worker/src/main/kotlin/io/airbyte/workers/config/StatsDRegistryConfigurer.kt +++ b/airbyte-commons-worker/src/main/kotlin/io/airbyte/workers/config/StatsDRegistryConfigurer.kt @@ -35,8 +35,6 @@ class StatsDRegistryConfigurer : MeterRegistryConfigurer, O */ val tags: MutableSet = LinkedHashSet() - possiblyAddTag(DATA_DOG_ENVIRONMENT_TAG, "env", tags) - possiblyAddTag(DATA_DOG_AGENT_HOST_TAG, "host", tags) possiblyAddTag(DATA_DOG_SERVICE_TAG, "service", tags) possiblyAddTag(DATA_DOG_VERSION_TAG, "version", tags) @@ -70,8 +68,6 @@ class StatsDRegistryConfigurer : MeterRegistryConfigurer, O } companion object { - const val DATA_DOG_AGENT_HOST_TAG = "DD_AGENT_HOST" - const val DATA_DOG_ENVIRONMENT_TAG = "DD_ENV" const val DATA_DOG_SERVICE_TAG = "DD_SERVICE" const val DATA_DOG_VERSION_TAG = "DD_VERSION" } diff --git a/airbyte-workload-api-server/src/main/kotlin/io/airbyte/workload/metrics/StatsDRegistryConfigurer.kt b/airbyte-workload-api-server/src/main/kotlin/io/airbyte/workload/metrics/StatsDRegistryConfigurer.kt index 0a383d6dc3a..752bd192b5a 100644 --- a/airbyte-workload-api-server/src/main/kotlin/io/airbyte/workload/metrics/StatsDRegistryConfigurer.kt +++ b/airbyte-workload-api-server/src/main/kotlin/io/airbyte/workload/metrics/StatsDRegistryConfigurer.kt @@ -35,8 +35,6 @@ class StatsDRegistryConfigurer : MeterRegistryConfigurer, O */ val tags: MutableSet = LinkedHashSet() - possiblyAddTag(DATA_DOG_ENVIRONMENT_TAG, "env", tags) - possiblyAddTag(DATA_DOG_AGENT_HOST_TAG, "host", tags) possiblyAddTag(DATA_DOG_SERVICE_TAG, "service", tags) possiblyAddTag(DATA_DOG_VERSION_TAG, "version", tags) @@ -70,8 +68,6 @@ class StatsDRegistryConfigurer : MeterRegistryConfigurer, O } companion object { - const val DATA_DOG_AGENT_HOST_TAG = "DD_AGENT_HOST" - const val DATA_DOG_ENVIRONMENT_TAG = "DD_ENV" const val DATA_DOG_SERVICE_TAG = "DD_SERVICE" const val DATA_DOG_VERSION_TAG = "DD_VERSION" const val DATA_PLANE_ID_TAG = "data_plane_id" diff --git a/airbyte-workload-launcher/src/main/kotlin/metrics/MeterFilterFactory.kt b/airbyte-workload-launcher/src/main/kotlin/metrics/MeterFilterFactory.kt index c1097c8afb3..1eb42439fd7 100644 --- a/airbyte-workload-launcher/src/main/kotlin/metrics/MeterFilterFactory.kt +++ b/airbyte-workload-launcher/src/main/kotlin/metrics/MeterFilterFactory.kt @@ -10,38 +10,20 @@ import jakarta.inject.Singleton @Factory class MeterFilterFactory( @Value("\${airbyte.data-plane-id}") private val dataplaneId: String, - @Value("\${micronaut.application.name}") private val applicationName: String, ) { @Bean @Singleton fun addCommonTagFilter(): MeterFilter { - // TODO add all the common tags - + // Add all the common application-specific tags val commonTags = mutableListOf( Tag.of(DATA_PLANE_ID_TAG, dataplaneId), - Tag.of(DATA_DOG_SERVICE_TAG, applicationName), ) - if (!System.getenv(DATA_DOG_ENVIRONMENT_TAG).isNullOrBlank()) { - commonTags.add(Tag.of(DATA_DOG_ENVIRONMENT_TAG, System.getenv(DATA_DOG_ENVIRONMENT_TAG))) - } - - if (!System.getenv(DATA_DOG_AGENT_HOST_TAG).isNullOrBlank()) { - commonTags.add(Tag.of(DATA_DOG_AGENT_HOST_TAG, System.getenv(DATA_DOG_AGENT_HOST_TAG))) - } - - if (!System.getenv(DATA_DOG_VERSION_TAG).isNullOrBlank()) { - commonTags.add(Tag.of(DATA_DOG_VERSION_TAG, System.getenv(DATA_DOG_VERSION_TAG))) - } return MeterFilter.commonTags(commonTags) } companion object { - const val DATA_DOG_AGENT_HOST_TAG = "DD_AGENT_HOST" - const val DATA_DOG_ENVIRONMENT_TAG = "DD_ENV" - const val DATA_DOG_SERVICE_TAG = "DD_SERVICE" - const val DATA_DOG_VERSION_TAG = "DD_VERSION" const val DATA_PLANE_ID_TAG = "data_plane_id" const val STAGE_NAME_TAG = "stage_name" const val STATUS_TAG = "status"