Merge remote-tracking branch 'origin/main' into update-submodule

rish691 · rish691 · commit 3f631f79a53d · 2021-04-29T19:09:37.000+05:30
diff --git a/hypertrace-graphql-attribute-scope/src/main/java/org/hypertrace/graphql/atttribute/scopes/HypertraceAttributeScopeModule.java b/hypertrace-graphql-attribute-scope/src/main/java/org/hypertrace/graphql/atttribute/scopes/HypertraceAttributeScopeModule.java
@@ -2,6 +2,7 @@
 
 import static org.hypertrace.core.graphql.attributes.IdMapping.forForeignId;
 import static org.hypertrace.core.graphql.attributes.IdMapping.forId;
+import static org.hypertrace.core.graphql.atttributes.scopes.HypertraceCoreAttributeScopeString.LOG_EVENT;
 import static org.hypertrace.core.graphql.atttributes.scopes.HypertraceCoreAttributeScopeString.SPAN;
 import static org.hypertrace.core.graphql.atttributes.scopes.HypertraceCoreAttributeScopeString.TRACE;
 import static org.hypertrace.graphql.atttribute.scopes.HypertraceAttributeScopeString.API;
@@ -48,5 +49,7 @@ protected void configure() {
     idBinder.addBinding().toInstance(forForeignId(BACKEND_TRACE, API, "callerApiId"));
     idBinder.addBinding().toInstance(forForeignId(BACKEND_TRACE, TRACE, "traceId"));
     idBinder.addBinding().toInstance(forForeignId(BACKEND_TRACE, BACKEND, "backendId"));
+
+    idBinder.addBinding().toInstance(forForeignId(LOG_EVENT, SPAN, "spanId"));
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`
`3`	`3`	`import static org.hypertrace.core.graphql.attributes.IdMapping.forForeignId;`
`4`	`4`	`import static org.hypertrace.core.graphql.attributes.IdMapping.forId;`
	`5`	`+import static org.hypertrace.core.graphql.atttributes.scopes.HypertraceCoreAttributeScopeString.LOG_EVENT;`
`5`	`6`	`import static org.hypertrace.core.graphql.atttributes.scopes.HypertraceCoreAttributeScopeString.SPAN;`
`6`	`7`	`import static org.hypertrace.core.graphql.atttributes.scopes.HypertraceCoreAttributeScopeString.TRACE;`
`7`	`8`	`import static org.hypertrace.graphql.atttribute.scopes.HypertraceAttributeScopeString.API;`
`@@ -48,5 +49,7 @@ protected void configure() {`
`48`	`49`	`idBinder.addBinding().toInstance(forForeignId(BACKEND_TRACE, API, "callerApiId"));`
`49`	`50`	`idBinder.addBinding().toInstance(forForeignId(BACKEND_TRACE, TRACE, "traceId"));`
`50`	`51`	`idBinder.addBinding().toInstance(forForeignId(BACKEND_TRACE, BACKEND, "backendId"));`
	`52`	`+`
	`53`	`+ idBinder.addBinding().toInstance(forForeignId(LOG_EVENT, SPAN, "spanId"));`
`51`	`54`	`}`
`52`	`55`	`}`