Rename config setting and properties for emiting events

Author: luke-sterkowicz

instrumentation/grpc-1.6/README.md

@@ -2,7 +2,7 @@
 
 | System property                                             | Type    | Default | Description                                                                                                                                                    |
 |-------------------------------------------------------------|---------|---------|----------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `otel.instrumentation.grpc.message-events`                  | Boolean | `true`  | Determines whether to add span event for each individual message received and sent. Set this to false in case of streaming large volumes of messages.          |
+| `otel.instrumentation.grpc.emit-message-events`             | Boolean | `true`  | Determines whether to emit span event for each individual message received and sent.                                                                           |
 | `otel.instrumentation.grpc.experimental-span-attributes`    | Boolean | `false` | Enable the capture of experimental span attributes.                                                                                                            |
 | `otel.instrumentation.grpc.capture-metadata.client.request` | String  |         | A comma-separated list of request metadata keys. gRPC client instrumentation will capture metadata values corresponding to configured keys as span attributes. |
 | `otel.instrumentation.grpc.capture-metadata.server.request` | String  |         | A comma-separated list of request metadata keys. gRPC server instrumentation will capture metadata values corresponding to configured keys as span attributes. |

instrumentation/grpc-1.6/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grpc/v1_6/GrpcSingletons.java

@@ -27,9 +27,9 @@ public final class GrpcSingletons {
   private static final AtomicReference<Context.Storage> STORAGE_REFERENCE = new AtomicReference<>();
 
   static {
-    boolean addMessageEvents =
+    boolean emitMessageEvents =
         AgentInstrumentationConfig.get()
-            .getBoolean("otel.instrumentation.grpc.message-events", true);
+            .getBoolean("otel.instrumentation.grpc.emit-message-events", true);
 
     boolean experimentalSpanAttributes =
         AgentInstrumentationConfig.get()
@@ -44,7 +44,7 @@ public final class GrpcSingletons {
 
     GrpcTelemetry telemetry =
         GrpcTelemetry.builder(GlobalOpenTelemetry.get())
-            .setAddMessageEvents(addMessageEvents)
+            .setEmitMessageEvents(emitMessageEvents)
             .setCaptureExperimentalSpanAttributes(experimentalSpanAttributes)
             .setCapturedClientRequestMetadata(clientRequestMetadata)
             .setCapturedServerRequestMetadata(serverRequestMetadata)

instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/GrpcTelemetry.java

@@ -29,19 +29,19 @@ public static GrpcTelemetryBuilder builder(OpenTelemetry openTelemetry) {
   private final Instrumenter<GrpcRequest, Status> clientInstrumenter;
   private final ContextPropagators propagators;
   private final boolean captureExperimentalSpanAttributes;
-  private final boolean addMessageEvents;
+  private final boolean emitMessageEvents;
 
   GrpcTelemetry(
       Instrumenter<GrpcRequest, Status> serverInstrumenter,
       Instrumenter<GrpcRequest, Status> clientInstrumenter,
       ContextPropagators propagators,
       boolean captureExperimentalSpanAttributes,
-      boolean addMessageEvents) {
+      boolean emitMessageEvents) {
     this.serverInstrumenter = serverInstrumenter;
     this.clientInstrumenter = clientInstrumenter;
     this.propagators = propagators;
     this.captureExperimentalSpanAttributes = captureExperimentalSpanAttributes;
-    this.addMessageEvents = addMessageEvents;
+    this.emitMessageEvents = emitMessageEvents;
   }
 
   /**
@@ -50,7 +50,7 @@ public static GrpcTelemetryBuilder builder(OpenTelemetry openTelemetry) {
    */
   public ClientInterceptor newClientInterceptor() {
     return new TracingClientInterceptor(
-        clientInstrumenter, propagators, captureExperimentalSpanAttributes, addMessageEvents);
+        clientInstrumenter, propagators, captureExperimentalSpanAttributes, emitMessageEvents);
   }
 
   /**
@@ -59,6 +59,6 @@ public ClientInterceptor newClientInterceptor() {
    */
   public ServerInterceptor newServerInterceptor() {
     return new TracingServerInterceptor(
-        serverInstrumenter, captureExperimentalSpanAttributes, addMessageEvents);
+        serverInstrumenter, captureExperimentalSpanAttributes, emitMessageEvents);
   }
 }

instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/GrpcTelemetryBuilder.java

@@ -49,7 +49,7 @@ public final class GrpcTelemetryBuilder {
       additionalServerExtractors = new ArrayList<>();
 
   private boolean captureExperimentalSpanAttributes;
-  private boolean addMessageEvents = true;
+  private boolean emitMessageEvents = true;
   private List<String> capturedClientRequestMetadata = Collections.emptyList();
   private List<String> capturedServerRequestMetadata = Collections.emptyList();
 
@@ -136,8 +136,8 @@ public GrpcTelemetryBuilder setPeerService(String peerService) {
    * is true. Set this to false in case of streaming large volumes of messages.
    */
   @CanIgnoreReturnValue
-  public GrpcTelemetryBuilder setAddMessageEvents(boolean addMessageEvents) {
-    this.addMessageEvents = addMessageEvents;
+  public GrpcTelemetryBuilder setEmitMessageEvents(boolean emitMessageEvents) {
+    this.emitMessageEvents = emitMessageEvents;
     return this;
   }
 
@@ -223,6 +223,6 @@ public GrpcTelemetry build() {
         clientInstrumenterBuilder.buildInstrumenter(SpanKindExtractor.alwaysClient()),
         openTelemetry.getPropagators(),
         captureExperimentalSpanAttributes,
-        addMessageEvents);
+        emitMessageEvents);
   }
 }

instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/TracingClientInterceptor.java

@@ -44,17 +44,17 @@ final class TracingClientInterceptor implements ClientInterceptor {
   private final Instrumenter<GrpcRequest, Status> instrumenter;
   private final ContextPropagators propagators;
   private final boolean captureExperimentalSpanAttributes;
-  private final boolean addMessageEvents;
+  private final boolean emitMessageEvents;
 
   TracingClientInterceptor(
       Instrumenter<GrpcRequest, Status> instrumenter,
       ContextPropagators propagators,
       boolean captureExperimentalSpanAttributes,
-      boolean addMessageEvents) {
+      boolean emitMessageEvents) {
     this.instrumenter = instrumenter;
     this.propagators = propagators;
     this.captureExperimentalSpanAttributes = captureExperimentalSpanAttributes;
-    this.addMessageEvents = addMessageEvents;
+    this.emitMessageEvents = emitMessageEvents;
   }
 
   @Override
@@ -129,7 +129,7 @@ public void sendMessage(REQUEST message) {
         throw e;
       }
       long messageId = SENT_MESSAGE_ID_UPDATER.incrementAndGet(this);
-      if (addMessageEvents) {
+      if (emitMessageEvents) {
         Attributes attributes = Attributes.of(MESSAGE_TYPE, SENT, MESSAGE_ID, messageId);
         Span.fromContext(context).addEvent("message", attributes);
       }
@@ -156,7 +156,7 @@ final class TracingClientCallListener
       @Override
       public void onMessage(RESPONSE message) {
         long messageId = RECEIVED_MESSAGE_ID_UPDATER.incrementAndGet(TracingClientCall.this);
-        if (addMessageEvents) {
+        if (emitMessageEvents) {
           Attributes attributes = Attributes.of(MESSAGE_TYPE, RECEIVED, MESSAGE_ID, messageId);
           Span.fromContext(context).addEvent("message", attributes);
         }

instrumentation/grpc-1.6/library/src/main/java/io/opentelemetry/instrumentation/grpc/v1_6/TracingServerInterceptor.java

@@ -45,15 +45,15 @@ final class TracingServerInterceptor implements ServerInterceptor {
 
   private final Instrumenter<GrpcRequest, Status> instrumenter;
   private final boolean captureExperimentalSpanAttributes;
-  private final boolean addMessageEvents;
+  private final boolean emitMessageEvents;
 
   TracingServerInterceptor(
       Instrumenter<GrpcRequest, Status> instrumenter,
       boolean captureExperimentalSpanAttributes,
-      boolean addMessageEvents) {
+      boolean emitMessageEvents) {
     this.instrumenter = instrumenter;
     this.captureExperimentalSpanAttributes = captureExperimentalSpanAttributes;
-    this.addMessageEvents = addMessageEvents;
+    this.emitMessageEvents = emitMessageEvents;
   }
 
   @Override
@@ -119,7 +119,7 @@ public void sendMessage(RESPONSE message) {
         super.sendMessage(message);
       }
       long messageId = SENT_MESSAGE_ID_UPDATER.incrementAndGet(this);
-      if (addMessageEvents) {
+      if (emitMessageEvents) {
         Attributes attributes = Attributes.of(MESSAGE_TYPE, SENT, MESSAGE_ID, messageId);
         Span.fromContext(context).addEvent("message", attributes);
       }
@@ -164,7 +164,7 @@ private void end(Context context, GrpcRequest request, Status response, Throwabl
       @Override
       public void onMessage(REQUEST message) {
         long messageId = RECEIVED_MESSAGE_ID_UPDATER.incrementAndGet(TracingServerCall.this);
-        if (addMessageEvents) {
+        if (emitMessageEvents) {
           Attributes attributes = Attributes.of(MESSAGE_TYPE, RECEIVED, MESSAGE_ID, messageId);
           Span.fromContext(context).addEvent("message", attributes);
         }