Rework of OpenTracingOptions and PR comments addressed.

Author: Spikhalskiy

temporal-opentracing/src/main/java/io/temporal/opentracing/OpenTracingClientInterceptor.java

@@ -24,10 +24,19 @@
 import io.temporal.opentracing.internal.OpenTracingWorkflowClientCallsInterceptor;
 
 public class OpenTracingClientInterceptor extends WorkflowClientInterceptorBase {
+  private final OpenTracingOptions openTracingOptions;
+
+  public OpenTracingClientInterceptor() {
+    this(OpenTracingOptions.newBuilder().build());
+  }
+
+  public OpenTracingClientInterceptor(OpenTracingOptions openTracingOptions) {
+    this.openTracingOptions = openTracingOptions;
+  }
 
   @Override
   public WorkflowClientCallsInterceptor workflowClientCallsInterceptor(
       WorkflowClientCallsInterceptor next) {
-    return new OpenTracingWorkflowClientCallsInterceptor(next);
+    return new OpenTracingWorkflowClientCallsInterceptor(next, openTracingOptions);
   }
 }

temporal-opentracing/src/main/java/io/temporal/opentracing/OpenTracingConfig.java

@@ -0,0 +1,58 @@
+/*
+ *  Copyright (C) 2020 Temporal Technologies, Inc. All Rights Reserved.
+ *
+ *  Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ *  Modifications copyright (C) 2017 Uber Technologies, Inc.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"). You may not
+ *  use this file except in compliance with the License. A copy of the License is
+ *  located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ *  or in the "license" file accompanying this file. This file is distributed on
+ *  an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ *  express or implied. See the License for the specific language governing
+ *  permissions and limitations under the License.
+ */
+
+package io.temporal.opentracing;
+
+import javax.annotation.Nonnull;
+import java.util.HashMap;
+import java.util.Map;
+
+public class OpenTracingOptions {
+  private final Map<SpanOperationType, String> customSpanOperationNamePrefixes;
+
+  private OpenTracingOptions(Map<SpanOperationType, String> customSpanOperationNamePrefixes) {
+    this.customSpanOperationNamePrefixes = customSpanOperationNamePrefixes;
+  }
+
+  @Nonnull
+  public String getSpanOperationNamePrefix(SpanOperationType spanOperationType) {
+    return customSpanOperationNamePrefixes.getOrDefault(
+        spanOperationType, spanOperationType.getDefaultPrefix());
+  }
+
+  public static Builder newBuilder() {
+    return new Builder();
+  }
+
+  public static final class Builder {
+    private final Map<SpanOperationType, String> customSpanOperationNamePrefixes = new HashMap<>();
+
+    private Builder() {}
+
+    public Builder setSpanOperationNamePrefix(
+        SpanOperationType spanOperationType, String customPrefix) {
+      this.customSpanOperationNamePrefixes.put(spanOperationType, customPrefix);
+      return this;
+    }
+
+    public OpenTracingOptions build() {
+      return new OpenTracingOptions(customSpanOperationNamePrefixes);
+    }
+  }
+}

temporal-opentracing/src/main/java/io/temporal/opentracing/OpenTracingOptions.java

@@ -24,13 +24,23 @@
 import io.temporal.opentracing.internal.OpenTracingWorkflowInboundCallsInterceptor;
 
 public class OpenTracingWorkerInterceptor implements WorkerInterceptor {
+  private final OpenTracingOptions openTracingOptions;
+
+  public OpenTracingWorkerInterceptor() {
+    this(OpenTracingOptions.newBuilder().build());
+  }
+
+  public OpenTracingWorkerInterceptor(OpenTracingOptions openTracingOptions) {
+    this.openTracingOptions = openTracingOptions;
+  }
+
   @Override
   public WorkflowInboundCallsInterceptor interceptWorkflow(WorkflowInboundCallsInterceptor next) {
-    return new OpenTracingWorkflowInboundCallsInterceptor(next);
+    return new OpenTracingWorkflowInboundCallsInterceptor(next, openTracingOptions);
   }
 
   @Override
   public ActivityInboundCallsInterceptor interceptActivity(ActivityInboundCallsInterceptor next) {
-    return new OpenTracingActivityInboundCallsInterceptor(next);
+    return new OpenTracingActivityInboundCallsInterceptor(next, openTracingOptions);
   }
 }

temporal-opentracing/src/main/java/io/temporal/opentracing/OpenTracingWorkerInterceptor.java

@@ -0,0 +1,39 @@
+/*
+ *  Copyright (C) 2020 Temporal Technologies, Inc. All Rights Reserved.
+ *
+ *  Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ *  Modifications copyright (C) 2017 Uber Technologies, Inc.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"). You may not
+ *  use this file except in compliance with the License. A copy of the License is
+ *  located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ *  or in the "license" file accompanying this file. This file is distributed on
+ *  an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ *  express or implied. See the License for the specific language governing
+ *  permissions and limitations under the License.
+ */
+
+package io.temporal.opentracing;
+
+public enum SpanOperationType {
+  WORKFLOW_START("StartWorkflow"),
+  WORKFLOW_START_WITH_SIGNAL("SignalWithStartWorkflow"),
+  WORKFLOW_RUN("RunWorkflow"),
+  CHILD_WORKFLOW_START("StartChildWorkflow"),
+  ACTIVITY_START("StartActivity"),
+  ACTIVITY_RUN("RunActivity");
+
+  private String defaultPrefix;
+
+  SpanOperationType(String defaultPrefix) {
+    this.defaultPrefix = defaultPrefix;
+  }
+
+  public String getDefaultPrefix() {
+    return defaultPrefix;
+  }
+}

temporal-opentracing/src/main/java/io/temporal/opentracing/SpanOperationType.java

@@ -0,0 +1,27 @@
+/*
+ *  Copyright (C) 2020 Temporal Technologies, Inc. All Rights Reserved.
+ *
+ *  Copyright 2012-2016 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ *  Modifications copyright (C) 2017 Uber Technologies, Inc.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"). You may not
+ *  use this file except in compliance with the License. A copy of the License is
+ *  located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ *  or in the "license" file accompanying this file. This file is distributed on
+ *  an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ *  express or implied. See the License for the specific language governing
+ *  permissions and limitations under the License.
+ */
+
+package io.temporal.opentracing;
+
+public class StandardTags {
+  public static final String WORKFLOW_ID = "workflowId";
+  public static final String RUN_ID = "runId";
+  public static final String PARENT_WORKFLOW_ID = "parentWorkflowId";
+  public static final String PARENT_RUN_ID = "parentRunId";
+}

temporal-opentracing/src/main/java/io/temporal/opentracing/StandardTags.java

@@ -28,16 +28,19 @@
 import io.temporal.activity.ActivityInfo;
 import io.temporal.common.interceptors.ActivityInboundCallsInterceptor;
 import io.temporal.common.interceptors.ActivityInboundCallsInterceptorBase;
-import io.temporal.opentracing.OpenTracingConfig;
+import io.temporal.opentracing.OpenTracingOptions;
+import io.temporal.opentracing.SpanOperationType;
 
 public class OpenTracingActivityInboundCallsInterceptor
     extends ActivityInboundCallsInterceptorBase {
-  public OpenTracingActivityInboundCallsInterceptor(ActivityInboundCallsInterceptor next) {
+  private final OpenTracingOptions openTracingOptions;
+
+  public OpenTracingActivityInboundCallsInterceptor(
+      ActivityInboundCallsInterceptor next, OpenTracingOptions openTracingOptions) {
     super(next);
+    this.openTracingOptions = openTracingOptions;
   }
 
-  private final OpenTracingConfig openTracingConfig = OpenTracingConfig.newBuilder().build();
-
   private ActivityExecutionContext activityExecutionContext;
 
   @Override
@@ -53,13 +56,13 @@ public void init(ActivityExecutionContext context) {
   public ActivityOutput execute(ActivityInput input) {
     Tracer tracer = GlobalTracer.get();
     SpanContext rootSpanContext =
-        OpenTracingContextPropagationUtils.readSpanContextFromHeader(input.getHeader(), tracer);
+        OpenTracingContextAccessor.readSpanContextFromHeader(input.getHeader(), tracer);
     ActivityInfo activityInfo = activityExecutionContext.getInfo();
     Span activityRunSpan =
         OpenTracingSpanUtils.createActivityRunSpan(
                 tracer,
                 System.currentTimeMillis(),
-                openTracingConfig.getActivityRunOperationNamePrefix()
+                openTracingOptions.getSpanOperationNamePrefix(SpanOperationType.ACTIVITY_RUN)
                     + "-"
                     + activityInfo.getActivityType(),
                 activityInfo.getWorkflowId(),