resolve comments

open-telemetry · May 29, 2024 · 9bb816f · 9bb816f
1 parent 035dad3
commit 9bb816f
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 28 deletions.
diff --git a/.../library/src/test/java/io/opentelemetry/instrumentation/grpc/v1_6/MetadataSetterTest.java b/.../library/src/test/java/io/opentelemetry/instrumentation/grpc/v1_6/MetadataSetterTest.java
@@ -14,19 +14,19 @@
 
 class MetadataSetterTest {
 
-  @Test
-  void checkThatIterableSizeEqualsOne() {
-    GrpcPropagator tested = new GrpcPropagator();
-    Metadata metadata = new Metadata();
-    tested.inject(Context.current(), metadata, MetadataSetter.INSTANCE);
+    @Test
+    void checkThatIterableSizeEqualsOne() {
+        GrpcPropagator testGrpcPropagator = new GrpcPropagator();
+        Metadata metadata = new Metadata();
+        testGrpcPropagator.inject(Context.current(), metadata, MetadataSetter.INSTANCE);
 
-    int size = 0;
-    for (String s :
-        metadata.getAll(Metadata.Key.of(GrpcPropagator.FIELD, Metadata.ASCII_STRING_MARSHALLER))) {
-      if (s != null) {
-        size++;
-      }
+        int size = 0;
+        for (String s :
+                metadata.getAll(Metadata.Key.of(testGrpcPropagator.fields().get(0), Metadata.ASCII_STRING_MARSHALLER))) {
+            if (s != null) {
+                size++;
+            }
+        }
+        assertTrue(size == 1);
     }
-    assertTrue(size == 1);
-  }
 }
diff --git a/...y/src/test/java/io/opentelemetry/instrumentation/grpc/v1_6/propagator/GrpcPropagator.java b/...y/src/test/java/io/opentelemetry/instrumentation/grpc/v1_6/propagator/GrpcPropagator.java
@@ -9,28 +9,32 @@
 import io.opentelemetry.context.propagation.TextMapGetter;
 import io.opentelemetry.context.propagation.TextMapPropagator;
 import io.opentelemetry.context.propagation.TextMapSetter;
+
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
 public class GrpcPropagator implements TextMapPropagator {
 
-  public static final String FIELD = "X-grpc-field";
-  private static final String METADATA = "value";
+    static final String FIELD = "X-grpc-field";
+    private static final String METADATA = "value";
+    private static final List<String> FIELDS =
+            Collections.unmodifiableList(Arrays.asList(FIELD));
 
-  @Override
-  public List<String> fields() {
-    return Collections.singletonList(FIELD);
-  }
+    @Override
+    public List<String> fields() {
+        return FIELDS;
+    }
 
-  @Override
-  public <C> void inject(Context context, C carrier, TextMapSetter<C> setter) {
-    for (int i = 0; i < 2; i++) {
-      setter.set(carrier, FIELD, METADATA);
+    @Override
+    public <C> void inject(Context context, C carrier, TextMapSetter<C> setter) {
+        for (int i = 0; i < 2; i++) {
+            setter.set(carrier, FIELD, METADATA);
+        }
     }
-  }
 
-  @Override
-  public <C> Context extract(Context context, C carrier, TextMapGetter<C> getter) {
-    return context;
-  }
+    @Override
+    public <C> Context extract(Context context, C carrier, TextMapGetter<C> getter) {
+        return context;
+    }
 }