-
Notifications
You must be signed in to change notification settings - Fork 314
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Introduce labels to metrics and add them to v2 metrics endpoint.
Signed-off-by: Jakub Dardzinski <[email protected]>
- Loading branch information
1 parent
89ef52f
commit dfea8a7
Showing
9 changed files
with
144 additions
and
117 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
35 changes: 35 additions & 0 deletions
35
api/src/main/java/marquez/logging/DelegatingSqlLogger.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,35 @@ | ||
| /* | ||
| * Copyright 2018-2023 contributors to the Marquez project | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package marquez.logging; | ||
|
|
||
| import java.sql.SQLException; | ||
| import java.util.Arrays; | ||
| import java.util.List; | ||
| import org.jdbi.v3.core.statement.SqlLogger; | ||
| import org.jdbi.v3.core.statement.StatementContext; | ||
|
|
||
| /** A {@link SqlLogger} implementation that delegates to multiple {@link SqlLogger}s. */ | ||
| public class DelegatingSqlLogger implements SqlLogger { | ||
| private final List<SqlLogger> sqlLoggers; | ||
|
|
||
| public DelegatingSqlLogger(SqlLogger... sqlLoggers) { | ||
| this.sqlLoggers = Arrays.asList(sqlLoggers); | ||
| } | ||
|
|
||
| @Override | ||
| public void logAfterExecution(StatementContext statementContext) { | ||
| for (SqlLogger sqlLogger : sqlLoggers) { | ||
| sqlLogger.logAfterExecution(statementContext); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void logException(StatementContext statementContext, SQLException ex) { | ||
| for (SqlLogger sqlLogger : sqlLoggers) { | ||
| sqlLogger.logException(statementContext, ex); | ||
| } | ||
| } | ||
| } |
33 changes: 0 additions & 33 deletions
33
api/src/main/java/marquez/logging/EndpointNameStrategy.java
This file was deleted.
Oops, something went wrong.
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,63 @@ | ||
| /* | ||
| * Copyright 2018-2023 contributors to the Marquez project | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package marquez.logging; | ||
|
|
||
| import io.prometheus.client.CollectorRegistry; | ||
| import io.prometheus.client.Histogram; | ||
| import java.sql.SQLException; | ||
| import java.time.temporal.ChronoUnit; | ||
| import org.jdbi.v3.core.extension.ExtensionMethod; | ||
| import org.jdbi.v3.core.statement.SqlLogger; | ||
| import org.jdbi.v3.core.statement.StatementContext; | ||
| import org.slf4j.MDC; | ||
|
|
||
| /** | ||
| * A {@link SqlLogger} implementation for JDBI which uses the SQL objects' class names and method | ||
| * names for nanosecond-precision timers. | ||
| */ | ||
| public class LabelledSqlLogger implements SqlLogger { | ||
| private final Histogram metric; | ||
|
|
||
| public LabelledSqlLogger() { | ||
| this(CollectorRegistry.defaultRegistry); | ||
| } | ||
|
|
||
| public LabelledSqlLogger(CollectorRegistry registry) { | ||
| this.metric = | ||
| Histogram.build() | ||
| .namespace("marquez") | ||
| .labelNames("object_name", "method_name", "endpoint_method", "endpoint_path") | ||
| .name("sql_duration_seconds") | ||
| .help("SQL execution duration in seconds") | ||
| .register(registry); | ||
| } | ||
|
|
||
| @Override | ||
| public void logAfterExecution(StatementContext context) { | ||
| log(context); | ||
| } | ||
|
|
||
| @Override | ||
| public void logException(StatementContext context, SQLException ex) { | ||
| log(context); | ||
| } | ||
|
|
||
| private void log(StatementContext context) { | ||
| ExtensionMethod extensionMethod = context.getExtensionMethod(); | ||
| if (extensionMethod != null) { | ||
| final long elapsed = context.getElapsedTime(ChronoUnit.NANOS); | ||
| if (MDC.get("method") != null && MDC.get("pathWithParams") != null) { | ||
| metric | ||
| .labels( | ||
| extensionMethod.getType().getName(), | ||
| extensionMethod.getMethod().getName(), | ||
| MDC.get("method"), | ||
| MDC.get("pathWithParams")) | ||
| .observe(elapsed / 1e9); | ||
| } | ||
| } | ||
| } | ||
| } |
20 changes: 0 additions & 20 deletions
20
api/src/main/java/marquez/logging/MarquezMetricNameStrategy.java
This file was deleted.
Oops, something went wrong.
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