From d9776c3594b29ad84e6e580a23c1995a56171c0b Mon Sep 17 00:00:00 2001
From: Aaron Steinfeld <aaron@traceable.ai>
Date: Mon, 17 Apr 2023 12:13:19 +0530
Subject: [PATCH 1/2] refactor: update direct use of context to use new version

---
 hypertrace-core-graphql                                    | 2 +-
 .../hypertrace/graphql/entity/fetcher/EntityFetcher.java   | 6 +++++-
 .../graphql/explorer/fetcher/ExplorerFetcher.java          | 6 +++++-
 .../graphql/label/fetcher/LabelApplicationRuleFetcher.java | 4 +++-
 .../org/hypertrace/graphql/label/fetcher/LabelFetcher.java | 7 +++++--
 .../label/mutator/LabelApplicationRuleCreateMutator.java   | 4 +++-
 .../label/mutator/LabelApplicationRuleDeleteMutator.java   | 4 +++-
 .../label/mutator/LabelApplicationRuleUpdateMutator.java   | 4 +++-
 .../graphql/label/mutator/LabelCreateMutator.java          | 4 +++-
 .../graphql/label/mutator/LabelUpdateMutator.java          | 4 +++-
 .../graphql/spaces/fetcher/SpaceConfigRuleFetcher.java     | 4 +++-
 .../hypertrace/graphql/spaces/fetcher/SpacesFetcher.java   | 4 +++-
 .../spaces/mutator/SpaceConfigRuleCreationMutator.java     | 4 +++-
 .../spaces/mutator/SpaceConfigRuleDeleteMutator.java       | 4 +++-
 .../spaces/mutator/SpaceConfigRuleUpdateMutator.java       | 4 +++-
 .../fetcher/mutation/ExcludeSpanCreateRuleMutator.java     | 4 +++-
 .../fetcher/mutation/ExcludeSpanDeleteRuleMutator.java     | 4 +++-
 .../fetcher/mutation/ExcludeSpanUpdateRuleMutator.java     | 4 +++-
 .../fetcher/query/ExcludeSpanRulesFetcher.java             | 4 +++-
 19 files changed, 61 insertions(+), 20 deletions(-)

diff --git a/hypertrace-core-graphql b/hypertrace-core-graphql
index 9712c62a..69ce0440 160000
--- a/hypertrace-core-graphql
+++ b/hypertrace-core-graphql
@@ -1 +1 @@
-Subproject commit 9712c62a023f007119fa075723452235e7a9caaa
+Subproject commit 69ce044055889015c58b5c3a0e5994b7779e463b
diff --git a/hypertrace-graphql-entity-schema/src/main/java/org/hypertrace/graphql/entity/fetcher/EntityFetcher.java b/hypertrace-graphql-entity-schema/src/main/java/org/hypertrace/graphql/entity/fetcher/EntityFetcher.java
index 5b4c0b29..679023ca 100644
--- a/hypertrace-graphql-entity-schema/src/main/java/org/hypertrace/graphql/entity/fetcher/EntityFetcher.java
+++ b/hypertrace-graphql-entity-schema/src/main/java/org/hypertrace/graphql/entity/fetcher/EntityFetcher.java
@@ -1,5 +1,7 @@
 package org.hypertrace.graphql.entity.fetcher;
 
+import static org.hypertrace.core.graphql.context.GraphQlRequestContext.contextFromEnvironment;
+
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
 import java.util.concurrent.CompletableFuture;
@@ -29,7 +31,9 @@ static final class EntityFetcherImpl implements DataFetcher<CompletableFuture<En
     public CompletableFuture<EntityResultSet> get(DataFetchingEnvironment environment) {
       return this.requestBuilder
           .build(
-              environment.getContext(), environment.getArguments(), environment.getSelectionSet())
+              contextFromEnvironment(environment),
+              environment.getArguments(),
+              environment.getSelectionSet())
           .flatMap(this.entityDao::getEntities)
           .toCompletionStage()
           .toCompletableFuture();
diff --git a/hypertrace-graphql-explorer-schema/src/main/java/org/hypertrace/graphql/explorer/fetcher/ExplorerFetcher.java b/hypertrace-graphql-explorer-schema/src/main/java/org/hypertrace/graphql/explorer/fetcher/ExplorerFetcher.java
index a32e3190..5e473f44 100644
--- a/hypertrace-graphql-explorer-schema/src/main/java/org/hypertrace/graphql/explorer/fetcher/ExplorerFetcher.java
+++ b/hypertrace-graphql-explorer-schema/src/main/java/org/hypertrace/graphql/explorer/fetcher/ExplorerFetcher.java
@@ -1,5 +1,7 @@
 package org.hypertrace.graphql.explorer.fetcher;
 
+import static org.hypertrace.core.graphql.context.GraphQlRequestContext.contextFromEnvironment;
+
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
 import java.util.concurrent.CompletableFuture;
@@ -31,7 +33,9 @@ static final class ExplorerFetcherImpl
     public CompletableFuture<ExploreResultSet> get(DataFetchingEnvironment environment) {
       return this.requestBuilder
           .build(
-              environment.getContext(), environment.getArguments(), environment.getSelectionSet())
+              contextFromEnvironment(environment),
+              environment.getArguments(),
+              environment.getSelectionSet())
           .flatMap(this.explorerDao::explore)
           .toCompletionStage()
           .toCompletableFuture();
diff --git a/hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/fetcher/LabelApplicationRuleFetcher.java b/hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/fetcher/LabelApplicationRuleFetcher.java
index 35d85fdc..669f2819 100644
--- a/hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/fetcher/LabelApplicationRuleFetcher.java
+++ b/hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/fetcher/LabelApplicationRuleFetcher.java
@@ -1,5 +1,7 @@
 package org.hypertrace.graphql.label.fetcher;
 
+import static org.hypertrace.core.graphql.context.GraphQlRequestContext.contextFromEnvironment;
+
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
 import java.util.concurrent.CompletableFuture;
@@ -31,7 +33,7 @@ static final class LabelApplicationRuleFetcherImpl
     public CompletableFuture<LabelApplicationRuleResultSet> get(
         DataFetchingEnvironment environment) {
       return this.labelApplicationRuleDao
-          .getLabelApplicationRules(this.requestBuilder.build(environment.getContext()))
+          .getLabelApplicationRules(this.requestBuilder.build(contextFromEnvironment(environment)))
           .toCompletionStage()
           .toCompletableFuture();
     }
diff --git a/hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/fetcher/LabelFetcher.java b/hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/fetcher/LabelFetcher.java
index 3381db12..98d01cec 100644
--- a/hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/fetcher/LabelFetcher.java
+++ b/hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/fetcher/LabelFetcher.java
@@ -1,10 +1,13 @@
 package org.hypertrace.graphql.label.fetcher;
 
+import static org.hypertrace.core.graphql.context.GraphQlRequestContext.contextFromEnvironment;
+
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
 import java.util.concurrent.CompletableFuture;
 import javax.inject.Inject;
 import org.hypertrace.core.graphql.common.fetcher.InjectableDataFetcher;
+import org.hypertrace.graphql.label.joiner.EntityAndRuleJoiner;
 import org.hypertrace.graphql.label.joiner.EntityAndRuleJoinerBuilder;
 import org.hypertrace.graphql.label.schema.LabelResultSet;
 
@@ -25,8 +28,8 @@ static final class LabelFetcherImpl implements DataFetcher<CompletableFuture<Lab
     @Override
     public CompletableFuture<LabelResultSet> get(DataFetchingEnvironment environment) {
       return this.requestBuilder
-          .build(environment.getContext(), environment.getSelectionSet())
-          .flatMap(request -> request.joinLabelsWithEntitiesAndRules())
+          .build(contextFromEnvironment(environment), environment.getSelectionSet())
+          .flatMap(EntityAndRuleJoiner::joinLabelsWithEntitiesAndRules)
           .toCompletionStage()
           .toCompletableFuture();
     }
diff --git a/hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/mutator/LabelApplicationRuleCreateMutator.java b/hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/mutator/LabelApplicationRuleCreateMutator.java
index 4de7ccc5..379e6d0c 100644
--- a/hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/mutator/LabelApplicationRuleCreateMutator.java
+++ b/hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/mutator/LabelApplicationRuleCreateMutator.java
@@ -1,5 +1,7 @@
 package org.hypertrace.graphql.label.mutator;
 
+import static org.hypertrace.core.graphql.context.GraphQlRequestContext.contextFromEnvironment;
+
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
 import java.util.concurrent.CompletableFuture;
@@ -33,7 +35,7 @@ public CompletableFuture<LabelApplicationRule> get(DataFetchingEnvironment envir
       return this.labelApplicationRuleDao
           .createLabelApplicationRule(
               this.requestBuilder.buildCreateLabelApplicationRuleRequest(
-                  environment.getContext(), environment.getArguments()))
+                  contextFromEnvironment(environment), environment.getArguments()))
           .toCompletionStage()
           .toCompletableFuture();
     }
diff --git a/hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/mutator/LabelApplicationRuleDeleteMutator.java b/hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/mutator/LabelApplicationRuleDeleteMutator.java
index 2cd2aa1e..ede47bef 100644
--- a/hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/mutator/LabelApplicationRuleDeleteMutator.java
+++ b/hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/mutator/LabelApplicationRuleDeleteMutator.java
@@ -1,5 +1,7 @@
 package org.hypertrace.graphql.label.mutator;
 
+import static org.hypertrace.core.graphql.context.GraphQlRequestContext.contextFromEnvironment;
+
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
 import java.util.concurrent.CompletableFuture;
@@ -31,7 +33,7 @@ public CompletableFuture<Boolean> get(DataFetchingEnvironment environment) {
       return this.labelApplicationRuleDao
           .deleteLabelApplicationRule(
               this.requestBuilder.buildDeleteLabelApplicationRuleRequest(
-                  environment.getContext(), environment.getArguments()))
+                  contextFromEnvironment(environment), environment.getArguments()))
           .toCompletionStage()
           .toCompletableFuture();
     }
diff --git a/hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/mutator/LabelApplicationRuleUpdateMutator.java b/hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/mutator/LabelApplicationRuleUpdateMutator.java
index eb80dfdf..876888f3 100644
--- a/hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/mutator/LabelApplicationRuleUpdateMutator.java
+++ b/hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/mutator/LabelApplicationRuleUpdateMutator.java
@@ -1,5 +1,7 @@
 package org.hypertrace.graphql.label.mutator;
 
+import static org.hypertrace.core.graphql.context.GraphQlRequestContext.contextFromEnvironment;
+
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
 import java.util.concurrent.CompletableFuture;
@@ -33,7 +35,7 @@ public CompletableFuture<LabelApplicationRule> get(DataFetchingEnvironment envir
       return this.labelApplicationRuleDao
           .updateLabelApplicationRule(
               this.requestBuilder.buildUpdateLabelApplicationRuleRequest(
-                  environment.getContext(), environment.getArguments()))
+                  contextFromEnvironment(environment), environment.getArguments()))
           .toCompletionStage()
           .toCompletableFuture();
     }
diff --git a/hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/mutator/LabelCreateMutator.java b/hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/mutator/LabelCreateMutator.java
index e4305d31..be273ed6 100644
--- a/hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/mutator/LabelCreateMutator.java
+++ b/hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/mutator/LabelCreateMutator.java
@@ -1,5 +1,7 @@
 package org.hypertrace.graphql.label.mutator;
 
+import static org.hypertrace.core.graphql.context.GraphQlRequestContext.contextFromEnvironment;
+
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
 import java.util.concurrent.CompletableFuture;
@@ -30,7 +32,7 @@ public CompletableFuture<Label> get(DataFetchingEnvironment environment) {
       return this.configDao
           .createLabel(
               this.requestBuilder.buildCreateRequest(
-                  environment.getContext(), environment.getArguments()))
+                  contextFromEnvironment(environment), environment.getArguments()))
           .toCompletionStage()
           .toCompletableFuture();
     }
diff --git a/hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/mutator/LabelUpdateMutator.java b/hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/mutator/LabelUpdateMutator.java
index 899184c6..61b474b2 100644
--- a/hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/mutator/LabelUpdateMutator.java
+++ b/hypertrace-graphql-labels-schema-api/src/main/java/org/hypertrace/graphql/label/mutator/LabelUpdateMutator.java
@@ -1,5 +1,7 @@
 package org.hypertrace.graphql.label.mutator;
 
+import static org.hypertrace.core.graphql.context.GraphQlRequestContext.contextFromEnvironment;
+
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
 import java.util.concurrent.CompletableFuture;
@@ -30,7 +32,7 @@ public CompletableFuture<Label> get(DataFetchingEnvironment environment) {
       return this.configDao
           .updateLabel(
               this.requestBuilder.buildUpdateRequest(
-                  environment.getContext(), environment.getArguments()))
+                  contextFromEnvironment(environment), environment.getArguments()))
           .toCompletionStage()
           .toCompletableFuture();
     }
diff --git a/hypertrace-graphql-spaces-schema/src/main/java/org/hypertrace/graphql/spaces/fetcher/SpaceConfigRuleFetcher.java b/hypertrace-graphql-spaces-schema/src/main/java/org/hypertrace/graphql/spaces/fetcher/SpaceConfigRuleFetcher.java
index 7c25dd32..ab198d7c 100644
--- a/hypertrace-graphql-spaces-schema/src/main/java/org/hypertrace/graphql/spaces/fetcher/SpaceConfigRuleFetcher.java
+++ b/hypertrace-graphql-spaces-schema/src/main/java/org/hypertrace/graphql/spaces/fetcher/SpaceConfigRuleFetcher.java
@@ -1,5 +1,7 @@
 package org.hypertrace.graphql.spaces.fetcher;
 
+import static org.hypertrace.core.graphql.context.GraphQlRequestContext.contextFromEnvironment;
+
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
 import java.util.concurrent.CompletableFuture;
@@ -26,7 +28,7 @@ static final class SpaceConfigRuleFetcherImpl
     @Override
     public CompletableFuture<SpaceConfigRuleResultSet> get(DataFetchingEnvironment environment) {
       return this.configDao
-          .getAllRules(environment.getContext())
+          .getAllRules(contextFromEnvironment(environment))
           .toCompletionStage()
           .toCompletableFuture();
     }
diff --git a/hypertrace-graphql-spaces-schema/src/main/java/org/hypertrace/graphql/spaces/fetcher/SpacesFetcher.java b/hypertrace-graphql-spaces-schema/src/main/java/org/hypertrace/graphql/spaces/fetcher/SpacesFetcher.java
index 1a699334..0d80f3da 100644
--- a/hypertrace-graphql-spaces-schema/src/main/java/org/hypertrace/graphql/spaces/fetcher/SpacesFetcher.java
+++ b/hypertrace-graphql-spaces-schema/src/main/java/org/hypertrace/graphql/spaces/fetcher/SpacesFetcher.java
@@ -1,5 +1,7 @@
 package org.hypertrace.graphql.spaces.fetcher;
 
+import static org.hypertrace.core.graphql.context.GraphQlRequestContext.contextFromEnvironment;
+
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
 import java.util.concurrent.CompletableFuture;
@@ -25,7 +27,7 @@ static final class SpacesFetcherImpl implements DataFetcher<CompletableFuture<Sp
     @Override
     public CompletableFuture<SpaceResultSet> get(DataFetchingEnvironment environment) {
       return this.configDao
-          .getAllSpaces(environment.getContext())
+          .getAllSpaces(contextFromEnvironment(environment))
           .toCompletionStage()
           .toCompletableFuture();
     }
diff --git a/hypertrace-graphql-spaces-schema/src/main/java/org/hypertrace/graphql/spaces/mutator/SpaceConfigRuleCreationMutator.java b/hypertrace-graphql-spaces-schema/src/main/java/org/hypertrace/graphql/spaces/mutator/SpaceConfigRuleCreationMutator.java
index 73404d4e..fd4fc6a4 100644
--- a/hypertrace-graphql-spaces-schema/src/main/java/org/hypertrace/graphql/spaces/mutator/SpaceConfigRuleCreationMutator.java
+++ b/hypertrace-graphql-spaces-schema/src/main/java/org/hypertrace/graphql/spaces/mutator/SpaceConfigRuleCreationMutator.java
@@ -1,5 +1,7 @@
 package org.hypertrace.graphql.spaces.mutator;
 
+import static org.hypertrace.core.graphql.context.GraphQlRequestContext.contextFromEnvironment;
+
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
 import java.util.concurrent.CompletableFuture;
@@ -32,7 +34,7 @@ public CompletableFuture<SpaceConfigRule> get(DataFetchingEnvironment environmen
       return this.configDao
           .createRule(
               this.requestBuilder.buildCreationRequest(
-                  environment.getContext(), environment.getArguments()))
+                  contextFromEnvironment(environment), environment.getArguments()))
           .toCompletionStage()
           .toCompletableFuture();
     }
diff --git a/hypertrace-graphql-spaces-schema/src/main/java/org/hypertrace/graphql/spaces/mutator/SpaceConfigRuleDeleteMutator.java b/hypertrace-graphql-spaces-schema/src/main/java/org/hypertrace/graphql/spaces/mutator/SpaceConfigRuleDeleteMutator.java
index 4ba3ce15..00588732 100644
--- a/hypertrace-graphql-spaces-schema/src/main/java/org/hypertrace/graphql/spaces/mutator/SpaceConfigRuleDeleteMutator.java
+++ b/hypertrace-graphql-spaces-schema/src/main/java/org/hypertrace/graphql/spaces/mutator/SpaceConfigRuleDeleteMutator.java
@@ -1,5 +1,7 @@
 package org.hypertrace.graphql.spaces.mutator;
 
+import static org.hypertrace.core.graphql.context.GraphQlRequestContext.contextFromEnvironment;
+
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
 import java.util.concurrent.CompletableFuture;
@@ -31,7 +33,7 @@ public CompletableFuture<Boolean> get(DataFetchingEnvironment environment) {
       return this.configDao
           .deleteRule(
               this.requestBuilder.buildDeleteRequest(
-                  environment.getContext(), environment.getArguments()))
+                  contextFromEnvironment(environment), environment.getArguments()))
           .toCompletionStage()
           .toCompletableFuture();
     }
diff --git a/hypertrace-graphql-spaces-schema/src/main/java/org/hypertrace/graphql/spaces/mutator/SpaceConfigRuleUpdateMutator.java b/hypertrace-graphql-spaces-schema/src/main/java/org/hypertrace/graphql/spaces/mutator/SpaceConfigRuleUpdateMutator.java
index 5a168a9e..3003b694 100644
--- a/hypertrace-graphql-spaces-schema/src/main/java/org/hypertrace/graphql/spaces/mutator/SpaceConfigRuleUpdateMutator.java
+++ b/hypertrace-graphql-spaces-schema/src/main/java/org/hypertrace/graphql/spaces/mutator/SpaceConfigRuleUpdateMutator.java
@@ -1,5 +1,7 @@
 package org.hypertrace.graphql.spaces.mutator;
 
+import static org.hypertrace.core.graphql.context.GraphQlRequestContext.contextFromEnvironment;
+
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
 import java.util.concurrent.CompletableFuture;
@@ -32,7 +34,7 @@ public CompletableFuture<SpaceConfigRule> get(DataFetchingEnvironment environmen
       return this.configDao
           .updateRule(
               this.requestBuilder.buildUpdateRequest(
-                  environment.getContext(), environment.getArguments()))
+                  contextFromEnvironment(environment), environment.getArguments()))
           .toCompletionStage()
           .toCompletableFuture();
     }
diff --git a/hypertrace-graphql-span-processing-schema/src/main/java/org/hypertrace/graphql/spanprocessing/fetcher/mutation/ExcludeSpanCreateRuleMutator.java b/hypertrace-graphql-span-processing-schema/src/main/java/org/hypertrace/graphql/spanprocessing/fetcher/mutation/ExcludeSpanCreateRuleMutator.java
index d2a3e632..aeef3b63 100644
--- a/hypertrace-graphql-span-processing-schema/src/main/java/org/hypertrace/graphql/spanprocessing/fetcher/mutation/ExcludeSpanCreateRuleMutator.java
+++ b/hypertrace-graphql-span-processing-schema/src/main/java/org/hypertrace/graphql/spanprocessing/fetcher/mutation/ExcludeSpanCreateRuleMutator.java
@@ -1,5 +1,7 @@
 package org.hypertrace.graphql.spanprocessing.fetcher.mutation;
 
+import static org.hypertrace.core.graphql.context.GraphQlRequestContext.contextFromEnvironment;
+
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
 import java.util.concurrent.CompletableFuture;
@@ -31,7 +33,7 @@ static final class ExcludeSpanCreateRuleMutatorImpl
     @Override
     public CompletableFuture<ExcludeSpanRule> get(DataFetchingEnvironment environment) {
       return this.requestBuilder
-          .build(environment.getContext(), environment.getArguments())
+          .build(contextFromEnvironment(environment), environment.getArguments())
           .flatMap(this.spanProcessingRuleDao::createExcludeSpanRule)
           .toCompletionStage()
           .toCompletableFuture();
diff --git a/hypertrace-graphql-span-processing-schema/src/main/java/org/hypertrace/graphql/spanprocessing/fetcher/mutation/ExcludeSpanDeleteRuleMutator.java b/hypertrace-graphql-span-processing-schema/src/main/java/org/hypertrace/graphql/spanprocessing/fetcher/mutation/ExcludeSpanDeleteRuleMutator.java
index a770d5c9..be92ec14 100644
--- a/hypertrace-graphql-span-processing-schema/src/main/java/org/hypertrace/graphql/spanprocessing/fetcher/mutation/ExcludeSpanDeleteRuleMutator.java
+++ b/hypertrace-graphql-span-processing-schema/src/main/java/org/hypertrace/graphql/spanprocessing/fetcher/mutation/ExcludeSpanDeleteRuleMutator.java
@@ -1,5 +1,7 @@
 package org.hypertrace.graphql.spanprocessing.fetcher.mutation;
 
+import static org.hypertrace.core.graphql.context.GraphQlRequestContext.contextFromEnvironment;
+
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
 import java.util.concurrent.CompletableFuture;
@@ -33,7 +35,7 @@ static final class ExcludeSpanDeleteRuleMutatorImpl
     public CompletableFuture<DeleteSpanProcessingRuleResponse> get(
         DataFetchingEnvironment environment) {
       return this.requestBuilder
-          .build(environment.getContext(), environment.getArguments())
+          .build(contextFromEnvironment(environment), environment.getArguments())
           .flatMap(this.spanProcessingRuleDao::deleteExcludeSpanRule)
           .toCompletionStage()
           .toCompletableFuture();
diff --git a/hypertrace-graphql-span-processing-schema/src/main/java/org/hypertrace/graphql/spanprocessing/fetcher/mutation/ExcludeSpanUpdateRuleMutator.java b/hypertrace-graphql-span-processing-schema/src/main/java/org/hypertrace/graphql/spanprocessing/fetcher/mutation/ExcludeSpanUpdateRuleMutator.java
index 509cb2e2..32012fed 100644
--- a/hypertrace-graphql-span-processing-schema/src/main/java/org/hypertrace/graphql/spanprocessing/fetcher/mutation/ExcludeSpanUpdateRuleMutator.java
+++ b/hypertrace-graphql-span-processing-schema/src/main/java/org/hypertrace/graphql/spanprocessing/fetcher/mutation/ExcludeSpanUpdateRuleMutator.java
@@ -1,5 +1,7 @@
 package org.hypertrace.graphql.spanprocessing.fetcher.mutation;
 
+import static org.hypertrace.core.graphql.context.GraphQlRequestContext.contextFromEnvironment;
+
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
 import java.util.concurrent.CompletableFuture;
@@ -31,7 +33,7 @@ static final class ExcludeSpanUpdateRuleMutatorImpl
     @Override
     public CompletableFuture<ExcludeSpanRule> get(DataFetchingEnvironment environment) {
       return this.requestBuilder
-          .build(environment.getContext(), environment.getArguments())
+          .build(contextFromEnvironment(environment), environment.getArguments())
           .flatMap(this.spanProcessingRuleDao::updateExcludeSpanRule)
           .toCompletionStage()
           .toCompletableFuture();
diff --git a/hypertrace-graphql-span-processing-schema/src/main/java/org/hypertrace/graphql/spanprocessing/fetcher/query/ExcludeSpanRulesFetcher.java b/hypertrace-graphql-span-processing-schema/src/main/java/org/hypertrace/graphql/spanprocessing/fetcher/query/ExcludeSpanRulesFetcher.java
index c7465a53..0e2cbce7 100644
--- a/hypertrace-graphql-span-processing-schema/src/main/java/org/hypertrace/graphql/spanprocessing/fetcher/query/ExcludeSpanRulesFetcher.java
+++ b/hypertrace-graphql-span-processing-schema/src/main/java/org/hypertrace/graphql/spanprocessing/fetcher/query/ExcludeSpanRulesFetcher.java
@@ -1,5 +1,7 @@
 package org.hypertrace.graphql.spanprocessing.fetcher.query;
 
+import static org.hypertrace.core.graphql.context.GraphQlRequestContext.contextFromEnvironment;
+
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
 import java.util.concurrent.CompletableFuture;
@@ -30,7 +32,7 @@ static final class ExcludeSpanRulesFetcherImpl
     @Override
     public CompletableFuture<ExcludeSpanRuleResultSet> get(DataFetchingEnvironment environment) {
       return this.spanProcessingRuleDao
-          .getExcludeSpanRules(this.requestBuilder.build(environment.getContext()))
+          .getExcludeSpanRules(this.requestBuilder.build(contextFromEnvironment(environment)))
           .toCompletionStage()
           .toCompletableFuture();
     }

From 67f473cd608dac01f1b40eb3fc81303057ae8324 Mon Sep 17 00:00:00 2001
From: Aaron Steinfeld <aaron@traceable.ai>
Date: Mon, 17 Apr 2023 14:23:12 +0530
Subject: [PATCH 2/2] chore: update submodule to main

---
 hypertrace-core-graphql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hypertrace-core-graphql b/hypertrace-core-graphql
index 69ce0440..3e90c7a0 160000
--- a/hypertrace-core-graphql
+++ b/hypertrace-core-graphql
@@ -1 +1 @@
-Subproject commit 69ce044055889015c58b5c3a0e5994b7779e463b
+Subproject commit 3e90c7a0f4343c8bbd6d4cf37b6de7719804aca7