Skip to content

Commit

Permalink
consistent indentation - formatting change only (#2784)
Browse files Browse the repository at this point in the history 
Signed-off-by: Henry Avetisyan <[email protected]>
  • Loading branch information
@havetisyan
havetisyan authored Oct 29, 2024
1 parent 5126a38 commit 2ee45d8
Show file tree
Hide file tree
Showing 4 changed files with 285 additions and 280 deletions.
241 changes: 122 additions & 119 deletions ...server_common/src/main/java/com/yahoo/athenz/common/metrics/impl/OpenTelemetryMetric.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,128 +25,131 @@
import io.opentelemetry.context.Context;

public class OpenTelemetryMetric implements Metric {
final Meter meter;
final Tracer tracer;

private static final String REQUEST_DOMAIN_NAME = "requestDomainName";
private static final String PRINCIPAL_DOMAIN_NAME = "principalDomainName";
private static final String HTTP_METHOD_NAME = "httpMethodName";
private static final String HTTP_STATUS = "httpStatus";
private static final String API_NAME = "apiName";

public OpenTelemetryMetric(OpenTelemetry openTelemetry) {
meter = openTelemetry.getMeter("meter");
tracer = openTelemetry.getTracer("tracer");
}

@Override
public void increment(String metric) {
LongCounter counter = meter.counterBuilder(metric).build();
counter.add(1);
}

@Override
public void increment(String metric, String requestDomainName) {
increment(metric, requestDomainName, 1);
}

@Override
public void increment(String metric, String requestDomainName, int count) {
LongCounter counter = meter.counterBuilder(metric).build();
Attributes attributes = Attributes.builder()
.put(REQUEST_DOMAIN_NAME, requestDomainName)
.build();
counter.add(count, attributes);
}

@Override
public void increment(String metric, String requestDomainName, String principalDomainName) {
increment(metric, requestDomainName, principalDomainName, 1);
}

@Override
public void increment(String metric, String requestDomainName, String principalDomainName, String httpMethod, int httpStatus, String apiName) {
LongCounter counter = meter.counterBuilder(metric).build();
Attributes attributes = Attributes.builder()
.put(REQUEST_DOMAIN_NAME, requestDomainName)
.put(PRINCIPAL_DOMAIN_NAME, principalDomainName)
.put(HTTP_METHOD_NAME, httpMethod)
.put(HTTP_STATUS, Integer.toString(httpStatus))
.put(API_NAME, apiName)
.build();
counter.add(1, attributes);
}

@Override
public void increment(String metric, String requestDomainName, String principalDomainName, int count) {
LongCounter counter = meter.counterBuilder(metric).build();
Attributes attributes = Attributes.builder()
.put(REQUEST_DOMAIN_NAME, requestDomainName)
.put(PRINCIPAL_DOMAIN_NAME, principalDomainName)
.build();
counter.add(count, attributes);
}

@Override
public Object startTiming(String metric, String requestDomainName) {
Span span = tracer.spanBuilder(metric).startSpan();
Context context = Context.current().with(span);
return new Timer(context, System.currentTimeMillis(), span);
}

@Override
public void stopTiming(Object timerMetric) {
//not necessary method
}

@Override
public void stopTiming(Object timerMetric, String requestDomainName, String principalDomainName) {
stopTiming(timerMetric, requestDomainName, principalDomainName, null, -1, null);
}

@Override
public void stopTiming(Object timerMetric, String requestDomainName, String principalDomainName,
String httpMethod, int httpStatus, String apiName) {
Timer timer = (Timer) timerMetric;
long duration = System.currentTimeMillis() - timer.start;
Span span = timer.getSpan();
span.setAttribute("duration", duration);
span.setAttribute(REQUEST_DOMAIN_NAME, requestDomainName);
span.setAttribute(PRINCIPAL_DOMAIN_NAME, principalDomainName);

if (httpMethod != null) {
span.setAttribute(HTTP_METHOD_NAME, httpMethod);
final Meter meter;
final Tracer tracer;

private static final String REQUEST_DOMAIN_NAME = "requestDomainName";
private static final String PRINCIPAL_DOMAIN_NAME = "principalDomainName";
private static final String HTTP_METHOD_NAME = "httpMethodName";
private static final String HTTP_STATUS = "httpStatus";
private static final String API_NAME = "apiName";

public OpenTelemetryMetric(OpenTelemetry openTelemetry) {
meter = openTelemetry.getMeter("meter");
tracer = openTelemetry.getTracer("tracer");
}
if (httpStatus != -1) {
span.setAttribute(HTTP_STATUS, Integer.toString(httpStatus));

@Override
public void increment(String metric) {
LongCounter counter = meter.counterBuilder(metric).build();
counter.add(1);
}

@Override
public void increment(String metric, String requestDomainName) {
increment(metric, requestDomainName, 1);
}

@Override
public void increment(String metric, String requestDomainName, int count) {
LongCounter counter = meter.counterBuilder(metric).build();
Attributes attributes = Attributes.builder()
.put(REQUEST_DOMAIN_NAME, requestDomainName)
.build();
counter.add(count, attributes);
}

@Override
public void increment(String metric, String requestDomainName, String principalDomainName) {
increment(metric, requestDomainName, principalDomainName, 1);
}

@Override
public void increment(String metric, String requestDomainName, String principalDomainName, String httpMethod,
int httpStatus, String apiName) {
LongCounter counter = meter.counterBuilder(metric).build();
Attributes attributes = Attributes.builder()
.put(REQUEST_DOMAIN_NAME, requestDomainName)
.put(PRINCIPAL_DOMAIN_NAME, principalDomainName)
.put(HTTP_METHOD_NAME, httpMethod)
.put(HTTP_STATUS, Integer.toString(httpStatus))
.put(API_NAME, apiName)
.build();
counter.add(1, attributes);
}

@Override
public void increment(String metric, String requestDomainName, String principalDomainName, int count) {
LongCounter counter = meter.counterBuilder(metric).build();
Attributes attributes = Attributes.builder()
.put(REQUEST_DOMAIN_NAME, requestDomainName)
.put(PRINCIPAL_DOMAIN_NAME, principalDomainName)
.build();
counter.add(count, attributes);
}

@Override
public Object startTiming(String metric, String requestDomainName) {
Span span = tracer.spanBuilder(metric).startSpan();
Context context = Context.current().with(span);
return new Timer(context, System.currentTimeMillis(), span);
}

@Override
public void stopTiming(Object timerMetric) {
//not necessary method
}

@Override
public void stopTiming(Object timerMetric, String requestDomainName, String principalDomainName) {
stopTiming(timerMetric, requestDomainName, principalDomainName, null, -1, null);
}

@Override
public void stopTiming(Object timerMetric, String requestDomainName, String principalDomainName,
String httpMethod, int httpStatus, String apiName) {
Timer timer = (Timer) timerMetric;
long duration = System.currentTimeMillis() - timer.start;
Span span = timer.getSpan();
span.setAttribute("duration", duration);
span.setAttribute(REQUEST_DOMAIN_NAME, requestDomainName);
span.setAttribute(PRINCIPAL_DOMAIN_NAME, principalDomainName);

if (httpMethod != null) {
span.setAttribute(HTTP_METHOD_NAME, httpMethod);
}
if (httpStatus != -1) {
span.setAttribute(HTTP_STATUS, Integer.toString(httpStatus));
}
if (apiName != null) {
span.setAttribute(API_NAME, apiName);
}
span.end();
}
if (apiName != null) {
span.setAttribute(API_NAME, apiName);

@Override
public void flush() {
//doesn't require flushing
}
span.end();
}

@Override
public void flush() {
//doesn't require flushing
}

@Override
public void quit() {
//don't need to quit anything
}

static class Timer {
private final Context context;
private final long start;
private final Span span;
public Timer(Context context, long start, Span span) {
this.context = context;
this.start = start;
this.span = span;

@Override
public void quit() {
//don't need to quit anything
}
public Span getSpan() {
return span;

static class Timer {
private final Context context;
private final long start;
private final Span span;

public Timer(Context context, long start, Span span) {
this.context = context;
this.start = start;
this.span = span;
}

public Span getSpan() {
return span;
}
}
}
}
16 changes: 8 additions & 8 deletions ...common/src/main/java/com/yahoo/athenz/common/metrics/impl/OpenTelemetryMetricFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ You need to set the endpoint (OTEL_EXPORTER_OTLP_ENDPOINT) which is defaulted to
*/

public class OpenTelemetryMetricFactory implements MetricFactory {
@Override
public Metric create() {
OpenTelemetry openTelemetry = initialize();
return new OpenTelemetryMetric(openTelemetry);
}
@Override
public Metric create() {
OpenTelemetry openTelemetry = initialize();
return new OpenTelemetryMetric(openTelemetry);
}

public OpenTelemetry initialize() {
return AutoConfiguredOpenTelemetrySdk.initialize().getOpenTelemetrySdk();
}
public OpenTelemetry initialize() {
return AutoConfiguredOpenTelemetrySdk.initialize().getOpenTelemetrySdk();
}
}
24 changes: 13 additions & 11 deletions ...on/src/test/java/com/yahoo/athenz/common/metrics/impl/OpenTelemetryMetricFactoryTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,23 @@
package com.yahoo.athenz.common.metrics.impl;

import static org.testng.Assert.*;

import com.yahoo.athenz.common.metrics.Metric;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;

public class OpenTelemetryMetricFactoryTest {
private OpenTelemetryMetricFactory factory;
private OpenTelemetryMetricFactory factory;

@BeforeMethod
public void setUp() {
factory = new OpenTelemetryMetricFactory();
}
@BeforeMethod
public void setUp() {
factory = new OpenTelemetryMetricFactory();
}

@Test
public void testCreate() {
Metric metric = factory.create();
assertNotNull(metric);
assertTrue(metric instanceof OpenTelemetryMetric);
}
@Test
public void testCreate() {
Metric metric = factory.create();
assertNotNull(metric);
assertTrue(metric instanceof OpenTelemetryMetric);
}
}
Loading

0 comments on commit 2ee45d8

Please sign in to comment.