added final

Author: somalaya

common/src/main/java/com/microsoft/identity/common/internal/ui/webview/AzureActiveDirectoryWebViewClient.java

@@ -696,7 +696,7 @@ private boolean shouldLaunchCompanyPortal() {
     @VisibleForTesting
     protected void loadDeviceCaUrl(@NonNull final String originalUrl, @NonNull final WebView view) {
         final String methodTag = TAG + ":loadDeviceCaUrl";
-        final Span span = createWebCpFlowSpan(SpanName.ProcessWebCpRedirects.name());
+        final Span span = createSpanWithAttributesFromParent(SpanName.ProcessWebCpRedirects.name());
         try (final Scope scope = SpanExtension.makeCurrentSpan(span)) {
             if (isWebCpInWebviewFeatureEnabled(originalUrl)) {
                 Logger.info(methodTag, "Loading device CA request in WebView.");
@@ -741,11 +741,7 @@ protected boolean isWebCpInWebviewFeatureEnabled(@NonNull final String originalU
             final int waitForFlightsTimeOut = CommonFlightsManager.INSTANCE.getFlightsProvider().getIntValue(CommonFlight.WEB_CP_WAIT_TIMEOUT_FOR_FLIGHTS);
             final boolean isWebCpFlightEnabled = CommonFlightsManager.INSTANCE.getFlightsProviderForTenant(homeTenantId, waitForFlightsTimeOut).isFlightEnabled(CommonFlight.ENABLE_WEB_CP_IN_WEBVIEW);
             SpanExtension.current().setAttribute(AttributeName.web_cp_flight_get_time.name(), (System.currentTimeMillis() - webCpGetFlightStartTime));
-<<<<<<< HEAD
-
-=======
             SpanExtension.current().setAttribute(AttributeName.tenant_id.name(), homeTenantId);
->>>>>>> 37a33baf5 (spans using baggage to get parent's properties)
             if (isWebCpFlightEnabled) {
                 // Directly enabled via flight rollout.
                 Logger.info(methodTag, "WebCP in WebView feature is enabled.");
@@ -773,7 +769,7 @@ private String getHomeTenantIdFromUrl(@NonNull final String url) {
     // This is a special case where the enrollment is not done in the WebView, but rather in the browser.
     private void processWebCpEnrollmentUrl(@NonNull final WebView view, @NonNull final String url) {
         final String methodTag = TAG + ":processWebCpEnrollmentUrl";
-        final Span span = createWebCpFlowSpan(SpanName.ProcessWebCpEnrollmentRedirect.name());
+        final Span span = createSpanWithAttributesFromParent(SpanName.ProcessWebCpEnrollmentRedirect.name());
         try (final Scope scope = SpanExtension.makeCurrentSpan(span)) {
             view.stopLoading();
             Logger.info(methodTag, "Loading WebCP enrollment url in browser.");
@@ -1067,7 +1063,7 @@ private void processNonceAndReAttachHeaders(@NonNull final WebView view, @NonNul
     private void processWebCpAuthorize(@NonNull final WebView view, @NonNull final String url) {
         final String methodTag = TAG + ":processWebCPAuthorize";
         Logger.info(methodTag, "Processing WebCP authorize request.");
-        final Span span = createWebCpFlowSpan(SpanName.ProcessWebCpAuthorizeUrlRedirect.name());
+        final Span span = createSpanWithAttributesFromParent(SpanName.ProcessWebCpAuthorizeUrlRedirect.name());
         final ReAttachPrtHeaderHandler reAttachPrtHeaderHandler = new ReAttachPrtHeaderHandler(view, mRequestHeaders, span);
         reAttachPrtHeader(url, reAttachPrtHeaderHandler, view, methodTag, span);
     }
@@ -1192,7 +1188,6 @@ public void finalizeBeforeSendingResult(@NonNull final RawAuthorizationResult re
     }
 
     /**
-<<<<<<< HEAD
      * Extracts the broker app package name from the given URL.
      * Supports all known broker apps. Returns the first match found.
      * If no known broker app is found, logs a warning and returns an empty string.
@@ -1210,22 +1205,24 @@ private String getBrokerAppPackageNameFromUrl(@NonNull final String url) {
         return "";
     }
 
-=======
-     * Create a span for webcp flow with parent span context if available.
+    /**
+     * Create a span with parent span context if available.
      * @param spanName Name of the span to be created.
      * @return Created {@link Span}
      */
-    private Span createWebCpFlowSpan(@NonNull final String spanName) {
+    private Span createSpanWithAttributesFromParent(@NonNull final String spanName) {
         final SpanContext spanContext = getActivity() instanceof AuthorizationActivity ? ((AuthorizationActivity) getActivity()).getSpanContext() : null;
         final Span span = spanContext != null ?
                 OTelUtility.createSpanFromParent(spanName, spanContext) : OTelUtility.createSpan(spanName);
-        // Populate some of parent span's attributes to current span.
+        if (mUtid != null) {
+            span.setAttribute(AttributeName.tenant_id.name(), mUtid);
+        }
+        // Populate some of the parent span's attributes to current span.
         final Context oTelContext = getActivity() instanceof AuthorizationActivity ? ((AuthorizationActivity) getActivity()).getOtelContext() : null;
         if (oTelContext != null) {
             final Baggage baggage = BaggageExtension.fromContext(oTelContext);
             final List<AttributeName> parentAttributeNames = Arrays.asList(
                     AttributeName.correlation_id,
-                    AttributeName.tenant_id,
                     AttributeName.calling_package_name
             );
             for (AttributeName attributeName : parentAttributeNames) {
@@ -1237,5 +1234,4 @@ private Span createWebCpFlowSpan(@NonNull final String spanName) {
         }
         return span;
     }
->>>>>>> 37a33baf5 (spans using baggage to get parent's properties)
 }