Skip to content

Commit c52c8d4

Browse files
tnazarewtnazarew
committed
changed not allowed labels
Signed-off-by: tnazarew <tomasz.nazarewicz@getindata.com>
1 parent 2e1bd9f commit c52c8d4

File tree

2 files changed

+32
-32
lines changed

2 files changed

+32
-32
lines changed

‎spark-bigquery-connector-common/src/main/java/com/google/cloud/spark/bigquery/util/GCPLabelUtils.java‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ static void resetSparkLabelsCache() {
8181

8282
private static Map<String, String> computeSparkLabels(ImmutableMap<String, String> conf) {
8383
Map<String, String> sparkLabels = new HashMap<>();
84-
getSparkAppId(conf).ifPresent(p -> sparkLabels.put("appId", p));
85-
getSparkAppName(conf).ifPresent(p -> sparkLabels.put("appName", p));
84+
getSparkAppId(conf).ifPresent(p -> sparkLabels.put("app-id", p));
85+
getSparkAppName(conf).ifPresent(p -> sparkLabels.put("app-name", p));
8686
if (isDataprocRuntime()) {
8787
sparkLabels.putAll(getGCPLabels(conf));
8888
}
@@ -92,7 +92,7 @@ private static Map<String, String> computeSparkLabels(ImmutableMap<String, Strin
9292
static Map<String, String> getGCPLabels(ImmutableMap<String, String> conf) {
9393
try (CloseableHttpClient httpClient = createHttpClient()) {
9494
Map<String, String> gcpLabels = getResourceLabels(conf, httpClient);
95-
getGCPProjectId(conf, httpClient).ifPresent(p -> gcpLabels.put("projectId", p));
95+
getGCPProjectId(conf, httpClient).ifPresent(p -> gcpLabels.put("project-id", p));
9696
getDataprocRegion(conf, httpClient).ifPresent(p -> gcpLabels.put("region", p));
9797
return gcpLabels;
9898
} catch (IOException e) {
@@ -105,27 +105,27 @@ private static Map<String, String> getResourceLabels(
105105
ImmutableMap<String, String> conf, CloseableHttpClient httpClient) {
106106
Map<String, String> resourceLabels = new HashMap<>();
107107
if ("yarn".equals(conf.getOrDefault(SPARK_MASTER, ""))) {
108-
getClusterName(conf).ifPresent(p -> resourceLabels.put("cluster.name", p));
109-
getClusterUUID(conf, httpClient).ifPresent(p -> resourceLabels.put("cluster.uuid", p));
110-
getDataprocJobID(conf).ifPresent(p -> resourceLabels.put("job.id", p));
111-
getDataprocJobUUID(conf).ifPresent(p -> resourceLabels.put("job.uuid", p));
112-
resourceLabels.put("job.type", "dataproc_job");
108+
getClusterName(conf).ifPresent(p -> resourceLabels.put("cluster-name", p));
109+
getClusterUUID(conf, httpClient).ifPresent(p -> resourceLabels.put("cluster-uuid", p));
110+
getDataprocJobID(conf).ifPresent(p -> resourceLabels.put("job-id", p));
111+
getDataprocJobUUID(conf).ifPresent(p -> resourceLabels.put("job-uuid", p));
112+
resourceLabels.put("job-type", "dataproc_job");
113113
return resourceLabels;
114114
}
115115
Optional<String> dataprocBatchID = getDataprocBatchID(conf, httpClient);
116116
if (dataprocBatchID.isPresent()) {
117-
dataprocBatchID.ifPresent(p -> resourceLabels.put("spark.batch.id", p));
117+
dataprocBatchID.ifPresent(p -> resourceLabels.put("spark-batch-id", p));
118118
getDataprocBatchUUID(conf, httpClient)
119-
.ifPresent(p -> resourceLabels.put("spark.batch.uuid", p));
120-
resourceLabels.put("job.type", "batch");
119+
.ifPresent(p -> resourceLabels.put("spark-batch-uuid", p));
120+
resourceLabels.put("job-type", "batch");
121121
return resourceLabels;
122122
}
123123
Optional<String> dataprocSessionID = getDataprocSessionID(conf, httpClient);
124124
if (dataprocSessionID.isPresent()) {
125-
dataprocSessionID.ifPresent(p -> resourceLabels.put("spark.session.id", p));
125+
dataprocSessionID.ifPresent(p -> resourceLabels.put("spark-session-id", p));
126126
getDataprocSessionUUID(conf, httpClient)
127-
.ifPresent(p -> resourceLabels.put("spark.session.uuid", p));
128-
resourceLabels.put("job.type", "session");
127+
.ifPresent(p -> resourceLabels.put("spark-session-uuid", p));
128+
resourceLabels.put("job-type", "session");
129129
return resourceLabels;
130130
}
131131
return resourceLabels;

‎spark-bigquery-connector-common/src/test/java/com/google/cloud/spark/bigquery/util/GCPLabelUtilsTest.java‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -25,30 +25,30 @@ public class GCPLabelUtilsTest {
2525
private static final String TEST_REGION = "us-central1";
2626
private static final ImmutableMap<String, String> EXPECTED_FACET_DATAPROC_CLUSTER =
2727
ImmutableMap.<String, String>builder()
28-
.put("job.uuid", TEST_RESOURCE_UUID)
29-
.put("job.id", TEST_JOB_ID)
30-
.put("cluster.uuid", TEST_RESOURCE_UUID)
31-
.put("cluster.name", TEST_CLUSTER_NAME)
32-
.put("projectId", TEST_PROJECT_ID)
33-
.put("job.type", "dataproc_job")
28+
.put("job-uuid", TEST_RESOURCE_UUID)
29+
.put("job-id", TEST_JOB_ID)
30+
.put("cluster-uuid", TEST_RESOURCE_UUID)
31+
.put("cluster-name", TEST_CLUSTER_NAME)
32+
.put("project-id", TEST_PROJECT_ID)
33+
.put("job-type", "dataproc_job")
3434
.put("region", TEST_REGION)
3535
.build();
3636

3737
private static final ImmutableMap<String, String> EXPECTED_FACET_DATAPROC_BATCH =
3838
ImmutableMap.<String, String>builder()
39-
.put("spark.batch.uuid", TEST_RESOURCE_UUID)
40-
.put("spark.batch.id", TEST_BATCH_ID)
41-
.put("projectId", TEST_PROJECT_ID)
42-
.put("job.type", "batch")
39+
.put("spark-batch-uuid", TEST_RESOURCE_UUID)
40+
.put("spark-batch-id", TEST_BATCH_ID)
41+
.put("project-id", TEST_PROJECT_ID)
42+
.put("job-type", "batch")
4343
.put("region", TEST_REGION)
4444
.build();
4545

4646
private static final ImmutableMap<String, String> EXPECTED_FACET_DATAPROC_SESSION =
4747
ImmutableMap.<String, String>builder()
48-
.put("spark.session.uuid", TEST_RESOURCE_UUID)
49-
.put("spark.session.id", TEST_SESSION_ID)
50-
.put("projectId", TEST_PROJECT_ID)
51-
.put("job.type", "session")
48+
.put("spark-session-uuid", TEST_RESOURCE_UUID)
49+
.put("spark-session-id", TEST_SESSION_ID)
50+
.put("project-id", TEST_PROJECT_ID)
51+
.put("job-type", "session")
5252
.put("region", TEST_REGION)
5353
.build();
5454

@@ -78,8 +78,8 @@ public void testGetSparkLabelsOnlyAppInfo() {
7878
Map<String, String> labels = GCPLabelUtils.getSparkLabels(conf);
7979

8080
assertEquals(2, labels.size());
81-
assertEquals(TEST_APP_ID, labels.get("appId"));
82-
assertEquals(TEST_APP_NAME, labels.get("appName"));
81+
assertEquals(TEST_APP_ID, labels.get("app-id"));
82+
assertEquals(TEST_APP_NAME, labels.get("app-name"));
8383
}
8484

8585
@Test
@@ -102,8 +102,8 @@ public void testGetSparkLabelsIsCached() {
102102
Map<String, String> labels2 = GCPLabelUtils.getSparkLabels(conf2);
103103

104104
assertEquals(labels1.size(), labels2.size());
105-
assertEquals(labels1.get("appId"), labels2.get("appId"));
106-
assertEquals(labels1.get("appName"), labels2.get("appName"));
105+
assertEquals(labels1.get("app-id"), labels2.get("app-id"));
106+
assertEquals(labels1.get("app-name"), labels2.get("app-name"));
107107
}
108108

109109
@Test

0 commit comments

Comments
 (0)