Skip to content

Commit 223864b

Browse files
otelbot[bot]zeitlinger
authored andcommitted
./gradlew spotlessApply
1 parent f24095d commit 223864b

File tree

2 files changed

+34
-35
lines changed

2 files changed

+34
-35
lines changed

gcp-auth-extension/src/main/java/io/opentelemetry/contrib/gcp/auth/GcpAuthAutoConfigurationCustomizerProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public void customize(@Nonnull AutoConfigurationCustomizer autoConfiguration) {
107107
.addResourceCustomizer(GcpAuthAutoConfigurationCustomizerProvider::customizeResource);
108108
}
109109

110-
static GoogleCredentials getCredentials() {
110+
static GoogleCredentials getCredentials() {
111111
GoogleCredentials credentials;
112112
try {
113113
credentials = GoogleCredentials.getApplicationDefault();

gcp-auth-extension/src/main/java/io/opentelemetry/contrib/gcp/auth/GcpAuthCustomizerProvider.java

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/*
2+
* Copyright The OpenTelemetry Authors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
16
package io.opentelemetry.contrib.gcp.auth;
27

38
import com.google.auth.oauth2.GoogleCredentials;
@@ -34,10 +39,11 @@ public class GcpAuthCustomizerProvider implements DeclarativeConfigurationCustom
3439
public void customize(DeclarativeConfigurationCustomizer customizer) {
3540
customizer.addModelCustomizer(
3641
model -> {
37-
GoogleCredentials credentials = GcpAuthAutoConfigurationCustomizerProvider.getCredentials();
42+
GoogleCredentials credentials =
43+
GcpAuthAutoConfigurationCustomizerProvider.getCredentials();
3844
// todo pass config bridge
39-
Map<String, String> headerMap = GcpAuthAutoConfigurationCustomizerProvider.getRequiredHeaderMap(
40-
credentials, null);
45+
Map<String, String> headerMap =
46+
GcpAuthAutoConfigurationCustomizerProvider.getRequiredHeaderMap(credentials, null);
4147
customizeMeter(model, headerMap);
4248
// todo are loggers supported now (not covered in old variant)?
4349
customizeLogger(model, headerMap);
@@ -47,23 +53,21 @@ public void customize(DeclarativeConfigurationCustomizer customizer) {
4753
});
4854
}
4955

50-
private void customizeMeter(OpenTelemetryConfigurationModel model,
51-
Map<String, String> headerMap) {
56+
private void customizeMeter(
57+
OpenTelemetryConfigurationModel model, Map<String, String> headerMap) {
5258
MeterProviderModel meterProvider = model.getMeterProvider();
5359
if (meterProvider == null) {
5460
return;
5561
}
5662

5763
for (MetricReaderModel reader : meterProvider.getReaders()) {
5864
if (reader.getPeriodic() != null) {
59-
addAuth(meterModelHeaders(reader.getPeriodic().getExporter()),
60-
headerMap);
65+
addAuth(meterModelHeaders(reader.getPeriodic().getExporter()), headerMap);
6166
}
6267
}
6368
}
6469

65-
private List<List<NameStringValuePairModel>> meterModelHeaders(
66-
PushMetricExporterModel exporter) {
70+
private List<List<NameStringValuePairModel>> meterModelHeaders(PushMetricExporterModel exporter) {
6771
ArrayList<List<NameStringValuePairModel>> list = new ArrayList<>();
6872
if (exporter == null) {
6973
return list;
@@ -79,22 +83,20 @@ private List<List<NameStringValuePairModel>> meterModelHeaders(
7983
return list;
8084
}
8185

82-
private void customizeLogger(OpenTelemetryConfigurationModel model,
83-
Map<String, String> headerMap) {
86+
private void customizeLogger(
87+
OpenTelemetryConfigurationModel model, Map<String, String> headerMap) {
8488
LoggerProviderModel loggerProvider = model.getLoggerProvider();
8589
if (loggerProvider == null) {
8690
return;
8791
}
8892
for (LogRecordProcessorModel processor : loggerProvider.getProcessors()) {
8993
BatchLogRecordProcessorModel batch = processor.getBatch();
9094
if (batch != null) {
91-
addAuth(logRecordModelHeaders(batch.getExporter()),
92-
headerMap);
95+
addAuth(logRecordModelHeaders(batch.getExporter()), headerMap);
9396
}
9497
SimpleLogRecordProcessorModel simple = processor.getSimple();
9598
if (simple != null) {
96-
addAuth(logRecordModelHeaders(simple.getExporter()),
97-
headerMap);
99+
addAuth(logRecordModelHeaders(simple.getExporter()), headerMap);
98100
}
99101
}
100102
}
@@ -117,37 +119,35 @@ private List<List<NameStringValuePairModel>> logRecordModelHeaders(
117119
return list;
118120
}
119121

120-
private void customizeTracer(OpenTelemetryConfigurationModel model,
121-
Map<String, String> headerMap) {
122+
private void customizeTracer(
123+
OpenTelemetryConfigurationModel model, Map<String, String> headerMap) {
122124
TracerProviderModel tracerProvider = model.getTracerProvider();
123125
if (tracerProvider == null) {
124126
return;
125127
}
126128

127129
// todo here we would want a simplified version of the declarative config bridge
128130
// https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/javaagent-extension-api/src/main/java/io/opentelemetry/javaagent/extension/DeclarativeConfigPropertiesBridge.java
129-
// googleNode(model)
130-
131-
// if (!isSignalTargeted(SIGNAL_TYPE_TRACES, configProperties)) {
132-
// todo
133-
// String[] params = {SIGNAL_TYPE_TRACES, SIGNAL_TARGET_WARNING_FIX_SUGGESTION};
134-
// logger.log(
135-
// Level.WARNING,
136-
// "GCP Authentication Extension is not configured for signal type: {0}. {1}",
137-
// params);
138-
// return;
139-
// }
131+
// googleNode(model)
132+
133+
// if (!isSignalTargeted(SIGNAL_TYPE_TRACES, configProperties)) {
134+
// todo
135+
// String[] params = {SIGNAL_TYPE_TRACES, SIGNAL_TARGET_WARNING_FIX_SUGGESTION};
136+
// logger.log(
137+
// Level.WARNING,
138+
// "GCP Authentication Extension is not configured for signal type: {0}. {1}",
139+
// params);
140+
// return;
141+
// }
140142

141143
for (SpanProcessorModel processor : tracerProvider.getProcessors()) {
142144
BatchSpanProcessorModel batch = processor.getBatch();
143145
if (batch != null) {
144-
addAuth(spanExporterModelHeaders(batch.getExporter()),
145-
headerMap);
146+
addAuth(spanExporterModelHeaders(batch.getExporter()), headerMap);
146147
}
147148
SimpleSpanProcessorModel simple = processor.getSimple();
148149
if (simple != null) {
149-
addAuth(spanExporterModelHeaders(simple.getExporter()),
150-
headerMap);
150+
addAuth(spanExporterModelHeaders(simple.getExporter()), headerMap);
151151
}
152152
}
153153
}
@@ -176,8 +176,7 @@ private List<List<NameStringValuePairModel>> spanExporterModelHeaders(
176176

177177
private void addAuth(
178178
List<List<NameStringValuePairModel>> headerConsumers, Map<String, String> headerMap) {
179-
headerConsumers.forEach(
180-
headers -> addHeaders(headers, headerMap));
179+
headerConsumers.forEach(headers -> addHeaders(headers, headerMap));
181180
}
182181

183182
private void addHeaders(List<NameStringValuePairModel> headers, Map<String, String> add) {

0 commit comments

Comments
 (0)