Skip to content

Commit 6ab1101

Browse files
tschuttschut
committed
Run ./gradlew spotlessApply 
1 parent a0c8304 commit 6ab1101

8 files changed

Lines changed: 84 additions & 54 deletions

File tree

‎detectors/resources/src/main/java/com/google/cloud/opentelemetry/detectors/AttributesExtractorUtil.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,8 @@
2323
* A utility class that contains method that facilitate extraction of attributes from environment
2424
* variables and metadata configurations.
2525
*
26-
* <p>This class only adds helper methods to extract {@link CloudIncubatingAttributes}
27-
* and {@link FaasIncubatingAttributes} that are common
28-
* across all the supported compute environments.
26+
* <p>This class only adds helper methods to extract {@link CloudIncubatingAttributes} and {@link
27+
* FaasIncubatingAttributes} that are common across all the supported compute environments.
2928
*
3029
* @deprecated Not for public use. This class is expected to be retained only as package private.
3130
*/
@@ -82,7 +81,8 @@ public static void addCloudRegionFromMetadataUsingZone(
8281
// Parsing required to scope up to a region
8382
String[] splitArr = zone.split("-");
8483
if (splitArr.length > 2) {
85-
attributesBuilder.put(CloudIncubatingAttributes.CLOUD_REGION, splitArr[0] + "-" + splitArr[1]);
84+
attributesBuilder.put(
85+
CloudIncubatingAttributes.CLOUD_REGION, splitArr[0] + "-" + splitArr[1]);
8686
}
8787
}
8888
}

‎detectors/resources/src/main/java/com/google/cloud/opentelemetry/detectors/GCPResource.java‎

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
2626
import io.opentelemetry.sdk.resources.Resource;
2727
import io.opentelemetry.semconv.incubating.*;
28-
2928
import java.util.Map;
3029
import java.util.Optional;
3130
import java.util.logging.Logger;
@@ -69,7 +68,9 @@ public Attributes getAttributes() {
6968

7069
// This is running on some sort of GCPCompute - figure out the platform
7170
AttributesBuilder attrBuilder = Attributes.builder();
72-
attrBuilder.put(CloudIncubatingAttributes.CLOUD_PROVIDER, CloudIncubatingAttributes.CloudProviderIncubatingValues.GCP);
71+
attrBuilder.put(
72+
CloudIncubatingAttributes.CLOUD_PROVIDER,
73+
CloudIncubatingAttributes.CloudProviderIncubatingValues.GCP);
7374
attrBuilder.put(CloudIncubatingAttributes.CLOUD_ACCOUNT_ID, detectedPlatform.getProjectId());
7475

7576
switch (detectedPlatform.getSupportedPlatform()) {
@@ -112,7 +113,8 @@ private void addGCEAttributes(AttributesBuilder attrBuilder, Map<String, String>
112113
CloudIncubatingAttributes.CloudPlatformIncubatingValues.GCP_COMPUTE_ENGINE);
113114

114115
Optional.ofNullable(attributesMap.get(GCE_AVAILABILITY_ZONE))
115-
.ifPresent(zone -> attrBuilder.put(CloudIncubatingAttributes.CLOUD_AVAILABILITY_ZONE, zone));
116+
.ifPresent(
117+
zone -> attrBuilder.put(CloudIncubatingAttributes.CLOUD_AVAILABILITY_ZONE, zone));
116118
Optional.ofNullable(attributesMap.get(GCE_CLOUD_REGION))
117119
.ifPresent(region -> attrBuilder.put(CloudIncubatingAttributes.CLOUD_REGION, region));
118120
Optional.ofNullable(attributesMap.get(GCE_INSTANCE_ID))
@@ -126,7 +128,8 @@ private void addGCEAttributes(AttributesBuilder attrBuilder, Map<String, String>
126128
Optional.ofNullable(attributesMap.get(GCE_INSTANCE_HOSTNAME))
127129
.ifPresent(
128130
instanceHostname ->
129-
attrBuilder.put(GcpIncubatingAttributes.GCP_GCE_INSTANCE_HOSTNAME, instanceHostname));
131+
attrBuilder.put(
132+
GcpIncubatingAttributes.GCP_GCE_INSTANCE_HOSTNAME, instanceHostname));
130133
Optional.ofNullable(attributesMap.get(GCE_MACHINE_TYPE))
131134
.ifPresent(machineType -> attrBuilder.put(HostIncubatingAttributes.HOST_TYPE, machineType));
132135
}
@@ -155,7 +158,8 @@ private void addGKEAttributes(AttributesBuilder attrBuilder, Map<String, String>
155158
switch (locationType) {
156159
case GKE_LOCATION_TYPE_REGION:
157160
attrBuilder.put(
158-
CloudIncubatingAttributes.CLOUD_REGION, attributesMap.get(GKE_CLUSTER_LOCATION));
161+
CloudIncubatingAttributes.CLOUD_REGION,
162+
attributesMap.get(GKE_CLUSTER_LOCATION));
159163
break;
160164
case GKE_LOCATION_TYPE_ZONE:
161165
attrBuilder.put(
@@ -181,7 +185,8 @@ private void addGKEAttributes(AttributesBuilder attrBuilder, Map<String, String>
181185
*/
182186
private void addGCRAttributes(AttributesBuilder attrBuilder, Map<String, String> attributesMap) {
183187
attrBuilder.put(
184-
CloudIncubatingAttributes.CLOUD_PLATFORM, CloudIncubatingAttributes.CloudPlatformIncubatingValues.GCP_CLOUD_RUN);
188+
CloudIncubatingAttributes.CLOUD_PLATFORM,
189+
CloudIncubatingAttributes.CloudPlatformIncubatingValues.GCP_CLOUD_RUN);
185190
addCommonAttributesForServerlessCompute(attrBuilder, attributesMap);
186191
}
187192

@@ -208,20 +213,25 @@ private void addGCFAttributes(AttributesBuilder attrBuilder, Map<String, String>
208213
*/
209214
private void addGAEAttributes(AttributesBuilder attrBuilder, Map<String, String> attributesMap) {
210215
attrBuilder.put(
211-
CloudIncubatingAttributes.CLOUD_PLATFORM, CloudIncubatingAttributes.CloudPlatformIncubatingValues.GCP_APP_ENGINE);
216+
CloudIncubatingAttributes.CLOUD_PLATFORM,
217+
CloudIncubatingAttributes.CloudPlatformIncubatingValues.GCP_APP_ENGINE);
212218
Optional.ofNullable(attributesMap.get(GAE_MODULE_NAME))
213219
.ifPresent(appName -> attrBuilder.put(FaasIncubatingAttributes.FAAS_NAME, appName));
214220
Optional.ofNullable(attributesMap.get(GAE_APP_VERSION))
215-
.ifPresent(appVersion -> attrBuilder.put(FaasIncubatingAttributes.FAAS_VERSION, appVersion));
221+
.ifPresent(
222+
appVersion -> attrBuilder.put(FaasIncubatingAttributes.FAAS_VERSION, appVersion));
216223
Optional.ofNullable(attributesMap.get(GAE_INSTANCE_ID))
217224
.ifPresent(
218-
appInstanceId -> attrBuilder.put(FaasIncubatingAttributes.FAAS_INSTANCE, appInstanceId));
225+
appInstanceId ->
226+
attrBuilder.put(FaasIncubatingAttributes.FAAS_INSTANCE, appInstanceId));
219227
Optional.ofNullable(attributesMap.get(GAE_CLOUD_REGION))
220-
.ifPresent(cloudRegion -> attrBuilder.put(CloudIncubatingAttributes.CLOUD_REGION, cloudRegion));
228+
.ifPresent(
229+
cloudRegion -> attrBuilder.put(CloudIncubatingAttributes.CLOUD_REGION, cloudRegion));
221230
Optional.ofNullable(attributesMap.get(GAE_AVAILABILITY_ZONE))
222231
.ifPresent(
223232
cloudAvailabilityZone ->
224-
attrBuilder.put(CloudIncubatingAttributes.CLOUD_AVAILABILITY_ZONE, cloudAvailabilityZone));
233+
attrBuilder.put(
234+
CloudIncubatingAttributes.CLOUD_AVAILABILITY_ZONE, cloudAvailabilityZone));
225235
}
226236

227237
/**
@@ -238,9 +248,11 @@ private void addCommonAttributesForServerlessCompute(
238248
Optional.ofNullable(attributesMap.get(SERVERLESS_COMPUTE_REVISION))
239249
.ifPresent(revision -> attrBuilder.put(FaasIncubatingAttributes.FAAS_VERSION, revision));
240250
Optional.ofNullable(attributesMap.get(SERVERLESS_COMPUTE_INSTANCE_ID))
241-
.ifPresent(instanceId -> attrBuilder.put(FaasIncubatingAttributes.FAAS_INSTANCE, instanceId));
251+
.ifPresent(
252+
instanceId -> attrBuilder.put(FaasIncubatingAttributes.FAAS_INSTANCE, instanceId));
242253
Optional.ofNullable(attributesMap.get(SERVERLESS_COMPUTE_AVAILABILITY_ZONE))
243-
.ifPresent(zone -> attrBuilder.put(CloudIncubatingAttributes.CLOUD_AVAILABILITY_ZONE, zone));
254+
.ifPresent(
255+
zone -> attrBuilder.put(CloudIncubatingAttributes.CLOUD_AVAILABILITY_ZONE, zone));
244256
Optional.ofNullable(attributesMap.get(SERVERLESS_COMPUTE_CLOUD_REGION))
245257
.ifPresent(region -> attrBuilder.put(CloudIncubatingAttributes.CLOUD_REGION, region));
246258
}

‎detectors/resources/src/test/java/com/google/cloud/opentelemetry/detectors/GCPResourceTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,11 @@
2525
import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
2626
import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
2727
import io.opentelemetry.sdk.resources.Resource;
28+
import io.opentelemetry.semconv.incubating.*;
2829
import java.util.EnumSet;
2930
import java.util.HashMap;
3031
import java.util.Map;
3132
import java.util.ServiceLoader;
32-
33-
import io.opentelemetry.semconv.incubating.*;
3433
import org.junit.jupiter.api.Test;
3534
import org.mockito.Mockito;
3635

‎exporters/metrics/src/main/java/com/google/cloud/opentelemetry/metric/MetricConfiguration.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import io.opentelemetry.api.common.AttributeKey;
3030
import io.opentelemetry.semconv.ServiceAttributes;
3131
import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes;
32-
3332
import java.time.Duration;
3433
import java.util.Collections;
3534
import java.util.List;
@@ -144,8 +143,8 @@ public final String getProjectId() {
144143
* metric labels.
145144
*
146145
* <p>The default filter adds {@link ServiceAttributes#SERVICE_NAME}, {@link
147-
* ServiceIncubatingAttributes#SERVICE_NAMESPACE}, and {@link ServiceIncubatingAttributes#SERVICE_INSTANCE_ID} as
148-
* metric labels.
146+
* ServiceIncubatingAttributes#SERVICE_NAMESPACE}, and {@link
147+
* ServiceIncubatingAttributes#SERVICE_INSTANCE_ID} as metric labels.
149148
*
150149
* @return a {@link Predicate} that acts as a resource attribute filter.
151150
* @see Builder#setResourceAttributesFilter(Predicate) for details.

‎exporters/metrics/src/test/java/com/google/cloud/opentelemetry/metric/FakeData.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
import io.opentelemetry.semconv.incubating.CloudIncubatingAttributes;
4747
import io.opentelemetry.semconv.incubating.HostIncubatingAttributes;
4848
import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes;
49-
5049
import java.util.Arrays;
5150
import java.util.Collections;
5251
import java.util.Date;

‎exporters/trace/src/test/java/com/google/cloud/opentelemetry/trace/TraceTranslatorTest.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
import io.opentelemetry.sdk.testing.trace.TestSpanData;
3636
import io.opentelemetry.sdk.trace.data.EventData;
3737
import io.opentelemetry.sdk.trace.data.StatusData;
38+
import io.opentelemetry.semconv.ServiceAttributes;
39+
import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes;
3840
import java.util.ArrayList;
3941
import java.util.Arrays;
4042
import java.util.Collections;
@@ -43,9 +45,6 @@
4345
import java.util.List;
4446
import java.util.Map;
4547
import java.util.concurrent.TimeUnit;
46-
47-
import io.opentelemetry.semconv.ServiceAttributes;
48-
import io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes;
4948
import org.junit.Test;
5049
import org.junit.runner.RunWith;
5150
import org.junit.runners.JUnit4;

‎shared/resourcemapping/src/main/java/com/google/cloud/opentelemetry/resource/ResourceTranslator.java‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import io.opentelemetry.sdk.resources.Resource;
2020
import io.opentelemetry.semconv.ServiceAttributes;
2121
import io.opentelemetry.semconv.incubating.*;
22-
2322
import java.util.Arrays;
2423
import java.util.List;
2524
import java.util.Map;
@@ -100,7 +99,8 @@ public static AttributeMapping create(
10099
AttributeMapping.create(
101100
"location",
102101
Arrays.asList(
103-
CloudIncubatingAttributes.CLOUD_AVAILABILITY_ZONE, CloudIncubatingAttributes.CLOUD_REGION)),
102+
CloudIncubatingAttributes.CLOUD_AVAILABILITY_ZONE,
103+
CloudIncubatingAttributes.CLOUD_REGION)),
104104
AttributeMapping.create("cluster_name", K8sIncubatingAttributes.K8S_CLUSTER_NAME),
105105
AttributeMapping.create("namespace_name", K8sIncubatingAttributes.K8S_NAMESPACE_NAME),
106106
AttributeMapping.create("container_name", K8sIncubatingAttributes.K8S_CONTAINER_NAME),
@@ -110,7 +110,8 @@ public static AttributeMapping create(
110110
AttributeMapping.create(
111111
"location",
112112
Arrays.asList(
113-
CloudIncubatingAttributes.CLOUD_AVAILABILITY_ZONE, CloudIncubatingAttributes.CLOUD_REGION)),
113+
CloudIncubatingAttributes.CLOUD_AVAILABILITY_ZONE,
114+
CloudIncubatingAttributes.CLOUD_REGION)),
114115
AttributeMapping.create("cluster_name", K8sIncubatingAttributes.K8S_CLUSTER_NAME),
115116
AttributeMapping.create("namespace_name", K8sIncubatingAttributes.K8S_NAMESPACE_NAME),
116117
AttributeMapping.create("pod_name", K8sIncubatingAttributes.K8S_POD_NAME));
@@ -119,15 +120,17 @@ public static AttributeMapping create(
119120
AttributeMapping.create(
120121
"location",
121122
Arrays.asList(
122-
CloudIncubatingAttributes.CLOUD_AVAILABILITY_ZONE, CloudIncubatingAttributes.CLOUD_REGION)),
123+
CloudIncubatingAttributes.CLOUD_AVAILABILITY_ZONE,
124+
CloudIncubatingAttributes.CLOUD_REGION)),
123125
AttributeMapping.create("cluster_name", K8sIncubatingAttributes.K8S_CLUSTER_NAME),
124126
AttributeMapping.create("node_name", K8sIncubatingAttributes.K8S_NODE_NAME));
125127
private static final List<AttributeMapping> K8S_CLUSTER_LABELS =
126128
Arrays.asList(
127129
AttributeMapping.create(
128130
"location",
129131
Arrays.asList(
130-
CloudIncubatingAttributes.CLOUD_AVAILABILITY_ZONE, CloudIncubatingAttributes.CLOUD_REGION)),
132+
CloudIncubatingAttributes.CLOUD_AVAILABILITY_ZONE,
133+
CloudIncubatingAttributes.CLOUD_REGION)),
131134
AttributeMapping.create("cluster_name", K8sIncubatingAttributes.K8S_CLUSTER_NAME));
132135
private static final List<AttributeMapping> AWS_EC2_INSTANCE_LABELS =
133136
Arrays.asList(
@@ -145,7 +148,8 @@ public static AttributeMapping create(
145148
AttributeMapping.create(
146149
"location",
147150
Arrays.asList(
148-
CloudIncubatingAttributes.CLOUD_AVAILABILITY_ZONE, CloudIncubatingAttributes.CLOUD_REGION),
151+
CloudIncubatingAttributes.CLOUD_AVAILABILITY_ZONE,
152+
CloudIncubatingAttributes.CLOUD_REGION),
149153
"global"),
150154
AttributeMapping.create("namespace", ServiceIncubatingAttributes.SERVICE_NAMESPACE, ""),
151155
AttributeMapping.create(
@@ -155,14 +159,16 @@ public static AttributeMapping create(
155159
AttributeMapping.create(
156160
"task_id",
157161
Arrays.asList(
158-
ServiceIncubatingAttributes.SERVICE_INSTANCE_ID, FaasIncubatingAttributes.FAAS_INSTANCE),
162+
ServiceIncubatingAttributes.SERVICE_INSTANCE_ID,
163+
FaasIncubatingAttributes.FAAS_INSTANCE),
159164
""));
160165
private static final List<AttributeMapping> GENERIC_NODE_LABELS =
161166
Arrays.asList(
162167
AttributeMapping.create(
163168
"location",
164169
Arrays.asList(
165-
CloudIncubatingAttributes.CLOUD_AVAILABILITY_ZONE, CloudIncubatingAttributes.CLOUD_REGION),
170+
CloudIncubatingAttributes.CLOUD_AVAILABILITY_ZONE,
171+
CloudIncubatingAttributes.CLOUD_REGION),
166172
"global"),
167173
AttributeMapping.create("namespace", ServiceIncubatingAttributes.SERVICE_NAMESPACE, ""),
168174
AttributeMapping.create(

0 commit comments

Comments
 (0)