From 2c26eb99458e32b22ebcb6c865cfa74b88a7ed5f Mon Sep 17 00:00:00 2001 From: Darren Bolduc Date: Wed, 18 Oct 2023 16:34:46 -0400 Subject: [PATCH] fix(otel): end async client spans properly (#12919) --- .../golden_kitchen_sink_tracing_connection.cc | 4 +- .../golden_kitchen_sink_tracing_stub.cc | 6 +- .../golden_thing_admin_tracing_connection.cc | 22 +-- .../golden_thing_admin_tracing_stub.cc | 54 ++---- ...en_kitchen_sink_tracing_connection_test.cc | 3 + .../golden_kitchen_sink_tracing_stub_test.cc | 4 + ...den_thing_admin_tracing_connection_test.cc | 12 ++ .../golden_thing_admin_tracing_stub_test.cc | 9 + .../internal/tracing_connection_generator.cc | 8 +- generator/internal/tracing_stub_generator.cc | 30 ++- .../access_approval_tracing_connection.cc | 2 +- ...cess_context_manager_tracing_connection.cc | 38 ++-- .../access_context_manager_tracing_stub.cc | 102 ++++------ ...visory_notifications_tracing_connection.cc | 2 +- .../v1/internal/dataset_tracing_connection.cc | 28 +-- .../v1/internal/dataset_tracing_stub.cc | 60 ++---- .../internal/endpoint_tracing_connection.cc | 12 +- .../v1/internal/endpoint_tracing_stub.cc | 42 ++--- ...store_online_serving_tracing_connection.cc | 2 +- .../featurestore_tracing_connection.cc | 32 ++-- .../v1/internal/featurestore_tracing_stub.cc | 84 +++------ .../index_endpoint_tracing_connection.cc | 12 +- .../internal/index_endpoint_tracing_stub.cc | 42 ++--- .../v1/internal/index_tracing_connection.cc | 8 +- .../v1/internal/index_tracing_stub.cc | 30 +-- .../v1/internal/job_tracing_connection.cc | 30 +-- .../v1/internal/job_tracing_stub.cc | 54 ++---- .../internal/metadata_tracing_connection.cc | 26 +-- .../v1/internal/metadata_tracing_stub.cc | 60 ++---- .../internal/migration_tracing_connection.cc | 4 +- .../v1/internal/migration_tracing_stub.cc | 18 +- .../v1/internal/model_tracing_connection.cc | 20 +- .../v1/internal/model_tracing_stub.cc | 48 ++--- .../internal/pipeline_tracing_connection.cc | 8 +- .../v1/internal/pipeline_tracing_stub.cc | 24 +-- .../internal/prediction_tracing_connection.cc | 2 +- .../specialist_pool_tracing_connection.cc | 8 +- .../internal/specialist_pool_tracing_stub.cc | 30 +-- .../tensorboard_tracing_connection.cc | 24 +-- .../v1/internal/tensorboard_tracing_stub.cc | 48 ++--- .../v1/internal/vizier_tracing_connection.cc | 8 +- .../v1/internal/vizier_tracing_stub.cc | 24 +-- .../alloy_db_admin_tracing_connection.cc | 44 ++--- .../internal/alloy_db_admin_tracing_stub.cc | 114 ++++-------- .../api_gateway_tracing_connection.cc | 24 +-- .../v1/internal/api_gateway_tracing_stub.cc | 66 +++---- .../internal/connection_tracing_connection.cc | 2 +- .../internal/api_keys_tracing_connection.cc | 10 +- .../v2/internal/api_keys_tracing_stub.cc | 36 ++-- .../applications_tracing_connection.cc | 6 +- .../v1/internal/applications_tracing_stub.cc | 30 +-- ...horized_certificates_tracing_connection.cc | 2 +- .../authorized_domains_tracing_connection.cc | 2 +- .../domain_mappings_tracing_connection.cc | 8 +- .../internal/domain_mappings_tracing_stub.cc | 30 +-- .../internal/firewall_tracing_connection.cc | 2 +- .../internal/instances_tracing_connection.cc | 6 +- .../v1/internal/instances_tracing_stub.cc | 24 +-- .../internal/services_tracing_connection.cc | 6 +- .../v1/internal/services_tracing_stub.cc | 24 +-- .../internal/versions_tracing_connection.cc | 8 +- .../v1/internal/versions_tracing_stub.cc | 30 +-- .../artifact_registry_tracing_connection.cc | 30 +-- .../artifact_registry_tracing_stub.cc | 48 ++--- .../v1/internal/asset_tracing_connection.cc | 18 +- .../asset/v1/internal/asset_tracing_stub.cc | 24 +-- .../assured_workloads_tracing_connection.cc | 6 +- .../assured_workloads_tracing_stub.cc | 18 +- .../v1/internal/auto_ml_tracing_connection.cc | 24 +-- .../v1/internal/auto_ml_tracing_stub.cc | 66 +++---- .../internal/prediction_tracing_connection.cc | 2 +- .../v1/internal/prediction_tracing_stub.cc | 18 +- .../bare_metal_solution_tracing_connection.cc | 50 ++--- .../bare_metal_solution_tracing_stub.cc | 108 ++++------- .../v1/internal/batch_tracing_connection.cc | 6 +- .../batch/v1/internal/batch_tracing_stub.cc | 18 +- .../app_connections_tracing_connection.cc | 10 +- .../internal/app_connections_tracing_stub.cc | 30 +-- .../app_connectors_tracing_connection.cc | 10 +- .../internal/app_connectors_tracing_stub.cc | 36 ++-- .../app_gateways_tracing_connection.cc | 6 +- .../v1/internal/app_gateways_tracing_stub.cc | 24 +-- .../analytics_hub_tracing_connection.cc | 16 +- .../v1/internal/analytics_hub_tracing_stub.cc | 30 +-- .../internal/metastore_tracing_connection.cc | 6 +- .../internal/connection_tracing_connection.cc | 2 +- .../data_policy_tracing_connection.cc | 2 +- .../data_transfer_tracing_connection.cc | 8 +- .../internal/migration_tracing_connection.cc | 4 +- .../reservation_tracing_connection.cc | 10 +- .../bigquery_read_tracing_connection.cc | 2 +- .../internal/bigquery_write_tracing_stub.cc | 2 +- ...table_instance_admin_tracing_connection.cc | 16 +- .../bigtable_instance_admin_tracing_stub.cc | 48 ++--- ...bigtable_table_admin_tracing_connection.cc | 16 +- .../bigtable_table_admin_tracing_stub.cc | 48 ++--- .../internal/bigtable_tracing_stub.cc | 24 +-- .../v1/internal/budget_tracing_connection.cc | 2 +- .../cloud_billing_tracing_connection.cc | 4 +- .../cloud_catalog_tracing_connection.cc | 4 +- ...anagement_service_v1_tracing_connection.cc | 2 +- .../certificate_manager_tracing_connection.cc | 38 ++-- .../certificate_manager_tracing_stub.cc | 96 ++++------ ...loud_channel_reports_tracing_connection.cc | 6 +- .../cloud_channel_reports_tracing_stub.cc | 18 +- .../cloud_channel_tracing_connection.cc | 54 +++--- .../v1/internal/cloud_channel_tracing_stub.cc | 78 +++----- .../cloud_build_tracing_connection.cc | 20 +- .../v1/internal/cloud_build_tracing_stub.cc | 54 ++---- .../repository_manager_tracing_connection.cc | 18 +- .../repository_manager_tracing_stub.cc | 48 ++--- ...consumer_procurement_tracing_connection.cc | 4 +- .../consumer_procurement_tracing_stub.cc | 18 +- .../environments_tracing_connection.cc | 14 +- .../v1/internal/environments_tracing_stub.cc | 48 ++--- .../image_versions_tracing_connection.cc | 2 +- .../accelerator_types_tracing_connection.cc | 4 +- .../internal/addresses_tracing_connection.cc | 12 +- .../autoscalers_tracing_connection.cc | 12 +- .../backend_buckets_tracing_connection.cc | 16 +- .../backend_services_tracing_connection.cc | 22 +-- .../internal/disk_types_tracing_connection.cc | 4 +- .../v1/internal/disks_tracing_connection.cc | 28 +-- ...xternal_vpn_gateways_tracing_connection.cc | 8 +- .../firewall_policies_tracing_connection.cc | 22 +-- .../internal/firewalls_tracing_connection.cc | 10 +- .../forwarding_rules_tracing_connection.cc | 14 +- .../global_addresses_tracing_connection.cc | 10 +- ...bal_forwarding_rules_tracing_connection.cc | 12 +- ...work_endpoint_groups_tracing_connection.cc | 12 +- .../global_operations_tracing_connection.cc | 4 +- ...anization_operations_tracing_connection.cc | 2 +- ...c_delegated_prefixes_tracing_connection.cc | 8 +- .../health_checks_tracing_connection.cc | 12 +- .../http_health_checks_tracing_connection.cc | 10 +- .../https_health_checks_tracing_connection.cc | 10 +- .../v1/internal/images_tracing_connection.cc | 12 +- ...tance_group_managers_tracing_connection.cc | 36 ++-- .../instance_groups_tracing_connection.cc | 16 +- .../instance_templates_tracing_connection.cc | 8 +- .../internal/instances_tracing_connection.cc | 74 ++++---- ...rconnect_attachments_tracing_connection.cc | 12 +- ...terconnect_locations_tracing_connection.cc | 2 +- ...ect_remote_locations_tracing_connection.cc | 2 +- .../interconnects_tracing_connection.cc | 10 +- .../internal/licenses_tracing_connection.cc | 6 +- .../machine_images_tracing_connection.cc | 6 +- .../machine_types_tracing_connection.cc | 4 +- .../network_attachments_tracing_connection.cc | 10 +- ...ge_security_services_tracing_connection.cc | 8 +- ...work_endpoint_groups_tracing_connection.cc | 14 +- ...rk_firewall_policies_tracing_connection.cc | 20 +- .../internal/networks_tracing_connection.cc | 18 +- .../node_groups_tracing_connection.cc | 20 +- .../node_templates_tracing_connection.cc | 8 +- .../internal/node_types_tracing_connection.cc | 4 +- .../packet_mirrorings_tracing_connection.cc | 10 +- .../internal/projects_tracing_connection.cc | 20 +- ..._advertised_prefixes_tracing_connection.cc | 8 +- ...c_delegated_prefixes_tracing_connection.cc | 10 +- .../region_autoscalers_tracing_connection.cc | 10 +- ...ion_backend_services_tracing_connection.cc | 14 +- .../region_commitments_tracing_connection.cc | 8 +- .../region_disk_types_tracing_connection.cc | 2 +- .../region_disks_tracing_connection.cc | 26 +-- ...ealth_check_services_tracing_connection.cc | 8 +- ...region_health_checks_tracing_connection.cc | 10 +- ...tance_group_managers_tracing_connection.cc | 34 ++-- ...gion_instance_groups_tracing_connection.cc | 6 +- ...n_instance_templates_tracing_connection.cc | 6 +- .../region_instances_tracing_connection.cc | 2 +- ...work_endpoint_groups_tracing_connection.cc | 12 +- ...rk_firewall_policies_tracing_connection.cc | 20 +- ...tification_endpoints_tracing_connection.cc | 6 +- .../region_operations_tracing_connection.cc | 2 +- ...on_security_policies_tracing_connection.cc | 14 +- ...ion_ssl_certificates_tracing_connection.cc | 6 +- .../region_ssl_policies_tracing_connection.cc | 8 +- ..._target_http_proxies_tracing_connection.cc | 8 +- ...target_https_proxies_tracing_connection.cc | 12 +- ...n_target_tcp_proxies_tracing_connection.cc | 6 +- .../region_url_maps_tracing_connection.cc | 10 +- .../v1/internal/regions_tracing_connection.cc | 2 +- .../reservations_tracing_connection.cc | 12 +- .../resource_policies_tracing_connection.cc | 10 +- .../v1/internal/routers_tracing_connection.cc | 12 +- .../v1/internal/routes_tracing_connection.cc | 6 +- .../security_policies_tracing_connection.cc | 18 +- .../service_attachments_tracing_connection.cc | 10 +- .../internal/snapshots_tracing_connection.cc | 8 +- .../ssl_certificates_tracing_connection.cc | 8 +- .../ssl_policies_tracing_connection.cc | 10 +- .../subnetworks_tracing_connection.cc | 16 +- .../target_grpc_proxies_tracing_connection.cc | 8 +- .../target_http_proxies_tracing_connection.cc | 12 +- ...target_https_proxies_tracing_connection.cc | 20 +- .../target_instances_tracing_connection.cc | 10 +- .../target_pools_tracing_connection.cc | 20 +- .../target_ssl_proxies_tracing_connection.cc | 16 +- .../target_tcp_proxies_tracing_connection.cc | 12 +- .../target_vpn_gateways_tracing_connection.cc | 10 +- .../internal/url_maps_tracing_connection.cc | 14 +- .../vpn_gateways_tracing_connection.cc | 10 +- .../vpn_tunnels_tracing_connection.cc | 10 +- .../zone_operations_tracing_connection.cc | 2 +- .../v1/internal/zones_tracing_connection.cc | 2 +- .../v1/internal/config_tracing_connection.cc | 16 +- .../config/v1/internal/config_tracing_stub.cc | 42 ++--- .../internal/connectors_tracing_connection.cc | 20 +- .../v1/internal/connectors_tracing_stub.cc | 36 ++-- ...tact_center_insights_tracing_connection.cc | 26 +-- .../contact_center_insights_tracing_stub.cc | 66 +++---- .../cluster_manager_tracing_connection.cc | 2 +- .../v1/internal/grafeas_tracing_connection.cc | 6 +- .../document_link_tracing_connection.cc | 2 +- .../document_schema_tracing_connection.cc | 2 +- .../internal/document_tracing_connection.cc | 2 +- .../internal/rule_set_tracing_connection.cc | 2 +- .../synonym_set_tracing_connection.cc | 2 +- .../v1/internal/lineage_tracing_connection.cc | 14 +- .../v1/internal/lineage_tracing_stub.cc | 24 +-- .../data_catalog_tracing_connection.cc | 12 +- .../v1/internal/data_catalog_tracing_stub.cc | 24 +-- .../policy_tag_manager_tracing_connection.cc | 4 +- .../data_fusion_tracing_connection.cc | 12 +- .../v1/internal/data_fusion_tracing_stub.cc | 36 ++-- .../data_migration_tracing_connection.cc | 60 +++--- .../internal/data_migration_tracing_stub.cc | 150 +++++---------- .../v1/internal/content_tracing_connection.cc | 2 +- .../internal/dataplex_tracing_connection.cc | 50 ++--- .../v1/internal/dataplex_tracing_stub.cc | 102 ++++------ .../internal/metadata_tracing_connection.cc | 4 +- .../autoscaling_policy_tracing_connection.cc | 2 +- .../batch_controller_tracing_connection.cc | 4 +- .../internal/batch_controller_tracing_stub.cc | 18 +- .../cluster_controller_tracing_connection.cc | 14 +- .../cluster_controller_tracing_stub.cc | 48 ++--- .../job_controller_tracing_connection.cc | 4 +- .../internal/job_controller_tracing_stub.cc | 18 +- ...ode_group_controller_tracing_connection.cc | 4 +- .../node_group_controller_tracing_stub.cc | 24 +-- .../workflow_template_tracing_connection.cc | 6 +- .../workflow_template_tracing_stub.cc | 24 +-- .../datastore_admin_tracing_connection.cc | 10 +- .../internal/datastore_admin_tracing_stub.cc | 36 ++-- .../internal/datastream_tracing_connection.cc | 32 ++-- .../v1/internal/datastream_tracing_stub.cc | 72 +++----- .../cloud_deploy_tracing_connection.cc | 26 +-- .../v1/internal/cloud_deploy_tracing_stub.cc | 60 ++---- .../internal/agents_tracing_connection.cc | 6 +- .../internal/agents_tracing_stub.cc | 24 +-- .../internal/changelogs_tracing_connection.cc | 2 +- .../deployments_tracing_connection.cc | 2 +- .../entity_types_tracing_connection.cc | 2 +- .../environments_tracing_connection.cc | 14 +- .../internal/environments_tracing_stub.cc | 36 ++-- .../experiments_tracing_connection.cc | 2 +- .../internal/flows_tracing_connection.cc | 8 +- .../internal/flows_tracing_stub.cc | 30 +-- .../internal/intents_tracing_connection.cc | 6 +- .../internal/intents_tracing_stub.cc | 24 +-- .../internal/pages_tracing_connection.cc | 2 +- .../security_settings_tracing_connection.cc | 2 +- ...session_entity_types_tracing_connection.cc | 2 +- .../internal/sessions_tracing_stub.cc | 2 +- .../internal/test_cases_tracing_connection.cc | 12 +- .../internal/test_cases_tracing_stub.cc | 36 ++-- ...nsition_route_groups_tracing_connection.cc | 2 +- .../internal/versions_tracing_connection.cc | 6 +- .../internal/versions_tracing_stub.cc | 24 +-- .../internal/webhooks_tracing_connection.cc | 2 +- .../internal/agents_tracing_connection.cc | 10 +- .../internal/agents_tracing_stub.cc | 36 ++-- .../answer_records_tracing_connection.cc | 2 +- .../internal/contexts_tracing_connection.cc | 2 +- ...onversation_datasets_tracing_connection.cc | 8 +- .../conversation_datasets_tracing_stub.cc | 30 +-- .../conversation_models_tracing_connection.cc | 14 +- .../conversation_models_tracing_stub.cc | 42 ++--- ...onversation_profiles_tracing_connection.cc | 6 +- .../conversation_profiles_tracing_stub.cc | 24 +-- .../conversations_tracing_connection.cc | 4 +- .../internal/documents_tracing_connection.cc | 14 +- .../internal/documents_tracing_stub.cc | 48 ++--- .../entity_types_tracing_connection.cc | 12 +- .../internal/entity_types_tracing_stub.cc | 42 ++--- .../environments_tracing_connection.cc | 4 +- .../internal/intents_tracing_connection.cc | 6 +- .../internal/intents_tracing_stub.cc | 24 +-- .../knowledge_bases_tracing_connection.cc | 2 +- .../participants_tracing_connection.cc | 2 +- .../internal/participants_tracing_stub.cc | 2 +- ...session_entity_types_tracing_connection.cc | 2 +- .../internal/sessions_tracing_stub.cc | 2 +- .../internal/versions_tracing_connection.cc | 2 +- ...onversational_search_tracing_connection.cc | 2 +- .../internal/document_tracing_connection.cc | 6 +- .../v1/internal/document_tracing_stub.cc | 24 +-- .../v1/internal/schema_tracing_connection.cc | 8 +- .../v1/internal/schema_tracing_stub.cc | 30 +-- .../v1/internal/search_tracing_connection.cc | 2 +- .../internal/user_event_tracing_connection.cc | 2 +- .../v1/internal/user_event_tracing_stub.cc | 18 +- .../dlp/v2/internal/dlp_tracing_connection.cc | 10 +- .../document_processor_tracing_connection.cc | 30 +-- .../document_processor_tracing_stub.cc | 78 +++----- .../v1/internal/domains_tracing_connection.cc | 18 +- .../v1/internal/domains_tracing_stub.cc | 60 ++---- .../edge_container_tracing_connection.cc | 24 +-- .../internal/edge_container_tracing_stub.cc | 60 ++---- .../essential_contacts_tracing_connection.cc | 4 +- .../internal/eventarc_tracing_connection.cc | 24 +-- .../v1/internal/eventarc_tracing_stub.cc | 60 ++---- ...ud_filestore_manager_tracing_connection.cc | 26 +-- .../cloud_filestore_manager_tracing_stub.cc | 72 +++----- .../cloud_functions_tracing_connection.cc | 8 +- .../internal/cloud_functions_tracing_stub.cc | 30 +-- .../internal/function_tracing_connection.cc | 8 +- .../v2/internal/function_tracing_stub.cc | 30 +-- .../backup_for_gke_tracing_connection.cc | 36 ++-- .../internal/backup_for_gke_tracing_stub.cc | 84 +++------ .../v1/internal/gke_hub_tracing_connection.cc | 16 +- .../v1/internal/gke_hub_tracing_stub.cc | 48 ++--- .../attached_clusters_tracing_connection.cc | 10 +- .../attached_clusters_tracing_stub.cc | 36 ++-- .../aws_clusters_tracing_connection.cc | 16 +- .../v1/internal/aws_clusters_tracing_stub.cc | 48 ++--- .../azure_clusters_tracing_connection.cc | 22 +-- .../internal/azure_clusters_tracing_stub.cc | 60 ++---- .../v1/internal/iam_tracing_connection.cc | 8 +- .../internal/policies_tracing_connection.cc | 8 +- .../iam/v2/internal/policies_tracing_stub.cc | 30 +-- ...ty_aware_proxy_admin_tracing_connection.cc | 2 +- ...y_aware_proxy_o_auth_tracing_connection.cc | 2 +- .../ids/v1/internal/ids_tracing_connection.cc | 6 +- .../cloud/ids/v1/internal/ids_tracing_stub.cc | 24 +-- .../key_dashboard_tracing_connection.cc | 2 +- .../key_tracking_tracing_connection.cc | 2 +- .../kms/v1/internal/ekm_tracing_connection.cc | 2 +- .../key_management_tracing_connection.cc | 8 +- .../config_service_v2_tracing_connection.cc | 20 +- .../config_service_v2_tracing_stub.cc | 42 ++--- .../logging_service_v2_tracing_connection.cc | 8 +- .../logging_service_v2_tracing_stub.cc | 8 +- .../metrics_service_v2_tracing_connection.cc | 2 +- .../managed_identities_tracing_connection.cc | 16 +- .../managed_identities_tracing_stub.cc | 54 ++---- .../cloud_memcache_tracing_connection.cc | 14 +- .../internal/cloud_memcache_tracing_stub.cc | 48 ++--- ...metastore_federation_tracing_connection.cc | 8 +- ...aproc_metastore_federation_tracing_stub.cc | 30 +-- .../dataproc_metastore_tracing_connection.cc | 30 +-- .../dataproc_metastore_tracing_stub.cc | 84 +++------ .../migration_center_tracing_connection.cc | 64 +++---- .../internal/migration_center_tracing_stub.cc | 150 +++++---------- .../internal/dashboards_tracing_connection.cc | 2 +- .../metrics_scopes_tracing_connection.cc | 4 +- .../internal/metrics_scopes_tracing_stub.cc | 24 +-- .../alert_policy_tracing_connection.cc | 2 +- .../v3/internal/group_tracing_connection.cc | 4 +- .../v3/internal/metric_tracing_connection.cc | 8 +- .../v3/internal/metric_tracing_stub.cc | 6 +- ...notification_channel_tracing_connection.cc | 4 +- .../v3/internal/query_tracing_connection.cc | 2 +- .../service_monitoring_tracing_connection.cc | 4 +- .../v3/internal/snooze_tracing_connection.cc | 2 +- .../uptime_check_tracing_connection.cc | 4 +- .../v1/internal/net_app_tracing_connection.cc | 58 +++--- .../v1/internal/net_app_tracing_stub.cc | 150 +++++---------- .../v1/internal/hub_tracing_connection.cc | 28 +-- .../v1/internal/hub_tracing_stub.cc | 60 ++---- .../reachability_tracing_connection.cc | 10 +- .../v1/internal/reachability_tracing_stub.cc | 36 ++-- .../network_security_tracing_connection.cc | 24 +-- .../internal/network_security_tracing_stub.cc | 66 +++---- .../network_services_tracing_connection.cc | 62 +++---- .../internal/network_services_tracing_stub.cc | 150 +++++---------- .../managed_notebook_tracing_connection.cc | 22 +-- .../internal/managed_notebook_tracing_stub.cc | 72 +++----- .../internal/notebook_tracing_connection.cc | 54 +++--- .../v1/internal/notebook_tracing_stub.cc | 150 +++++---------- .../internal/notebook_tracing_connection.cc | 20 +- .../v2/internal/notebook_tracing_stub.cc | 66 +++---- .../fleet_routing_tracing_connection.cc | 2 +- .../v1/internal/fleet_routing_tracing_stub.cc | 18 +- .../internal/org_policy_tracing_connection.cc | 4 +- .../agent_endpoint_tracing_connection.cc | 2 +- .../internal/os_config_tracing_connection.cc | 6 +- .../os_config_zonal_tracing_connection.cc | 16 +- .../internal/os_config_zonal_tracing_stub.cc | 30 +-- .../internal/simulator_tracing_connection.cc | 4 +- .../v1/internal/simulator_tracing_stub.cc | 18 +- ...ertificate_authority_tracing_connection.cc | 38 ++-- .../certificate_authority_tracing_stub.cc | 96 ++++------ .../pubsub/internal/publisher_tracing_stub.cc | 6 +- .../internal/schema_tracing_connection.cc | 4 +- .../internal/subscriber_tracing_stub.cc | 14 +- .../internal/admin_tracing_connection.cc | 14 +- .../pubsublite/internal/admin_tracing_stub.cc | 24 +-- .../internal/cursor_tracing_stub.cc | 2 +- .../partition_assignment_tracing_stub.cc | 2 +- .../internal/publisher_tracing_stub.cc | 2 +- .../internal/subscriber_tracing_stub.cc | 2 +- ...migration_assessment_tracing_connection.cc | 16 +- ...rapid_migration_assessment_tracing_stub.cc | 54 ++---- ...recaptcha_enterprise_tracing_connection.cc | 10 +- .../recommender_tracing_connection.cc | 4 +- .../cloud_redis_tracing_connection.cc | 18 +- .../v1/internal/cloud_redis_tracing_stub.cc | 60 ++---- .../v3/internal/folders_tracing_connection.cc | 14 +- .../v3/internal/folders_tracing_stub.cc | 42 ++--- .../organizations_tracing_connection.cc | 2 +- .../internal/projects_tracing_connection.cc | 14 +- .../v3/internal/projects_tracing_stub.cc | 42 ++--- .../tag_bindings_tracing_connection.cc | 8 +- .../v3/internal/tag_bindings_tracing_stub.cc | 24 +-- .../internal/tag_holds_tracing_connection.cc | 6 +- .../v3/internal/tag_holds_tracing_stub.cc | 24 +-- .../internal/tag_keys_tracing_connection.cc | 8 +- .../v3/internal/tag_keys_tracing_stub.cc | 30 +-- .../internal/tag_values_tracing_connection.cc | 8 +- .../v3/internal/tag_values_tracing_stub.cc | 30 +-- .../resource_settings_tracing_connection.cc | 2 +- .../v2/internal/catalog_tracing_connection.cc | 2 +- .../internal/completion_tracing_connection.cc | 2 +- .../v2/internal/completion_tracing_stub.cc | 18 +- .../v2/internal/control_tracing_connection.cc | 2 +- .../v2/internal/model_tracing_connection.cc | 6 +- .../retail/v2/internal/model_tracing_stub.cc | 24 +-- .../v2/internal/product_tracing_connection.cc | 14 +- .../v2/internal/product_tracing_stub.cc | 48 ++--- .../v2/internal/search_tracing_connection.cc | 2 +- .../serving_config_tracing_connection.cc | 2 +- .../internal/user_event_tracing_connection.cc | 6 +- .../v2/internal/user_event_tracing_stub.cc | 30 +-- .../internal/executions_tracing_connection.cc | 6 +- .../v2/internal/executions_tracing_stub.cc | 24 +-- .../v2/internal/jobs_tracing_connection.cc | 10 +- .../run/v2/internal/jobs_tracing_stub.cc | 36 ++-- .../internal/revisions_tracing_connection.cc | 4 +- .../run/v2/internal/revisions_tracing_stub.cc | 18 +- .../internal/services_tracing_connection.cc | 8 +- .../run/v2/internal/services_tracing_stub.cc | 30 +-- .../v2/internal/tasks_tracing_connection.cc | 2 +- .../cloud_scheduler_tracing_connection.cc | 2 +- .../secret_manager_tracing_connection.cc | 4 +- ...ecure_source_manager_tracing_connection.cc | 12 +- .../secure_source_manager_tracing_stub.cc | 36 ++-- .../security_center_tracing_connection.cc | 26 +-- .../internal/security_center_tracing_stub.cc | 24 +-- .../registration_tracing_connection.cc | 6 +- .../service_manager_tracing_connection.cc | 16 +- .../internal/service_manager_tracing_stub.cc | 42 ++--- .../service_usage_tracing_connection.cc | 8 +- .../v1/internal/service_usage_tracing_stub.cc | 30 +-- .../cloud_shell_tracing_connection.cc | 8 +- .../v1/internal/cloud_shell_tracing_stub.cc | 36 ++-- .../database_admin_tracing_connection.cc | 22 +-- .../internal/database_admin_tracing_stub.cc | 48 ++--- .../instance_admin_tracing_connection.cc | 14 +- .../internal/instance_admin_tracing_stub.cc | 36 ++-- .../spanner/internal/spanner_tracing_stub.cc | 18 +- .../internal/adaptation_tracing_connection.cc | 4 +- .../v1/internal/speech_tracing_connection.cc | 2 +- .../speech/v1/internal/speech_tracing_stub.cc | 20 +- .../v2/internal/speech_tracing_connection.cc | 32 ++-- .../speech/v2/internal/speech_tracing_stub.cc | 92 ++++----- .../sql_instances_tracing_connection.cc | 2 +- .../sql_operations_tracing_connection.cc | 2 +- .../storage/internal/storage_tracing_stub.cc | 30 ++- .../storage_insights_tracing_connection.cc | 4 +- .../storage_transfer_tracing_connection.cc | 6 +- .../internal/storage_transfer_tracing_stub.cc | 18 +- .../case_attachment_tracing_connection.cc | 2 +- .../v2/internal/case_tracing_connection.cc | 6 +- .../v2/internal/comment_tracing_connection.cc | 2 +- .../v4/internal/company_tracing_connection.cc | 2 +- .../v4/internal/job_tracing_connection.cc | 8 +- .../talent/v4/internal/job_tracing_stub.cc | 30 +-- .../v4/internal/tenant_tracing_connection.cc | 2 +- .../cloud_tasks_tracing_connection.cc | 4 +- .../testing_util/opentelemetry_matchers.cc | 7 + .../testing_util/opentelemetry_matchers.h | 10 + ..._insights_controller_tracing_connection.cc | 2 +- .../tpu/v1/internal/tpu_tracing_connection.cc | 16 +- .../cloud/tpu/v1/internal/tpu_tracing_stub.cc | 42 ++--- .../tpu/v2/internal/tpu_tracing_connection.cc | 16 +- .../cloud/tpu/v2/internal/tpu_tracing_stub.cc | 42 ++--- .../v1/internal/trace_tracing_connection.cc | 2 +- .../translation_tracing_connection.cc | 10 +- .../v3/internal/translation_tracing_stub.cc | 36 ++-- .../internal/livestream_tracing_connection.cc | 30 +-- .../v1/internal/livestream_tracing_stub.cc | 78 +++----- .../video_stitcher_tracing_connection.cc | 28 +-- .../internal/video_stitcher_tracing_stub.cc | 60 ++---- .../internal/transcoder_tracing_connection.cc | 4 +- .../video_intelligence_tracing_connection.cc | 2 +- .../video_intelligence_tracing_stub.cc | 18 +- .../image_annotator_tracing_connection.cc | 4 +- .../internal/image_annotator_tracing_stub.cc | 24 +-- .../product_search_tracing_connection.cc | 12 +- .../internal/product_search_tracing_stub.cc | 24 +-- .../vm_migration_tracing_connection.cc | 72 ++++---- .../v1/internal/vm_migration_tracing_stub.cc | 174 ++++++------------ .../vmware_engine_tracing_connection.cc | 58 +++--- .../v1/internal/vmware_engine_tracing_stub.cc | 132 +++++-------- .../internal/vpc_access_tracing_connection.cc | 6 +- .../v1/internal/vpc_access_tracing_stub.cc | 24 +-- .../internal/web_risk_tracing_connection.cc | 2 +- .../v1/internal/web_risk_tracing_stub.cc | 18 +- ...web_security_scanner_tracing_connection.cc | 8 +- .../internal/executions_tracing_connection.cc | 2 +- .../internal/workflows_tracing_connection.cc | 8 +- .../v1/internal/workflows_tracing_stub.cc | 30 +-- .../workstations_tracing_connection.cc | 32 ++-- .../v1/internal/workstations_tracing_stub.cc | 78 +++----- 516 files changed, 4428 insertions(+), 6765 deletions(-) diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_tracing_connection.cc b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_tracing_connection.cc index 3eb353def0e4..723c5809dbc9 100644 --- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_tracing_connection.cc +++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_tracing_connection.cc @@ -56,7 +56,7 @@ GoldenKitchenSinkTracingConnection::WriteLogEntries(google::test::admin::databas StreamRange GoldenKitchenSinkTracingConnection::ListLogs(google::test::admin::database::v1::ListLogsRequest request) { auto span = internal::MakeSpan("golden_v1::GoldenKitchenSinkConnection::ListLogs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListLogs(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -86,7 +86,7 @@ GoldenKitchenSinkTracingConnection::Deprecated2(google::test::admin::database::v StreamRange GoldenKitchenSinkTracingConnection::StreamingRead(google::test::admin::database::v1::Request const& request) { auto span = internal::MakeSpan("golden_v1::GoldenKitchenSinkConnection::StreamingRead"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->StreamingRead(request); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); diff --git a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_tracing_stub.cc b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_tracing_stub.cc index 54257c9c3b93..cef0ca5eaabc 100644 --- a/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_tracing_stub.cc +++ b/generator/integration_tests/golden/v1/internal/golden_kitchen_sink_tracing_stub.cc @@ -135,7 +135,7 @@ std::unique_ptr context) { auto span = internal::MakeSpanGrpc("google.test.admin.database.v1.GoldenKitchenSink", "StreamingReadWrite"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); internal::InjectTraceContext(*context, *propagator_); auto stream = child_->AsyncStreamingReadWrite(cq, context); return std::make_unique context, google::test::admin::database::v1::Request const& request) { auto span = internal::MakeSpanGrpc("google.test.admin.database.v1.GoldenKitchenSink", "StreamingRead"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); internal::InjectTraceContext(*context, *propagator_); auto stream = child_->AsyncStreamingRead(cq, context, request); return std::make_unique< @@ -184,7 +184,7 @@ GoldenKitchenSinkTracingStub::AsyncStreamingWrite( google::cloud::CompletionQueue const& cq, std::shared_ptr context) { auto span = internal::MakeSpanGrpc("google.test.admin.database.v1.GoldenKitchenSink", "StreamingWrite"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); internal::InjectTraceContext(*context, *propagator_); auto stream = child_->AsyncStreamingWrite(cq, context); return std::make_unique< diff --git a/generator/integration_tests/golden/v1/internal/golden_thing_admin_tracing_connection.cc b/generator/integration_tests/golden/v1/internal/golden_thing_admin_tracing_connection.cc index 7bada5331f86..3486f68be062 100644 --- a/generator/integration_tests/golden/v1/internal/golden_thing_admin_tracing_connection.cc +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_tracing_connection.cc @@ -35,7 +35,7 @@ GoldenThingAdminTracingConnection::GoldenThingAdminTracingConnection( StreamRange GoldenThingAdminTracingConnection::ListDatabases(google::test::admin::database::v1::ListDatabasesRequest request) { auto span = internal::MakeSpan("golden_v1::GoldenThingAdminConnection::ListDatabases"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListDatabases(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -45,7 +45,7 @@ future> GoldenThingAdminTracingConnection::CreateDatabase(google::test::admin::database::v1::CreateDatabaseRequest const& request) { auto span = internal::MakeSpan( "golden_v1::GoldenThingAdminConnection::CreateDatabase"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateDatabase(request)); } @@ -60,7 +60,7 @@ future> GoldenThingAdminTracingConnection::UpdateDatabaseDdl(google::test::admin::database::v1::UpdateDatabaseDdlRequest const& request) { auto span = internal::MakeSpan( "golden_v1::GoldenThingAdminConnection::UpdateDatabaseDdl"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateDatabaseDdl(request)); } @@ -103,7 +103,7 @@ future> GoldenThingAdminTracingConnection::CreateBackup(google::test::admin::database::v1::CreateBackupRequest const& request) { auto span = internal::MakeSpan( "golden_v1::GoldenThingAdminConnection::CreateBackup"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateBackup(request)); } @@ -131,7 +131,7 @@ GoldenThingAdminTracingConnection::DeleteBackup(google::test::admin::database::v StreamRange GoldenThingAdminTracingConnection::ListBackups(google::test::admin::database::v1::ListBackupsRequest request) { auto span = internal::MakeSpan("golden_v1::GoldenThingAdminConnection::ListBackups"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListBackups(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -141,14 +141,14 @@ future> GoldenThingAdminTracingConnection::RestoreDatabase(google::test::admin::database::v1::RestoreDatabaseRequest const& request) { auto span = internal::MakeSpan( "golden_v1::GoldenThingAdminConnection::RestoreDatabase"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RestoreDatabase(request)); } StreamRange GoldenThingAdminTracingConnection::ListDatabaseOperations(google::test::admin::database::v1::ListDatabaseOperationsRequest request) { auto span = internal::MakeSpan("golden_v1::GoldenThingAdminConnection::ListDatabaseOperations"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListDatabaseOperations(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -157,7 +157,7 @@ GoldenThingAdminTracingConnection::ListDatabaseOperations(google::test::admin::d StreamRange GoldenThingAdminTracingConnection::ListBackupOperations(google::test::admin::database::v1::ListBackupOperationsRequest request) { auto span = internal::MakeSpan("golden_v1::GoldenThingAdminConnection::ListBackupOperations"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListBackupOperations(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -167,7 +167,7 @@ future> GoldenThingAdminTracingConnection::LongRunningWithoutRouting(google::test::admin::database::v1::RestoreDatabaseRequest const& request) { auto span = internal::MakeSpan( "golden_v1::GoldenThingAdminConnection::LongRunningWithoutRouting"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->LongRunningWithoutRouting(request)); } @@ -175,7 +175,7 @@ future> GoldenThingAdminTracingConnection::AsyncGetDatabase(google::test::admin::database::v1::GetDatabaseRequest const& request) { auto span = internal::MakeSpan( "golden_v1::GoldenThingAdminConnection::AsyncGetDatabase"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->AsyncGetDatabase(request)); } @@ -183,7 +183,7 @@ future GoldenThingAdminTracingConnection::AsyncDropDatabase(google::test::admin::database::v1::DropDatabaseRequest const& request) { auto span = internal::MakeSpan( "golden_v1::GoldenThingAdminConnection::AsyncDropDatabase"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->AsyncDropDatabase(request)); } diff --git a/generator/integration_tests/golden/v1/internal/golden_thing_admin_tracing_stub.cc b/generator/integration_tests/golden/v1/internal/golden_thing_admin_tracing_stub.cc index 37c83e121871..0ece5177cacd 100644 --- a/generator/integration_tests/golden/v1/internal/golden_thing_admin_tracing_stub.cc +++ b/generator/integration_tests/golden/v1/internal/golden_thing_admin_tracing_stub.cc @@ -46,10 +46,8 @@ GoldenThingAdminTracingStub::AsyncCreateDatabase( std::shared_ptr context, google::test::admin::database::v1::CreateDatabaseRequest const& request) { auto span = internal::MakeSpanGrpc("google.test.admin.database.v1.GoldenThingAdmin", "CreateDatabase"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateDatabase(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -70,10 +68,8 @@ GoldenThingAdminTracingStub::AsyncUpdateDatabaseDdl( std::shared_ptr context, google::test::admin::database::v1::UpdateDatabaseDdlRequest const& request) { auto span = internal::MakeSpanGrpc("google.test.admin.database.v1.GoldenThingAdmin", "UpdateDatabaseDdl"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateDatabaseDdl(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -134,10 +130,8 @@ GoldenThingAdminTracingStub::AsyncCreateBackup( std::shared_ptr context, google::test::admin::database::v1::CreateBackupRequest const& request) { auto span = internal::MakeSpanGrpc("google.test.admin.database.v1.GoldenThingAdmin", "CreateBackup"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateBackup(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -188,10 +182,8 @@ GoldenThingAdminTracingStub::AsyncRestoreDatabase( std::shared_ptr context, google::test::admin::database::v1::RestoreDatabaseRequest const& request) { auto span = internal::MakeSpanGrpc("google.test.admin.database.v1.GoldenThingAdmin", "RestoreDatabase"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncRestoreDatabase(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -222,10 +214,8 @@ GoldenThingAdminTracingStub::AsyncLongRunningWithoutRouting( std::shared_ptr context, google::test::admin::database::v1::RestoreDatabaseRequest const& request) { auto span = internal::MakeSpanGrpc("google.test.admin.database.v1.GoldenThingAdmin", "LongRunningWithoutRouting"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncLongRunningWithoutRouting(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -235,10 +225,8 @@ future> GoldenThingAdminTr std::shared_ptr context, google::test::admin::database::v1::GetDatabaseRequest const& request) { auto span = internal::MakeSpanGrpc("google.test.admin.database.v1.GoldenThingAdmin", "GetDatabase"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetDatabase(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -248,10 +236,8 @@ future GoldenThingAdminTracingStub::AsyncDropDatabase( std::shared_ptr context, google::test::admin::database::v1::DropDatabaseRequest const& request) { auto span = internal::MakeSpanGrpc("google.test.admin.database.v1.GoldenThingAdmin", "DropDatabase"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDropDatabase(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -263,10 +249,8 @@ GoldenThingAdminTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -277,10 +261,8 @@ future GoldenThingAdminTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/generator/integration_tests/tests/golden_kitchen_sink_tracing_connection_test.cc b/generator/integration_tests/tests/golden_kitchen_sink_tracing_connection_test.cc index 83f792c8d32c..3547d452f364 100644 --- a/generator/integration_tests/tests/golden_kitchen_sink_tracing_connection_test.cc +++ b/generator/integration_tests/tests/golden_kitchen_sink_tracing_connection_test.cc @@ -37,6 +37,7 @@ using ::google::cloud::testing_util::DisableTracing; using ::google::cloud::testing_util::EnableTracing; using ::google::cloud::testing_util::InstallSpanCatcher; using ::google::cloud::testing_util::OTelAttribute; +using ::google::cloud::testing_util::OTelContextCaptured; using ::google::cloud::testing_util::SpanHasAttributes; using ::google::cloud::testing_util::SpanHasInstrumentationScope; using ::google::cloud::testing_util::SpanKindIsClient; @@ -148,6 +149,7 @@ TEST(GoldenKitchenSinkTracingConnectionTest, ListLogs) { auto mock = std::make_shared(); EXPECT_CALL(*mock, ListLogs).WillOnce([] { EXPECT_TRUE(ThereIsAnActiveSpan()); + EXPECT_TRUE(OTelContextCaptured()); return mocks::MakeStreamRange({}, internal::AbortedError("fail")); }); @@ -253,6 +255,7 @@ TEST(GoldenKitchenSinkTracingConnectionTest, StreamingRead) { auto mock = std::make_shared(); EXPECT_CALL(*mock, StreamingRead).WillOnce([] { EXPECT_TRUE(ThereIsAnActiveSpan()); + EXPECT_TRUE(OTelContextCaptured()); return mocks::MakeStreamRange({}, internal::AbortedError("fail")); }); diff --git a/generator/integration_tests/tests/golden_kitchen_sink_tracing_stub_test.cc b/generator/integration_tests/tests/golden_kitchen_sink_tracing_stub_test.cc index 00df51430756..72221f0426a6 100644 --- a/generator/integration_tests/tests/golden_kitchen_sink_tracing_stub_test.cc +++ b/generator/integration_tests/tests/golden_kitchen_sink_tracing_stub_test.cc @@ -37,6 +37,7 @@ using ::testing::Return; using ::google::cloud::testing_util::InstallSpanCatcher; using ::google::cloud::testing_util::OTelAttribute; +using ::google::cloud::testing_util::OTelContextCaptured; using ::google::cloud::testing_util::SpanHasAttributes; using ::google::cloud::testing_util::SpanHasInstrumentationScope; using ::google::cloud::testing_util::SpanKindIsClient; @@ -301,6 +302,7 @@ TEST(GoldenKitchenSinkTracingStubTest, AsyncStreamingRead) { .WillOnce([](auto const&, auto context, auto const&) { ValidatePropagator(*context); EXPECT_TRUE(ThereIsAnActiveSpan()); + EXPECT_TRUE(OTelContextCaptured()); using ErrorStream = ::google::cloud::internal::AsyncStreamingReadRpcError; return std::make_unique(internal::AbortedError("fail")); @@ -336,6 +338,7 @@ TEST(GoldenKitchenSinkTracingStubTest, AsyncStreamingWrite) { .WillOnce([](auto const&, auto context) { ValidatePropagator(*context); EXPECT_TRUE(ThereIsAnActiveSpan()); + EXPECT_TRUE(OTelContextCaptured()); using ErrorStream = ::google::cloud::internal::AsyncStreamingWriteRpcError; @@ -372,6 +375,7 @@ TEST(GoldenKitchenSinkTracingStubTest, AsyncStreamingReadWrite) { .WillOnce([](auto const&, auto context) { ValidatePropagator(*context); EXPECT_TRUE(ThereIsAnActiveSpan()); + EXPECT_TRUE(OTelContextCaptured()); using ErrorStream = ::google::cloud::internal::AsyncStreamingReadWriteRpcError< Request, Response>; diff --git a/generator/integration_tests/tests/golden_thing_admin_tracing_connection_test.cc b/generator/integration_tests/tests/golden_thing_admin_tracing_connection_test.cc index 8ae0910ea377..82c341d29c73 100644 --- a/generator/integration_tests/tests/golden_thing_admin_tracing_connection_test.cc +++ b/generator/integration_tests/tests/golden_thing_admin_tracing_connection_test.cc @@ -37,6 +37,7 @@ using ::google::cloud::testing_util::DisableTracing; using ::google::cloud::testing_util::EnableTracing; using ::google::cloud::testing_util::InstallSpanCatcher; using ::google::cloud::testing_util::OTelAttribute; +using ::google::cloud::testing_util::OTelContextCaptured; using ::google::cloud::testing_util::SpanHasAttributes; using ::google::cloud::testing_util::SpanHasInstrumentationScope; using ::google::cloud::testing_util::SpanKindIsClient; @@ -71,6 +72,7 @@ TEST(GoldenThingAdminTracingConnectionTest, ListDatabases) { auto mock = std::make_shared(); EXPECT_CALL(*mock, ListDatabases).WillOnce([] { EXPECT_TRUE(ThereIsAnActiveSpan()); + EXPECT_TRUE(OTelContextCaptured()); return mocks::MakeStreamRange({}, internal::AbortedError("fail")); }); @@ -98,6 +100,7 @@ TEST(GoldenThingAdminTracingConnectionTest, CreateDatabase) { auto mock = std::make_shared(); EXPECT_CALL(*mock, CreateDatabase).WillOnce([] { EXPECT_TRUE(ThereIsAnActiveSpan()); + EXPECT_TRUE(OTelContextCaptured()); return make_ready_future>( internal::AbortedError("fail")); }); @@ -150,6 +153,7 @@ TEST(GoldenThingAdminTracingConnectionTest, UpdateDatabaseDdl) { using ::google::test::admin::database::v1::UpdateDatabaseDdlMetadata; EXPECT_CALL(*mock, UpdateDatabaseDdl).WillOnce([] { EXPECT_TRUE(ThereIsAnActiveSpan()); + EXPECT_TRUE(OTelContextCaptured()); return make_ready_future>( internal::AbortedError("fail")); }); @@ -302,6 +306,7 @@ TEST(GoldenThingAdminTracingConnectionTest, CreateBackup) { auto mock = std::make_shared(); EXPECT_CALL(*mock, CreateBackup).WillOnce([] { EXPECT_TRUE(ThereIsAnActiveSpan()); + EXPECT_TRUE(OTelContextCaptured()); return make_ready_future>(internal::AbortedError("fail")); }); @@ -402,6 +407,7 @@ TEST(GoldenThingAdminTracingConnectionTest, ListBackups) { auto mock = std::make_shared(); EXPECT_CALL(*mock, ListBackups).WillOnce([] { EXPECT_TRUE(ThereIsAnActiveSpan()); + EXPECT_TRUE(OTelContextCaptured()); return mocks::MakeStreamRange({}, internal::AbortedError("fail")); }); @@ -429,6 +435,7 @@ TEST(GoldenThingAdminTracingConnectionTest, RestoreDatabase) { auto mock = std::make_shared(); EXPECT_CALL(*mock, RestoreDatabase).WillOnce([] { EXPECT_TRUE(ThereIsAnActiveSpan()); + EXPECT_TRUE(OTelContextCaptured()); return make_ready_future>( internal::AbortedError("fail")); }); @@ -455,6 +462,7 @@ TEST(GoldenThingAdminTracingConnectionTest, ListDatabaseOperations) { auto mock = std::make_shared(); EXPECT_CALL(*mock, ListDatabaseOperations).WillOnce([] { EXPECT_TRUE(ThereIsAnActiveSpan()); + EXPECT_TRUE(OTelContextCaptured()); return mocks::MakeStreamRange( {}, internal::AbortedError("fail")); }); @@ -484,6 +492,7 @@ TEST(GoldenThingAdminTracingConnectionTest, ListBackupOperations) { auto mock = std::make_shared(); EXPECT_CALL(*mock, ListBackupOperations).WillOnce([] { EXPECT_TRUE(ThereIsAnActiveSpan()); + EXPECT_TRUE(OTelContextCaptured()); return mocks::MakeStreamRange( {}, internal::AbortedError("fail")); }); @@ -513,6 +522,7 @@ TEST(GoldenThingAdminTracingConnectionTest, LongRunningWithoutRouting) { auto mock = std::make_shared(); EXPECT_CALL(*mock, LongRunningWithoutRouting).WillOnce([] { EXPECT_TRUE(ThereIsAnActiveSpan()); + EXPECT_TRUE(OTelContextCaptured()); return make_ready_future>( internal::AbortedError("fail")); }); @@ -540,6 +550,7 @@ TEST(GoldenThingAdminTracingConnectionTest, AsyncGetDatabase) { auto mock = std::make_shared(); EXPECT_CALL(*mock, AsyncGetDatabase).WillOnce([] { EXPECT_TRUE(ThereIsAnActiveSpan()); + EXPECT_TRUE(OTelContextCaptured()); return make_ready_future>( internal::AbortedError("fail")); }); @@ -566,6 +577,7 @@ TEST(GoldenThingAdminTracingConnectionTest, AsyncDropDatabase) { auto mock = std::make_shared(); EXPECT_CALL(*mock, AsyncDropDatabase).WillOnce([] { EXPECT_TRUE(ThereIsAnActiveSpan()); + EXPECT_TRUE(OTelContextCaptured()); return make_ready_future(internal::AbortedError("fail")); }); diff --git a/generator/integration_tests/tests/golden_thing_admin_tracing_stub_test.cc b/generator/integration_tests/tests/golden_thing_admin_tracing_stub_test.cc index f45a26e1f0ad..4cc33aa33f2d 100644 --- a/generator/integration_tests/tests/golden_thing_admin_tracing_stub_test.cc +++ b/generator/integration_tests/tests/golden_thing_admin_tracing_stub_test.cc @@ -33,6 +33,7 @@ using ::testing::Return; using ::google::cloud::testing_util::InstallSpanCatcher; using ::google::cloud::testing_util::OTelAttribute; +using ::google::cloud::testing_util::OTelContextCaptured; using ::google::cloud::testing_util::SpanHasAttributes; using ::google::cloud::testing_util::SpanHasInstrumentationScope; using ::google::cloud::testing_util::SpanKindIsClient; @@ -50,6 +51,8 @@ auto constexpr kErrorCode = static_cast(StatusCode::kAborted); future> LongrunningError( Unused, std::shared_ptr const& context, Unused) { ValidatePropagator(*context); + EXPECT_TRUE(ThereIsAnActiveSpan()); + EXPECT_TRUE(OTelContextCaptured()); return make_ready_future( StatusOr(internal::AbortedError("fail"))); } @@ -544,6 +547,8 @@ TEST(GoldenThingAdminTracingStubTest, AsyncGetDatabase) { EXPECT_CALL(*mock, AsyncGetDatabase) .WillOnce([](auto const&, auto context, auto const&) { ValidatePropagator(*context); + EXPECT_TRUE(ThereIsAnActiveSpan()); + EXPECT_TRUE(OTelContextCaptured()); return make_ready_future( StatusOr( internal::AbortedError("fail"))); @@ -576,6 +581,8 @@ TEST(GoldenThingAdminTracingStubTest, AsyncDropDatabase) { EXPECT_CALL(*mock, AsyncDropDatabase) .WillOnce([](auto const&, auto context, auto const&) { ValidatePropagator(*context); + EXPECT_TRUE(ThereIsAnActiveSpan()); + EXPECT_TRUE(OTelContextCaptured()); return make_ready_future(internal::AbortedError("fail")); }); @@ -631,6 +638,8 @@ TEST(GoldenThingAdminTracingStubTest, AsyncCancelOperation) { EXPECT_CALL(*mock, AsyncCancelOperation) .WillOnce([](auto const&, auto context, auto const&) { ValidatePropagator(*context); + EXPECT_TRUE(ThereIsAnActiveSpan()); + EXPECT_TRUE(OTelContextCaptured()); return make_ready_future(internal::AbortedError("fail")); }); diff --git a/generator/internal/tracing_connection_generator.cc b/generator/internal/tracing_connection_generator.cc index 4a48e2be6c6a..e99081bdcebd 100644 --- a/generator/internal/tracing_connection_generator.cc +++ b/generator/internal/tracing_connection_generator.cc @@ -254,7 +254,7 @@ std::unique_ptr<::google::cloud::AsyncStreamingReadWriteRpc< StreamRange<$response_type$> $tracing_connection_class_name$::$method_name$($request_type$ const& request) { auto span = internal::MakeSpan("$product_namespace$::$connection_class_name$::$method_name$"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->$method_name$(request); return internal::MakeTracedStreamRange<$response_type$>( std::move(span), std::move(sr)); @@ -272,7 +272,7 @@ StreamRange<$response_type$> StreamRange<$range_output_type$> $tracing_connection_class_name$::$method_name$($request_type$ request) { auto span = internal::MakeSpan("$product_namespace$::$connection_class_name$::$method_name$"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->$method_name$(std::move(request)); return internal::MakeTracedStreamRange<$range_output_type$>( std::move(span), std::move(sr)); @@ -294,7 +294,7 @@ future>)""", $tracing_connection_class_name$::$method_name$($request_type$ const& request) { auto span = internal::MakeSpan( "$product_namespace$::$connection_class_name$::$method_name$"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->$method_name$(request)); } )"""); @@ -323,7 +323,7 @@ future>)""", $tracing_connection_class_name$::Async$method_name$($request_type$ const& request) { auto span = internal::MakeSpan( "$product_namespace$::$connection_class_name$::Async$method_name$"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->Async$method_name$(request)); } )"""); diff --git a/generator/internal/tracing_stub_generator.cc b/generator/internal/tracing_stub_generator.cc index 56bc31400632..b99760fb7ae6 100644 --- a/generator/internal/tracing_stub_generator.cc +++ b/generator/internal/tracing_stub_generator.cc @@ -158,7 +158,7 @@ std::unique_ptr context) { auto span = internal::MakeSpanGrpc("$grpc_service$", "$method_name$"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); internal::InjectTraceContext(*context, *propagator_); auto stream = child_->Async$method_name$(cq, context); return std::make_unique> std::shared_ptr context, $request_type$ const& request) { auto span = internal::MakeSpanGrpc("$grpc_service$", "$method_name$"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->Async$method_name$(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -229,7 +227,7 @@ std::unique_ptr> std::shared_ptr context, $request_type$ const& request) { auto span = internal::MakeSpanGrpc("$grpc_service$", "$method_name$"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); internal::InjectTraceContext(*context, *propagator_); auto stream = child_->Async$method_name$(cq, context, request); return std::make_unique< @@ -248,7 +246,7 @@ std::unique_ptr< google::cloud::CompletionQueue const& cq, std::shared_ptr context) { auto span = internal::MakeSpanGrpc("$grpc_service$", "$method_name$"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); internal::InjectTraceContext(*context, *propagator_); auto stream = child_->Async$method_name$(cq, context); return std::make_unique< @@ -272,10 +270,8 @@ future> $tracing_stub_class_name$::Async$method_name$( std::shared_ptr context, $request_type$ const& request) { auto span = internal::MakeSpanGrpc("$grpc_service$", "$method_name$"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->Async$method_name$(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -294,10 +290,8 @@ future> google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -308,10 +302,8 @@ future $tracing_stub_class_name$::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/accessapproval/v1/internal/access_approval_tracing_connection.cc b/google/cloud/accessapproval/v1/internal/access_approval_tracing_connection.cc index ec16030b849b..caf69c2f310d 100644 --- a/google/cloud/accessapproval/v1/internal/access_approval_tracing_connection.cc +++ b/google/cloud/accessapproval/v1/internal/access_approval_tracing_connection.cc @@ -37,7 +37,7 @@ AccessApprovalTracingConnection::ListApprovalRequests( google::cloud::accessapproval::v1::ListApprovalRequestsMessage request) { auto span = internal::MakeSpan( "accessapproval_v1::AccessApprovalConnection::ListApprovalRequests"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListApprovalRequests(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::accessapproval::v1::ApprovalRequest>(std::move(span), diff --git a/google/cloud/accesscontextmanager/v1/internal/access_context_manager_tracing_connection.cc b/google/cloud/accesscontextmanager/v1/internal/access_context_manager_tracing_connection.cc index a2a01e4b3ffd..a4a8818dd6c8 100644 --- a/google/cloud/accesscontextmanager/v1/internal/access_context_manager_tracing_connection.cc +++ b/google/cloud/accesscontextmanager/v1/internal/access_context_manager_tracing_connection.cc @@ -40,7 +40,7 @@ AccessContextManagerTracingConnection::ListAccessPolicies( auto span = internal::MakeSpan( "accesscontextmanager_v1::AccessContextManagerConnection::" "ListAccessPolicies"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListAccessPolicies(std::move(request)); return internal::MakeTracedStreamRange< google::identity::accesscontextmanager::v1::AccessPolicy>(std::move(span), @@ -64,7 +64,7 @@ AccessContextManagerTracingConnection::CreateAccessPolicy( auto span = internal::MakeSpan( "accesscontextmanager_v1::AccessContextManagerConnection::" "CreateAccessPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateAccessPolicy(request)); } @@ -76,7 +76,7 @@ AccessContextManagerTracingConnection::UpdateAccessPolicy( auto span = internal::MakeSpan( "accesscontextmanager_v1::AccessContextManagerConnection::" "UpdateAccessPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateAccessPolicy(request)); } @@ -89,7 +89,7 @@ AccessContextManagerTracingConnection::DeleteAccessPolicy( auto span = internal::MakeSpan( "accesscontextmanager_v1::AccessContextManagerConnection::" "DeleteAccessPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteAccessPolicy(request)); } @@ -101,7 +101,7 @@ AccessContextManagerTracingConnection::ListAccessLevels( auto span = internal::MakeSpan( "accesscontextmanager_v1::AccessContextManagerConnection::" "ListAccessLevels"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListAccessLevels(std::move(request)); return internal::MakeTracedStreamRange< google::identity::accesscontextmanager::v1::AccessLevel>(std::move(span), @@ -126,7 +126,7 @@ AccessContextManagerTracingConnection::CreateAccessLevel( auto span = internal::MakeSpan( "accesscontextmanager_v1::AccessContextManagerConnection::" "CreateAccessLevel"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateAccessLevel(request)); } @@ -137,7 +137,7 @@ AccessContextManagerTracingConnection::UpdateAccessLevel( auto span = internal::MakeSpan( "accesscontextmanager_v1::AccessContextManagerConnection::" "UpdateAccessLevel"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateAccessLevel(request)); } @@ -149,7 +149,7 @@ AccessContextManagerTracingConnection::DeleteAccessLevel( auto span = internal::MakeSpan( "accesscontextmanager_v1::AccessContextManagerConnection::" "DeleteAccessLevel"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteAccessLevel(request)); } @@ -161,7 +161,7 @@ AccessContextManagerTracingConnection::ReplaceAccessLevels( auto span = internal::MakeSpan( "accesscontextmanager_v1::AccessContextManagerConnection::" "ReplaceAccessLevels"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ReplaceAccessLevels(request)); } @@ -173,7 +173,7 @@ AccessContextManagerTracingConnection::ListServicePerimeters( auto span = internal::MakeSpan( "accesscontextmanager_v1::AccessContextManagerConnection::" "ListServicePerimeters"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListServicePerimeters(std::move(request)); return internal::MakeTracedStreamRange< google::identity::accesscontextmanager::v1::ServicePerimeter>( @@ -198,7 +198,7 @@ AccessContextManagerTracingConnection::CreateServicePerimeter( auto span = internal::MakeSpan( "accesscontextmanager_v1::AccessContextManagerConnection::" "CreateServicePerimeter"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateServicePerimeter(request)); } @@ -210,7 +210,7 @@ AccessContextManagerTracingConnection::UpdateServicePerimeter( auto span = internal::MakeSpan( "accesscontextmanager_v1::AccessContextManagerConnection::" "UpdateServicePerimeter"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateServicePerimeter(request)); } @@ -223,7 +223,7 @@ AccessContextManagerTracingConnection::DeleteServicePerimeter( auto span = internal::MakeSpan( "accesscontextmanager_v1::AccessContextManagerConnection::" "DeleteServicePerimeter"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteServicePerimeter(request)); } @@ -236,7 +236,7 @@ AccessContextManagerTracingConnection::ReplaceServicePerimeters( auto span = internal::MakeSpan( "accesscontextmanager_v1::AccessContextManagerConnection::" "ReplaceServicePerimeters"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ReplaceServicePerimeters(request)); } @@ -249,7 +249,7 @@ AccessContextManagerTracingConnection::CommitServicePerimeters( auto span = internal::MakeSpan( "accesscontextmanager_v1::AccessContextManagerConnection::" "CommitServicePerimeters"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CommitServicePerimeters(request)); } @@ -261,7 +261,7 @@ AccessContextManagerTracingConnection::ListGcpUserAccessBindings( auto span = internal::MakeSpan( "accesscontextmanager_v1::AccessContextManagerConnection::" "ListGcpUserAccessBindings"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListGcpUserAccessBindings(std::move(request)); return internal::MakeTracedStreamRange< google::identity::accesscontextmanager::v1::GcpUserAccessBinding>( @@ -287,7 +287,7 @@ AccessContextManagerTracingConnection::CreateGcpUserAccessBinding( auto span = internal::MakeSpan( "accesscontextmanager_v1::AccessContextManagerConnection::" "CreateGcpUserAccessBinding"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateGcpUserAccessBinding(request)); } @@ -300,7 +300,7 @@ AccessContextManagerTracingConnection::UpdateGcpUserAccessBinding( auto span = internal::MakeSpan( "accesscontextmanager_v1::AccessContextManagerConnection::" "UpdateGcpUserAccessBinding"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateGcpUserAccessBinding(request)); } @@ -313,7 +313,7 @@ AccessContextManagerTracingConnection::DeleteGcpUserAccessBinding( auto span = internal::MakeSpan( "accesscontextmanager_v1::AccessContextManagerConnection::" "DeleteGcpUserAccessBinding"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteGcpUserAccessBinding(request)); } diff --git a/google/cloud/accesscontextmanager/v1/internal/access_context_manager_tracing_stub.cc b/google/cloud/accesscontextmanager/v1/internal/access_context_manager_tracing_stub.cc index c322f1898de7..8e2d6a6709fb 100644 --- a/google/cloud/accesscontextmanager/v1/internal/access_context_manager_tracing_stub.cc +++ b/google/cloud/accesscontextmanager/v1/internal/access_context_manager_tracing_stub.cc @@ -66,10 +66,8 @@ AccessContextManagerTracingStub::AsyncCreateAccessPolicy( auto span = internal::MakeSpanGrpc( "google.identity.accesscontextmanager.v1.AccessContextManager", "CreateAccessPolicy"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateAccessPolicy(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -83,10 +81,8 @@ AccessContextManagerTracingStub::AsyncUpdateAccessPolicy( auto span = internal::MakeSpanGrpc( "google.identity.accesscontextmanager.v1.AccessContextManager", "UpdateAccessPolicy"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateAccessPolicy(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -100,10 +96,8 @@ AccessContextManagerTracingStub::AsyncDeleteAccessPolicy( auto span = internal::MakeSpanGrpc( "google.identity.accesscontextmanager.v1.AccessContextManager", "DeleteAccessPolicy"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteAccessPolicy(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -145,10 +139,8 @@ AccessContextManagerTracingStub::AsyncCreateAccessLevel( auto span = internal::MakeSpanGrpc( "google.identity.accesscontextmanager.v1.AccessContextManager", "CreateAccessLevel"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateAccessLevel(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -162,10 +154,8 @@ AccessContextManagerTracingStub::AsyncUpdateAccessLevel( auto span = internal::MakeSpanGrpc( "google.identity.accesscontextmanager.v1.AccessContextManager", "UpdateAccessLevel"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateAccessLevel(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -179,10 +169,8 @@ AccessContextManagerTracingStub::AsyncDeleteAccessLevel( auto span = internal::MakeSpanGrpc( "google.identity.accesscontextmanager.v1.AccessContextManager", "DeleteAccessLevel"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteAccessLevel(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -196,10 +184,8 @@ AccessContextManagerTracingStub::AsyncReplaceAccessLevels( auto span = internal::MakeSpanGrpc( "google.identity.accesscontextmanager.v1.AccessContextManager", "ReplaceAccessLevels"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncReplaceAccessLevels(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -242,10 +228,8 @@ AccessContextManagerTracingStub::AsyncCreateServicePerimeter( auto span = internal::MakeSpanGrpc( "google.identity.accesscontextmanager.v1.AccessContextManager", "CreateServicePerimeter"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateServicePerimeter(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -259,10 +243,8 @@ AccessContextManagerTracingStub::AsyncUpdateServicePerimeter( auto span = internal::MakeSpanGrpc( "google.identity.accesscontextmanager.v1.AccessContextManager", "UpdateServicePerimeter"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateServicePerimeter(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -276,10 +258,8 @@ AccessContextManagerTracingStub::AsyncDeleteServicePerimeter( auto span = internal::MakeSpanGrpc( "google.identity.accesscontextmanager.v1.AccessContextManager", "DeleteServicePerimeter"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteServicePerimeter(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -293,10 +273,8 @@ AccessContextManagerTracingStub::AsyncReplaceServicePerimeters( auto span = internal::MakeSpanGrpc( "google.identity.accesscontextmanager.v1.AccessContextManager", "ReplaceServicePerimeters"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncReplaceServicePerimeters(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -310,10 +288,8 @@ AccessContextManagerTracingStub::AsyncCommitServicePerimeters( auto span = internal::MakeSpanGrpc( "google.identity.accesscontextmanager.v1.AccessContextManager", "CommitServicePerimeters"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCommitServicePerimeters(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -356,10 +332,8 @@ AccessContextManagerTracingStub::AsyncCreateGcpUserAccessBinding( auto span = internal::MakeSpanGrpc( "google.identity.accesscontextmanager.v1.AccessContextManager", "CreateGcpUserAccessBinding"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateGcpUserAccessBinding(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -373,10 +347,8 @@ AccessContextManagerTracingStub::AsyncUpdateGcpUserAccessBinding( auto span = internal::MakeSpanGrpc( "google.identity.accesscontextmanager.v1.AccessContextManager", "UpdateGcpUserAccessBinding"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateGcpUserAccessBinding(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -390,10 +362,8 @@ AccessContextManagerTracingStub::AsyncDeleteGcpUserAccessBinding( auto span = internal::MakeSpanGrpc( "google.identity.accesscontextmanager.v1.AccessContextManager", "DeleteGcpUserAccessBinding"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteGcpUserAccessBinding(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -442,10 +412,8 @@ AccessContextManagerTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -456,10 +424,8 @@ future AccessContextManagerTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/advisorynotifications/v1/internal/advisory_notifications_tracing_connection.cc b/google/cloud/advisorynotifications/v1/internal/advisory_notifications_tracing_connection.cc index 4b56dd5d2c90..ca8ebade7c69 100644 --- a/google/cloud/advisorynotifications/v1/internal/advisory_notifications_tracing_connection.cc +++ b/google/cloud/advisorynotifications/v1/internal/advisory_notifications_tracing_connection.cc @@ -42,7 +42,7 @@ AdvisoryNotificationsServiceTracingConnection::ListNotifications( auto span = internal::MakeSpan( "advisorynotifications_v1::AdvisoryNotificationsServiceConnection::" "ListNotifications"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListNotifications(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::advisorynotifications::v1::Notification>(std::move(span), diff --git a/google/cloud/aiplatform/v1/internal/dataset_tracing_connection.cc b/google/cloud/aiplatform/v1/internal/dataset_tracing_connection.cc index e1a7b7ca178e..8571d89388bd 100644 --- a/google/cloud/aiplatform/v1/internal/dataset_tracing_connection.cc +++ b/google/cloud/aiplatform/v1/internal/dataset_tracing_connection.cc @@ -37,7 +37,7 @@ DatasetServiceTracingConnection::CreateDataset( google::cloud::aiplatform::v1::CreateDatasetRequest const& request) { auto span = internal::MakeSpan( "aiplatform_v1::DatasetServiceConnection::CreateDataset"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateDataset(request)); } @@ -64,7 +64,7 @@ DatasetServiceTracingConnection::ListDatasets( google::cloud::aiplatform::v1::ListDatasetsRequest request) { auto span = internal::MakeSpan( "aiplatform_v1::DatasetServiceConnection::ListDatasets"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListDatasets(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::aiplatform::v1::Dataset>(std::move(span), std::move(sr)); @@ -75,7 +75,7 @@ DatasetServiceTracingConnection::DeleteDataset( google::cloud::aiplatform::v1::DeleteDatasetRequest const& request) { auto span = internal::MakeSpan( "aiplatform_v1::DatasetServiceConnection::DeleteDataset"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteDataset(request)); } @@ -84,7 +84,7 @@ DatasetServiceTracingConnection::ImportData( google::cloud::aiplatform::v1::ImportDataRequest const& request) { auto span = internal::MakeSpan("aiplatform_v1::DatasetServiceConnection::ImportData"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ImportData(request)); } @@ -93,7 +93,7 @@ DatasetServiceTracingConnection::ExportData( google::cloud::aiplatform::v1::ExportDataRequest const& request) { auto span = internal::MakeSpan("aiplatform_v1::DatasetServiceConnection::ExportData"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ExportData(request)); } @@ -102,7 +102,7 @@ DatasetServiceTracingConnection::CreateDatasetVersion( google::cloud::aiplatform::v1::CreateDatasetVersionRequest const& request) { auto span = internal::MakeSpan( "aiplatform_v1::DatasetServiceConnection::CreateDatasetVersion"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateDatasetVersion(request)); } @@ -112,7 +112,7 @@ DatasetServiceTracingConnection::DeleteDatasetVersion( google::cloud::aiplatform::v1::DeleteDatasetVersionRequest const& request) { auto span = internal::MakeSpan( "aiplatform_v1::DatasetServiceConnection::DeleteDatasetVersion"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteDatasetVersion(request)); } @@ -131,7 +131,7 @@ DatasetServiceTracingConnection::ListDatasetVersions( google::cloud::aiplatform::v1::ListDatasetVersionsRequest request) { auto span = internal::MakeSpan( "aiplatform_v1::DatasetServiceConnection::ListDatasetVersions"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListDatasetVersions(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::aiplatform::v1::DatasetVersion>(std::move(span), @@ -144,7 +144,7 @@ DatasetServiceTracingConnection::RestoreDatasetVersion( request) { auto span = internal::MakeSpan( "aiplatform_v1::DatasetServiceConnection::RestoreDatasetVersion"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RestoreDatasetVersion(request)); } @@ -154,7 +154,7 @@ DatasetServiceTracingConnection::ListDataItems( google::cloud::aiplatform::v1::ListDataItemsRequest request) { auto span = internal::MakeSpan( "aiplatform_v1::DatasetServiceConnection::ListDataItems"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListDataItems(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::aiplatform::v1::DataItem>(std::move(span), std::move(sr)); @@ -165,7 +165,7 @@ DatasetServiceTracingConnection::SearchDataItems( google::cloud::aiplatform::v1::SearchDataItemsRequest request) { auto span = internal::MakeSpan( "aiplatform_v1::DatasetServiceConnection::SearchDataItems"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->SearchDataItems(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::aiplatform::v1::DataItemView>(std::move(span), @@ -177,7 +177,7 @@ DatasetServiceTracingConnection::ListSavedQueries( google::cloud::aiplatform::v1::ListSavedQueriesRequest request) { auto span = internal::MakeSpan( "aiplatform_v1::DatasetServiceConnection::ListSavedQueries"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListSavedQueries(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::aiplatform::v1::SavedQuery>(std::move(span), @@ -189,7 +189,7 @@ DatasetServiceTracingConnection::DeleteSavedQuery( google::cloud::aiplatform::v1::DeleteSavedQueryRequest const& request) { auto span = internal::MakeSpan( "aiplatform_v1::DatasetServiceConnection::DeleteSavedQuery"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteSavedQuery(request)); } @@ -207,7 +207,7 @@ DatasetServiceTracingConnection::ListAnnotations( google::cloud::aiplatform::v1::ListAnnotationsRequest request) { auto span = internal::MakeSpan( "aiplatform_v1::DatasetServiceConnection::ListAnnotations"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListAnnotations(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::aiplatform::v1::Annotation>(std::move(span), diff --git a/google/cloud/aiplatform/v1/internal/dataset_tracing_stub.cc b/google/cloud/aiplatform/v1/internal/dataset_tracing_stub.cc index 2446ce976e10..af8a2a1ec82c 100644 --- a/google/cloud/aiplatform/v1/internal/dataset_tracing_stub.cc +++ b/google/cloud/aiplatform/v1/internal/dataset_tracing_stub.cc @@ -37,10 +37,8 @@ DatasetServiceTracingStub::AsyncCreateDataset( google::cloud::aiplatform::v1::CreateDatasetRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.aiplatform.v1.DatasetService", "CreateDataset"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateDataset(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -88,10 +86,8 @@ DatasetServiceTracingStub::AsyncDeleteDataset( google::cloud::aiplatform::v1::DeleteDatasetRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.aiplatform.v1.DatasetService", "DeleteDataset"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteDataset(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -103,10 +99,8 @@ DatasetServiceTracingStub::AsyncImportData( google::cloud::aiplatform::v1::ImportDataRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.aiplatform.v1.DatasetService", "ImportData"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncImportData(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -118,10 +112,8 @@ DatasetServiceTracingStub::AsyncExportData( google::cloud::aiplatform::v1::ExportDataRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.aiplatform.v1.DatasetService", "ExportData"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncExportData(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -133,10 +125,8 @@ DatasetServiceTracingStub::AsyncCreateDatasetVersion( google::cloud::aiplatform::v1::CreateDatasetVersionRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.aiplatform.v1.DatasetService", "CreateDatasetVersion"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateDatasetVersion(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -148,10 +138,8 @@ DatasetServiceTracingStub::AsyncDeleteDatasetVersion( google::cloud::aiplatform::v1::DeleteDatasetVersionRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.aiplatform.v1.DatasetService", "DeleteDatasetVersion"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteDatasetVersion(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -188,10 +176,8 @@ DatasetServiceTracingStub::AsyncRestoreDatasetVersion( request) { auto span = internal::MakeSpanGrpc( "google.cloud.aiplatform.v1.DatasetService", "RestoreDatasetVersion"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncRestoreDatasetVersion(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -239,10 +225,8 @@ DatasetServiceTracingStub::AsyncDeleteSavedQuery( google::cloud::aiplatform::v1::DeleteSavedQueryRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.aiplatform.v1.DatasetService", "DeleteSavedQuery"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteSavedQuery(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -278,10 +262,8 @@ DatasetServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -292,10 +274,8 @@ future DatasetServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/aiplatform/v1/internal/endpoint_tracing_connection.cc b/google/cloud/aiplatform/v1/internal/endpoint_tracing_connection.cc index a55587d61018..e2852f6624b7 100644 --- a/google/cloud/aiplatform/v1/internal/endpoint_tracing_connection.cc +++ b/google/cloud/aiplatform/v1/internal/endpoint_tracing_connection.cc @@ -37,7 +37,7 @@ EndpointServiceTracingConnection::CreateEndpoint( google::cloud::aiplatform::v1::CreateEndpointRequest const& request) { auto span = internal::MakeSpan( "aiplatform_v1::EndpointServiceConnection::CreateEndpoint"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateEndpoint(request)); } @@ -55,7 +55,7 @@ EndpointServiceTracingConnection::ListEndpoints( google::cloud::aiplatform::v1::ListEndpointsRequest request) { auto span = internal::MakeSpan( "aiplatform_v1::EndpointServiceConnection::ListEndpoints"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListEndpoints(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::aiplatform::v1::Endpoint>(std::move(span), std::move(sr)); @@ -75,7 +75,7 @@ EndpointServiceTracingConnection::DeleteEndpoint( google::cloud::aiplatform::v1::DeleteEndpointRequest const& request) { auto span = internal::MakeSpan( "aiplatform_v1::EndpointServiceConnection::DeleteEndpoint"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteEndpoint(request)); } @@ -84,7 +84,7 @@ EndpointServiceTracingConnection::DeployModel( google::cloud::aiplatform::v1::DeployModelRequest const& request) { auto span = internal::MakeSpan( "aiplatform_v1::EndpointServiceConnection::DeployModel"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeployModel(request)); } @@ -93,7 +93,7 @@ EndpointServiceTracingConnection::UndeployModel( google::cloud::aiplatform::v1::UndeployModelRequest const& request) { auto span = internal::MakeSpan( "aiplatform_v1::EndpointServiceConnection::UndeployModel"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UndeployModel(request)); } @@ -102,7 +102,7 @@ EndpointServiceTracingConnection::MutateDeployedModel( google::cloud::aiplatform::v1::MutateDeployedModelRequest const& request) { auto span = internal::MakeSpan( "aiplatform_v1::EndpointServiceConnection::MutateDeployedModel"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->MutateDeployedModel(request)); } diff --git a/google/cloud/aiplatform/v1/internal/endpoint_tracing_stub.cc b/google/cloud/aiplatform/v1/internal/endpoint_tracing_stub.cc index 8f068842e61b..d5dd13236c54 100644 --- a/google/cloud/aiplatform/v1/internal/endpoint_tracing_stub.cc +++ b/google/cloud/aiplatform/v1/internal/endpoint_tracing_stub.cc @@ -37,10 +37,8 @@ EndpointServiceTracingStub::AsyncCreateEndpoint( google::cloud::aiplatform::v1::CreateEndpointRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.aiplatform.v1.EndpointService", "CreateEndpoint"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateEndpoint(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -88,10 +86,8 @@ EndpointServiceTracingStub::AsyncDeleteEndpoint( google::cloud::aiplatform::v1::DeleteEndpointRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.aiplatform.v1.EndpointService", "DeleteEndpoint"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteEndpoint(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -103,10 +99,8 @@ EndpointServiceTracingStub::AsyncDeployModel( google::cloud::aiplatform::v1::DeployModelRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.aiplatform.v1.EndpointService", "DeployModel"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeployModel(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -118,10 +112,8 @@ EndpointServiceTracingStub::AsyncUndeployModel( google::cloud::aiplatform::v1::UndeployModelRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.aiplatform.v1.EndpointService", "UndeployModel"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUndeployModel(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -133,10 +125,8 @@ EndpointServiceTracingStub::AsyncMutateDeployedModel( google::cloud::aiplatform::v1::MutateDeployedModelRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.aiplatform.v1.EndpointService", "MutateDeployedModel"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncMutateDeployedModel(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -148,10 +138,8 @@ EndpointServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -162,10 +150,8 @@ future EndpointServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/aiplatform/v1/internal/featurestore_online_serving_tracing_connection.cc b/google/cloud/aiplatform/v1/internal/featurestore_online_serving_tracing_connection.cc index a16ba56a62c4..afcadd9197d4 100644 --- a/google/cloud/aiplatform/v1/internal/featurestore_online_serving_tracing_connection.cc +++ b/google/cloud/aiplatform/v1/internal/featurestore_online_serving_tracing_connection.cc @@ -52,7 +52,7 @@ FeaturestoreOnlineServingServiceTracingConnection::StreamingReadFeatureValues( auto span = internal::MakeSpan( "aiplatform_v1::FeaturestoreOnlineServingServiceConnection::" "StreamingReadFeatureValues"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->StreamingReadFeatureValues(request); return internal::MakeTracedStreamRange< google::cloud::aiplatform::v1::ReadFeatureValuesResponse>(std::move(span), diff --git a/google/cloud/aiplatform/v1/internal/featurestore_tracing_connection.cc b/google/cloud/aiplatform/v1/internal/featurestore_tracing_connection.cc index 3659db57c8a6..60c44f161bed 100644 --- a/google/cloud/aiplatform/v1/internal/featurestore_tracing_connection.cc +++ b/google/cloud/aiplatform/v1/internal/featurestore_tracing_connection.cc @@ -37,7 +37,7 @@ FeaturestoreServiceTracingConnection::CreateFeaturestore( google::cloud::aiplatform::v1::CreateFeaturestoreRequest const& request) { auto span = internal::MakeSpan( "aiplatform_v1::FeaturestoreServiceConnection::CreateFeaturestore"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateFeaturestore(request)); } @@ -56,7 +56,7 @@ FeaturestoreServiceTracingConnection::ListFeaturestores( google::cloud::aiplatform::v1::ListFeaturestoresRequest request) { auto span = internal::MakeSpan( "aiplatform_v1::FeaturestoreServiceConnection::ListFeaturestores"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListFeaturestores(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::aiplatform::v1::Featurestore>(std::move(span), @@ -68,7 +68,7 @@ FeaturestoreServiceTracingConnection::UpdateFeaturestore( google::cloud::aiplatform::v1::UpdateFeaturestoreRequest const& request) { auto span = internal::MakeSpan( "aiplatform_v1::FeaturestoreServiceConnection::UpdateFeaturestore"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateFeaturestore(request)); } @@ -78,7 +78,7 @@ FeaturestoreServiceTracingConnection::DeleteFeaturestore( google::cloud::aiplatform::v1::DeleteFeaturestoreRequest const& request) { auto span = internal::MakeSpan( "aiplatform_v1::FeaturestoreServiceConnection::DeleteFeaturestore"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteFeaturestore(request)); } @@ -88,7 +88,7 @@ FeaturestoreServiceTracingConnection::CreateEntityType( google::cloud::aiplatform::v1::CreateEntityTypeRequest const& request) { auto span = internal::MakeSpan( "aiplatform_v1::FeaturestoreServiceConnection::CreateEntityType"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateEntityType(request)); } @@ -106,7 +106,7 @@ FeaturestoreServiceTracingConnection::ListEntityTypes( google::cloud::aiplatform::v1::ListEntityTypesRequest request) { auto span = internal::MakeSpan( "aiplatform_v1::FeaturestoreServiceConnection::ListEntityTypes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListEntityTypes(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::aiplatform::v1::EntityType>(std::move(span), @@ -127,7 +127,7 @@ FeaturestoreServiceTracingConnection::DeleteEntityType( google::cloud::aiplatform::v1::DeleteEntityTypeRequest const& request) { auto span = internal::MakeSpan( "aiplatform_v1::FeaturestoreServiceConnection::DeleteEntityType"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteEntityType(request)); } @@ -136,7 +136,7 @@ FeaturestoreServiceTracingConnection::CreateFeature( google::cloud::aiplatform::v1::CreateFeatureRequest const& request) { auto span = internal::MakeSpan( "aiplatform_v1::FeaturestoreServiceConnection::CreateFeature"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateFeature(request)); } @@ -145,7 +145,7 @@ FeaturestoreServiceTracingConnection::BatchCreateFeatures( google::cloud::aiplatform::v1::BatchCreateFeaturesRequest const& request) { auto span = internal::MakeSpan( "aiplatform_v1::FeaturestoreServiceConnection::BatchCreateFeatures"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->BatchCreateFeatures(request)); } @@ -164,7 +164,7 @@ FeaturestoreServiceTracingConnection::ListFeatures( google::cloud::aiplatform::v1::ListFeaturesRequest request) { auto span = internal::MakeSpan( "aiplatform_v1::FeaturestoreServiceConnection::ListFeatures"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListFeatures(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::aiplatform::v1::Feature>(std::move(span), std::move(sr)); @@ -184,7 +184,7 @@ FeaturestoreServiceTracingConnection::DeleteFeature( google::cloud::aiplatform::v1::DeleteFeatureRequest const& request) { auto span = internal::MakeSpan( "aiplatform_v1::FeaturestoreServiceConnection::DeleteFeature"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteFeature(request)); } @@ -193,7 +193,7 @@ FeaturestoreServiceTracingConnection::ImportFeatureValues( google::cloud::aiplatform::v1::ImportFeatureValuesRequest const& request) { auto span = internal::MakeSpan( "aiplatform_v1::FeaturestoreServiceConnection::ImportFeatureValues"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ImportFeatureValues(request)); } @@ -204,7 +204,7 @@ FeaturestoreServiceTracingConnection::BatchReadFeatureValues( request) { auto span = internal::MakeSpan( "aiplatform_v1::FeaturestoreServiceConnection::BatchReadFeatureValues"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->BatchReadFeatureValues(request)); } @@ -214,7 +214,7 @@ FeaturestoreServiceTracingConnection::ExportFeatureValues( google::cloud::aiplatform::v1::ExportFeatureValuesRequest const& request) { auto span = internal::MakeSpan( "aiplatform_v1::FeaturestoreServiceConnection::ExportFeatureValues"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ExportFeatureValues(request)); } @@ -224,7 +224,7 @@ FeaturestoreServiceTracingConnection::DeleteFeatureValues( google::cloud::aiplatform::v1::DeleteFeatureValuesRequest const& request) { auto span = internal::MakeSpan( "aiplatform_v1::FeaturestoreServiceConnection::DeleteFeatureValues"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteFeatureValues(request)); } @@ -234,7 +234,7 @@ FeaturestoreServiceTracingConnection::SearchFeatures( google::cloud::aiplatform::v1::SearchFeaturesRequest request) { auto span = internal::MakeSpan( "aiplatform_v1::FeaturestoreServiceConnection::SearchFeatures"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->SearchFeatures(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::aiplatform::v1::Feature>(std::move(span), std::move(sr)); diff --git a/google/cloud/aiplatform/v1/internal/featurestore_tracing_stub.cc b/google/cloud/aiplatform/v1/internal/featurestore_tracing_stub.cc index f8d792bbb723..f61fd6f97535 100644 --- a/google/cloud/aiplatform/v1/internal/featurestore_tracing_stub.cc +++ b/google/cloud/aiplatform/v1/internal/featurestore_tracing_stub.cc @@ -37,10 +37,8 @@ FeaturestoreServiceTracingStub::AsyncCreateFeaturestore( google::cloud::aiplatform::v1::CreateFeaturestoreRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.aiplatform.v1.FeaturestoreService", "CreateFeaturestore"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateFeaturestore(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -76,10 +74,8 @@ FeaturestoreServiceTracingStub::AsyncUpdateFeaturestore( google::cloud::aiplatform::v1::UpdateFeaturestoreRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.aiplatform.v1.FeaturestoreService", "UpdateFeaturestore"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateFeaturestore(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -91,10 +87,8 @@ FeaturestoreServiceTracingStub::AsyncDeleteFeaturestore( google::cloud::aiplatform::v1::DeleteFeaturestoreRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.aiplatform.v1.FeaturestoreService", "DeleteFeaturestore"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteFeaturestore(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -106,10 +100,8 @@ FeaturestoreServiceTracingStub::AsyncCreateEntityType( google::cloud::aiplatform::v1::CreateEntityTypeRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.aiplatform.v1.FeaturestoreService", "CreateEntityType"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateEntityType(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -157,10 +149,8 @@ FeaturestoreServiceTracingStub::AsyncDeleteEntityType( google::cloud::aiplatform::v1::DeleteEntityTypeRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.aiplatform.v1.FeaturestoreService", "DeleteEntityType"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteEntityType(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -172,10 +162,8 @@ FeaturestoreServiceTracingStub::AsyncCreateFeature( google::cloud::aiplatform::v1::CreateFeatureRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.aiplatform.v1.FeaturestoreService", "CreateFeature"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateFeature(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -187,10 +175,8 @@ FeaturestoreServiceTracingStub::AsyncBatchCreateFeatures( google::cloud::aiplatform::v1::BatchCreateFeaturesRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.aiplatform.v1.FeaturestoreService", "BatchCreateFeatures"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncBatchCreateFeatures(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -238,10 +224,8 @@ FeaturestoreServiceTracingStub::AsyncDeleteFeature( google::cloud::aiplatform::v1::DeleteFeatureRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.aiplatform.v1.FeaturestoreService", "DeleteFeature"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteFeature(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -253,10 +237,8 @@ FeaturestoreServiceTracingStub::AsyncImportFeatureValues( google::cloud::aiplatform::v1::ImportFeatureValuesRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.aiplatform.v1.FeaturestoreService", "ImportFeatureValues"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncImportFeatureValues(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -270,10 +252,8 @@ FeaturestoreServiceTracingStub::AsyncBatchReadFeatureValues( auto span = internal::MakeSpanGrpc("google.cloud.aiplatform.v1.FeaturestoreService", "BatchReadFeatureValues"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncBatchReadFeatureValues(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -285,10 +265,8 @@ FeaturestoreServiceTracingStub::AsyncExportFeatureValues( google::cloud::aiplatform::v1::ExportFeatureValuesRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.aiplatform.v1.FeaturestoreService", "ExportFeatureValues"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncExportFeatureValues(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -300,10 +278,8 @@ FeaturestoreServiceTracingStub::AsyncDeleteFeatureValues( google::cloud::aiplatform::v1::DeleteFeatureValuesRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.aiplatform.v1.FeaturestoreService", "DeleteFeatureValues"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteFeatureValues(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -327,10 +303,8 @@ FeaturestoreServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -341,10 +315,8 @@ future FeaturestoreServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/aiplatform/v1/internal/index_endpoint_tracing_connection.cc b/google/cloud/aiplatform/v1/internal/index_endpoint_tracing_connection.cc index 8746d9fc4210..2ef504596960 100644 --- a/google/cloud/aiplatform/v1/internal/index_endpoint_tracing_connection.cc +++ b/google/cloud/aiplatform/v1/internal/index_endpoint_tracing_connection.cc @@ -37,7 +37,7 @@ IndexEndpointServiceTracingConnection::CreateIndexEndpoint( google::cloud::aiplatform::v1::CreateIndexEndpointRequest const& request) { auto span = internal::MakeSpan( "aiplatform_v1::IndexEndpointServiceConnection::CreateIndexEndpoint"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateIndexEndpoint(request)); } @@ -56,7 +56,7 @@ IndexEndpointServiceTracingConnection::ListIndexEndpoints( google::cloud::aiplatform::v1::ListIndexEndpointsRequest request) { auto span = internal::MakeSpan( "aiplatform_v1::IndexEndpointServiceConnection::ListIndexEndpoints"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListIndexEndpoints(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::aiplatform::v1::IndexEndpoint>(std::move(span), @@ -77,7 +77,7 @@ IndexEndpointServiceTracingConnection::DeleteIndexEndpoint( google::cloud::aiplatform::v1::DeleteIndexEndpointRequest const& request) { auto span = internal::MakeSpan( "aiplatform_v1::IndexEndpointServiceConnection::DeleteIndexEndpoint"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteIndexEndpoint(request)); } @@ -87,7 +87,7 @@ IndexEndpointServiceTracingConnection::DeployIndex( google::cloud::aiplatform::v1::DeployIndexRequest const& request) { auto span = internal::MakeSpan( "aiplatform_v1::IndexEndpointServiceConnection::DeployIndex"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeployIndex(request)); } @@ -96,7 +96,7 @@ IndexEndpointServiceTracingConnection::UndeployIndex( google::cloud::aiplatform::v1::UndeployIndexRequest const& request) { auto span = internal::MakeSpan( "aiplatform_v1::IndexEndpointServiceConnection::UndeployIndex"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UndeployIndex(request)); } @@ -105,7 +105,7 @@ IndexEndpointServiceTracingConnection::MutateDeployedIndex( google::cloud::aiplatform::v1::MutateDeployedIndexRequest const& request) { auto span = internal::MakeSpan( "aiplatform_v1::IndexEndpointServiceConnection::MutateDeployedIndex"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->MutateDeployedIndex(request)); } diff --git a/google/cloud/aiplatform/v1/internal/index_endpoint_tracing_stub.cc b/google/cloud/aiplatform/v1/internal/index_endpoint_tracing_stub.cc index 9cb62c5fe767..f2f98e1aef84 100644 --- a/google/cloud/aiplatform/v1/internal/index_endpoint_tracing_stub.cc +++ b/google/cloud/aiplatform/v1/internal/index_endpoint_tracing_stub.cc @@ -37,10 +37,8 @@ IndexEndpointServiceTracingStub::AsyncCreateIndexEndpoint( google::cloud::aiplatform::v1::CreateIndexEndpointRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.aiplatform.v1.IndexEndpointService", "CreateIndexEndpoint"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateIndexEndpoint(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -88,10 +86,8 @@ IndexEndpointServiceTracingStub::AsyncDeleteIndexEndpoint( google::cloud::aiplatform::v1::DeleteIndexEndpointRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.aiplatform.v1.IndexEndpointService", "DeleteIndexEndpoint"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteIndexEndpoint(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -103,10 +99,8 @@ IndexEndpointServiceTracingStub::AsyncDeployIndex( google::cloud::aiplatform::v1::DeployIndexRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.aiplatform.v1.IndexEndpointService", "DeployIndex"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeployIndex(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -118,10 +112,8 @@ IndexEndpointServiceTracingStub::AsyncUndeployIndex( google::cloud::aiplatform::v1::UndeployIndexRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.aiplatform.v1.IndexEndpointService", "UndeployIndex"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUndeployIndex(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -133,10 +125,8 @@ IndexEndpointServiceTracingStub::AsyncMutateDeployedIndex( google::cloud::aiplatform::v1::MutateDeployedIndexRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.aiplatform.v1.IndexEndpointService", "MutateDeployedIndex"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncMutateDeployedIndex(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -148,10 +138,8 @@ IndexEndpointServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -162,10 +150,8 @@ future IndexEndpointServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/aiplatform/v1/internal/index_tracing_connection.cc b/google/cloud/aiplatform/v1/internal/index_tracing_connection.cc index b2349676ad7c..ae950773c513 100644 --- a/google/cloud/aiplatform/v1/internal/index_tracing_connection.cc +++ b/google/cloud/aiplatform/v1/internal/index_tracing_connection.cc @@ -37,7 +37,7 @@ IndexServiceTracingConnection::CreateIndex( google::cloud::aiplatform::v1::CreateIndexRequest const& request) { auto span = internal::MakeSpan("aiplatform_v1::IndexServiceConnection::CreateIndex"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateIndex(request)); } @@ -55,7 +55,7 @@ IndexServiceTracingConnection::ListIndexes( google::cloud::aiplatform::v1::ListIndexesRequest request) { auto span = internal::MakeSpan("aiplatform_v1::IndexServiceConnection::ListIndexes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListIndexes(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -66,7 +66,7 @@ IndexServiceTracingConnection::UpdateIndex( google::cloud::aiplatform::v1::UpdateIndexRequest const& request) { auto span = internal::MakeSpan("aiplatform_v1::IndexServiceConnection::UpdateIndex"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateIndex(request)); } @@ -75,7 +75,7 @@ IndexServiceTracingConnection::DeleteIndex( google::cloud::aiplatform::v1::DeleteIndexRequest const& request) { auto span = internal::MakeSpan("aiplatform_v1::IndexServiceConnection::DeleteIndex"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteIndex(request)); } diff --git a/google/cloud/aiplatform/v1/internal/index_tracing_stub.cc b/google/cloud/aiplatform/v1/internal/index_tracing_stub.cc index a426233c4546..c5182741909a 100644 --- a/google/cloud/aiplatform/v1/internal/index_tracing_stub.cc +++ b/google/cloud/aiplatform/v1/internal/index_tracing_stub.cc @@ -37,10 +37,8 @@ IndexServiceTracingStub::AsyncCreateIndex( google::cloud::aiplatform::v1::CreateIndexRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.aiplatform.v1.IndexService", "CreateIndex"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateIndex(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -75,10 +73,8 @@ IndexServiceTracingStub::AsyncUpdateIndex( google::cloud::aiplatform::v1::UpdateIndexRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.aiplatform.v1.IndexService", "UpdateIndex"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateIndex(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -90,10 +86,8 @@ IndexServiceTracingStub::AsyncDeleteIndex( google::cloud::aiplatform::v1::DeleteIndexRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.aiplatform.v1.IndexService", "DeleteIndex"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteIndex(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -129,10 +123,8 @@ IndexServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -143,10 +135,8 @@ future IndexServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/aiplatform/v1/internal/job_tracing_connection.cc b/google/cloud/aiplatform/v1/internal/job_tracing_connection.cc index 5c34c1ac8753..70dc5aa0b24f 100644 --- a/google/cloud/aiplatform/v1/internal/job_tracing_connection.cc +++ b/google/cloud/aiplatform/v1/internal/job_tracing_connection.cc @@ -55,7 +55,7 @@ JobServiceTracingConnection::ListCustomJobs( google::cloud::aiplatform::v1::ListCustomJobsRequest request) { auto span = internal::MakeSpan("aiplatform_v1::JobServiceConnection::ListCustomJobs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListCustomJobs(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::aiplatform::v1::CustomJob>(std::move(span), std::move(sr)); @@ -66,7 +66,7 @@ JobServiceTracingConnection::DeleteCustomJob( google::cloud::aiplatform::v1::DeleteCustomJobRequest const& request) { auto span = internal::MakeSpan( "aiplatform_v1::JobServiceConnection::DeleteCustomJob"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteCustomJob(request)); } @@ -102,7 +102,7 @@ JobServiceTracingConnection::ListDataLabelingJobs( google::cloud::aiplatform::v1::ListDataLabelingJobsRequest request) { auto span = internal::MakeSpan( "aiplatform_v1::JobServiceConnection::ListDataLabelingJobs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListDataLabelingJobs(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::aiplatform::v1::DataLabelingJob>(std::move(span), @@ -115,7 +115,7 @@ JobServiceTracingConnection::DeleteDataLabelingJob( request) { auto span = internal::MakeSpan( "aiplatform_v1::JobServiceConnection::DeleteDataLabelingJob"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteDataLabelingJob(request)); } @@ -156,7 +156,7 @@ JobServiceTracingConnection::ListHyperparameterTuningJobs( request) { auto span = internal::MakeSpan( "aiplatform_v1::JobServiceConnection::ListHyperparameterTuningJobs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListHyperparameterTuningJobs(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::aiplatform::v1::HyperparameterTuningJob>(std::move(span), @@ -169,7 +169,7 @@ JobServiceTracingConnection::DeleteHyperparameterTuningJob( request) { auto span = internal::MakeSpan( "aiplatform_v1::JobServiceConnection::DeleteHyperparameterTuningJob"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteHyperparameterTuningJob(request)); } @@ -207,7 +207,7 @@ JobServiceTracingConnection::ListNasJobs( google::cloud::aiplatform::v1::ListNasJobsRequest request) { auto span = internal::MakeSpan("aiplatform_v1::JobServiceConnection::ListNasJobs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListNasJobs(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -218,7 +218,7 @@ JobServiceTracingConnection::DeleteNasJob( google::cloud::aiplatform::v1::DeleteNasJobRequest const& request) { auto span = internal::MakeSpan("aiplatform_v1::JobServiceConnection::DeleteNasJob"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteNasJob(request)); } @@ -244,7 +244,7 @@ JobServiceTracingConnection::ListNasTrialDetails( google::cloud::aiplatform::v1::ListNasTrialDetailsRequest request) { auto span = internal::MakeSpan( "aiplatform_v1::JobServiceConnection::ListNasTrialDetails"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListNasTrialDetails(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::aiplatform::v1::NasTrialDetail>(std::move(span), @@ -276,7 +276,7 @@ JobServiceTracingConnection::ListBatchPredictionJobs( google::cloud::aiplatform::v1::ListBatchPredictionJobsRequest request) { auto span = internal::MakeSpan( "aiplatform_v1::JobServiceConnection::ListBatchPredictionJobs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListBatchPredictionJobs(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::aiplatform::v1::BatchPredictionJob>(std::move(span), @@ -289,7 +289,7 @@ JobServiceTracingConnection::DeleteBatchPredictionJob( request) { auto span = internal::MakeSpan( "aiplatform_v1::JobServiceConnection::DeleteBatchPredictionJob"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteBatchPredictionJob(request)); } @@ -322,7 +322,7 @@ JobServiceTracingConnection::SearchModelDeploymentMonitoringStatsAnomalies( auto span = internal::MakeSpan( "aiplatform_v1::JobServiceConnection::" "SearchModelDeploymentMonitoringStatsAnomalies"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->SearchModelDeploymentMonitoringStatsAnomalies(std::move(request)); return internal::MakeTracedStreamRange< @@ -347,7 +347,7 @@ JobServiceTracingConnection::ListModelDeploymentMonitoringJobs( request) { auto span = internal::MakeSpan( "aiplatform_v1::JobServiceConnection::ListModelDeploymentMonitoringJobs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListModelDeploymentMonitoringJobs(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::aiplatform::v1::ModelDeploymentMonitoringJob>( @@ -361,7 +361,7 @@ JobServiceTracingConnection::UpdateModelDeploymentMonitoringJob( auto span = internal::MakeSpan( "aiplatform_v1::JobServiceConnection::" "UpdateModelDeploymentMonitoringJob"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateModelDeploymentMonitoringJob(request)); } @@ -373,7 +373,7 @@ JobServiceTracingConnection::DeleteModelDeploymentMonitoringJob( auto span = internal::MakeSpan( "aiplatform_v1::JobServiceConnection::" "DeleteModelDeploymentMonitoringJob"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteModelDeploymentMonitoringJob(request)); } diff --git a/google/cloud/aiplatform/v1/internal/job_tracing_stub.cc b/google/cloud/aiplatform/v1/internal/job_tracing_stub.cc index ac05c7b67dff..9b94cd049795 100644 --- a/google/cloud/aiplatform/v1/internal/job_tracing_stub.cc +++ b/google/cloud/aiplatform/v1/internal/job_tracing_stub.cc @@ -73,10 +73,8 @@ JobServiceTracingStub::AsyncDeleteCustomJob( google::cloud::aiplatform::v1::DeleteCustomJobRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.aiplatform.v1.JobService", "DeleteCustomJob"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteCustomJob(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -137,10 +135,8 @@ JobServiceTracingStub::AsyncDeleteDataLabelingJob( request) { auto span = internal::MakeSpanGrpc("google.cloud.aiplatform.v1.JobService", "DeleteDataLabelingJob"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteDataLabelingJob(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -204,10 +200,8 @@ JobServiceTracingStub::AsyncDeleteHyperparameterTuningJob( request) { auto span = internal::MakeSpanGrpc("google.cloud.aiplatform.v1.JobService", "DeleteHyperparameterTuningJob"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteHyperparameterTuningJob(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -266,10 +260,8 @@ JobServiceTracingStub::AsyncDeleteNasJob( google::cloud::aiplatform::v1::DeleteNasJobRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.aiplatform.v1.JobService", "DeleteNasJob"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteNasJob(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -356,10 +348,8 @@ JobServiceTracingStub::AsyncDeleteBatchPredictionJob( request) { auto span = internal::MakeSpanGrpc("google.cloud.aiplatform.v1.JobService", "DeleteBatchPredictionJob"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteBatchPredictionJob(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -443,10 +433,8 @@ JobServiceTracingStub::AsyncUpdateModelDeploymentMonitoringJob( UpdateModelDeploymentMonitoringJobRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.aiplatform.v1.JobService", "UpdateModelDeploymentMonitoringJob"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateModelDeploymentMonitoringJob(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); @@ -460,10 +448,8 @@ JobServiceTracingStub::AsyncDeleteModelDeploymentMonitoringJob( DeleteModelDeploymentMonitoringJobRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.aiplatform.v1.JobService", "DeleteModelDeploymentMonitoringJob"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteModelDeploymentMonitoringJob(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); @@ -502,10 +488,8 @@ JobServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -516,10 +500,8 @@ future JobServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/aiplatform/v1/internal/metadata_tracing_connection.cc b/google/cloud/aiplatform/v1/internal/metadata_tracing_connection.cc index f32d2dc5c9d2..9388e44fad73 100644 --- a/google/cloud/aiplatform/v1/internal/metadata_tracing_connection.cc +++ b/google/cloud/aiplatform/v1/internal/metadata_tracing_connection.cc @@ -37,7 +37,7 @@ MetadataServiceTracingConnection::CreateMetadataStore( google::cloud::aiplatform::v1::CreateMetadataStoreRequest const& request) { auto span = internal::MakeSpan( "aiplatform_v1::MetadataServiceConnection::CreateMetadataStore"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateMetadataStore(request)); } @@ -56,7 +56,7 @@ MetadataServiceTracingConnection::ListMetadataStores( google::cloud::aiplatform::v1::ListMetadataStoresRequest request) { auto span = internal::MakeSpan( "aiplatform_v1::MetadataServiceConnection::ListMetadataStores"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListMetadataStores(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::aiplatform::v1::MetadataStore>(std::move(span), @@ -69,7 +69,7 @@ MetadataServiceTracingConnection::DeleteMetadataStore( google::cloud::aiplatform::v1::DeleteMetadataStoreRequest const& request) { auto span = internal::MakeSpan( "aiplatform_v1::MetadataServiceConnection::DeleteMetadataStore"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteMetadataStore(request)); } @@ -97,7 +97,7 @@ MetadataServiceTracingConnection::ListArtifacts( google::cloud::aiplatform::v1::ListArtifactsRequest request) { auto span = internal::MakeSpan( "aiplatform_v1::MetadataServiceConnection::ListArtifacts"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListArtifacts(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::aiplatform::v1::Artifact>(std::move(span), std::move(sr)); @@ -117,7 +117,7 @@ MetadataServiceTracingConnection::DeleteArtifact( google::cloud::aiplatform::v1::DeleteArtifactRequest const& request) { auto span = internal::MakeSpan( "aiplatform_v1::MetadataServiceConnection::DeleteArtifact"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteArtifact(request)); } @@ -126,7 +126,7 @@ MetadataServiceTracingConnection::PurgeArtifacts( google::cloud::aiplatform::v1::PurgeArtifactsRequest const& request) { auto span = internal::MakeSpan( "aiplatform_v1::MetadataServiceConnection::PurgeArtifacts"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PurgeArtifacts(request)); } @@ -153,7 +153,7 @@ MetadataServiceTracingConnection::ListContexts( google::cloud::aiplatform::v1::ListContextsRequest request) { auto span = internal::MakeSpan( "aiplatform_v1::MetadataServiceConnection::ListContexts"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListContexts(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::aiplatform::v1::Context>(std::move(span), std::move(sr)); @@ -173,7 +173,7 @@ MetadataServiceTracingConnection::DeleteContext( google::cloud::aiplatform::v1::DeleteContextRequest const& request) { auto span = internal::MakeSpan( "aiplatform_v1::MetadataServiceConnection::DeleteContext"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteContext(request)); } @@ -182,7 +182,7 @@ MetadataServiceTracingConnection::PurgeContexts( google::cloud::aiplatform::v1::PurgeContextsRequest const& request) { auto span = internal::MakeSpan( "aiplatform_v1::MetadataServiceConnection::PurgeContexts"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PurgeContexts(request)); } @@ -251,7 +251,7 @@ MetadataServiceTracingConnection::ListExecutions( google::cloud::aiplatform::v1::ListExecutionsRequest request) { auto span = internal::MakeSpan( "aiplatform_v1::MetadataServiceConnection::ListExecutions"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListExecutions(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::aiplatform::v1::Execution>(std::move(span), std::move(sr)); @@ -271,7 +271,7 @@ MetadataServiceTracingConnection::DeleteExecution( google::cloud::aiplatform::v1::DeleteExecutionRequest const& request) { auto span = internal::MakeSpan( "aiplatform_v1::MetadataServiceConnection::DeleteExecution"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteExecution(request)); } @@ -280,7 +280,7 @@ MetadataServiceTracingConnection::PurgeExecutions( google::cloud::aiplatform::v1::PurgeExecutionsRequest const& request) { auto span = internal::MakeSpan( "aiplatform_v1::MetadataServiceConnection::PurgeExecutions"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PurgeExecutions(request)); } @@ -328,7 +328,7 @@ MetadataServiceTracingConnection::ListMetadataSchemas( google::cloud::aiplatform::v1::ListMetadataSchemasRequest request) { auto span = internal::MakeSpan( "aiplatform_v1::MetadataServiceConnection::ListMetadataSchemas"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListMetadataSchemas(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::aiplatform::v1::MetadataSchema>(std::move(span), diff --git a/google/cloud/aiplatform/v1/internal/metadata_tracing_stub.cc b/google/cloud/aiplatform/v1/internal/metadata_tracing_stub.cc index 44eb9c2b691e..a6e32f9c3c11 100644 --- a/google/cloud/aiplatform/v1/internal/metadata_tracing_stub.cc +++ b/google/cloud/aiplatform/v1/internal/metadata_tracing_stub.cc @@ -37,10 +37,8 @@ MetadataServiceTracingStub::AsyncCreateMetadataStore( google::cloud::aiplatform::v1::CreateMetadataStoreRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.aiplatform.v1.MetadataService", "CreateMetadataStore"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateMetadataStore(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -76,10 +74,8 @@ MetadataServiceTracingStub::AsyncDeleteMetadataStore( google::cloud::aiplatform::v1::DeleteMetadataStoreRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.aiplatform.v1.MetadataService", "DeleteMetadataStore"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteMetadataStore(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -139,10 +135,8 @@ MetadataServiceTracingStub::AsyncDeleteArtifact( google::cloud::aiplatform::v1::DeleteArtifactRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.aiplatform.v1.MetadataService", "DeleteArtifact"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteArtifact(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -154,10 +148,8 @@ MetadataServiceTracingStub::AsyncPurgeArtifacts( google::cloud::aiplatform::v1::PurgeArtifactsRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.aiplatform.v1.MetadataService", "PurgeArtifacts"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncPurgeArtifacts(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -217,10 +209,8 @@ MetadataServiceTracingStub::AsyncDeleteContext( google::cloud::aiplatform::v1::DeleteContextRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.aiplatform.v1.MetadataService", "DeleteContext"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteContext(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -232,10 +222,8 @@ MetadataServiceTracingStub::AsyncPurgeContexts( google::cloud::aiplatform::v1::PurgeContextsRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.aiplatform.v1.MetadataService", "PurgeContexts"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncPurgeContexts(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -350,10 +338,8 @@ MetadataServiceTracingStub::AsyncDeleteExecution( google::cloud::aiplatform::v1::DeleteExecutionRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.aiplatform.v1.MetadataService", "DeleteExecution"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteExecution(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -365,10 +351,8 @@ MetadataServiceTracingStub::AsyncPurgeExecutions( google::cloud::aiplatform::v1::PurgeExecutionsRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.aiplatform.v1.MetadataService", "PurgeExecutions"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncPurgeExecutions(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -456,10 +440,8 @@ MetadataServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -470,10 +452,8 @@ future MetadataServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/aiplatform/v1/internal/migration_tracing_connection.cc b/google/cloud/aiplatform/v1/internal/migration_tracing_connection.cc index 77ba1ae48bb0..b59e45c43f43 100644 --- a/google/cloud/aiplatform/v1/internal/migration_tracing_connection.cc +++ b/google/cloud/aiplatform/v1/internal/migration_tracing_connection.cc @@ -37,7 +37,7 @@ MigrationServiceTracingConnection::SearchMigratableResources( google::cloud::aiplatform::v1::SearchMigratableResourcesRequest request) { auto span = internal::MakeSpan( "aiplatform_v1::MigrationServiceConnection::SearchMigratableResources"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->SearchMigratableResources(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::aiplatform::v1::MigratableResource>(std::move(span), @@ -50,7 +50,7 @@ MigrationServiceTracingConnection::BatchMigrateResources( request) { auto span = internal::MakeSpan( "aiplatform_v1::MigrationServiceConnection::BatchMigrateResources"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->BatchMigrateResources(request)); } diff --git a/google/cloud/aiplatform/v1/internal/migration_tracing_stub.cc b/google/cloud/aiplatform/v1/internal/migration_tracing_stub.cc index 83f14782c1db..e7fc04f71503 100644 --- a/google/cloud/aiplatform/v1/internal/migration_tracing_stub.cc +++ b/google/cloud/aiplatform/v1/internal/migration_tracing_stub.cc @@ -52,10 +52,8 @@ MigrationServiceTracingStub::AsyncBatchMigrateResources( request) { auto span = internal::MakeSpanGrpc( "google.cloud.aiplatform.v1.MigrationService", "BatchMigrateResources"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncBatchMigrateResources(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -67,10 +65,8 @@ MigrationServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -81,10 +77,8 @@ future MigrationServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/aiplatform/v1/internal/model_tracing_connection.cc b/google/cloud/aiplatform/v1/internal/model_tracing_connection.cc index 04d09be2856c..cc5694f3e736 100644 --- a/google/cloud/aiplatform/v1/internal/model_tracing_connection.cc +++ b/google/cloud/aiplatform/v1/internal/model_tracing_connection.cc @@ -37,7 +37,7 @@ ModelServiceTracingConnection::UploadModel( google::cloud::aiplatform::v1::UploadModelRequest const& request) { auto span = internal::MakeSpan("aiplatform_v1::ModelServiceConnection::UploadModel"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UploadModel(request)); } @@ -55,7 +55,7 @@ ModelServiceTracingConnection::ListModels( google::cloud::aiplatform::v1::ListModelsRequest request) { auto span = internal::MakeSpan("aiplatform_v1::ModelServiceConnection::ListModels"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListModels(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -66,7 +66,7 @@ ModelServiceTracingConnection::ListModelVersions( google::cloud::aiplatform::v1::ListModelVersionsRequest request) { auto span = internal::MakeSpan( "aiplatform_v1::ModelServiceConnection::ListModelVersions"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListModelVersions(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -88,7 +88,7 @@ ModelServiceTracingConnection::UpdateExplanationDataset( request) { auto span = internal::MakeSpan( "aiplatform_v1::ModelServiceConnection::UpdateExplanationDataset"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateExplanationDataset(request)); } @@ -98,7 +98,7 @@ ModelServiceTracingConnection::DeleteModel( google::cloud::aiplatform::v1::DeleteModelRequest const& request) { auto span = internal::MakeSpan("aiplatform_v1::ModelServiceConnection::DeleteModel"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteModel(request)); } @@ -107,7 +107,7 @@ ModelServiceTracingConnection::DeleteModelVersion( google::cloud::aiplatform::v1::DeleteModelVersionRequest const& request) { auto span = internal::MakeSpan( "aiplatform_v1::ModelServiceConnection::DeleteModelVersion"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteModelVersion(request)); } @@ -126,7 +126,7 @@ ModelServiceTracingConnection::ExportModel( google::cloud::aiplatform::v1::ExportModelRequest const& request) { auto span = internal::MakeSpan("aiplatform_v1::ModelServiceConnection::ExportModel"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ExportModel(request)); } @@ -135,7 +135,7 @@ ModelServiceTracingConnection::CopyModel( google::cloud::aiplatform::v1::CopyModelRequest const& request) { auto span = internal::MakeSpan("aiplatform_v1::ModelServiceConnection::CopyModel"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CopyModel(request)); } @@ -187,7 +187,7 @@ ModelServiceTracingConnection::ListModelEvaluations( google::cloud::aiplatform::v1::ListModelEvaluationsRequest request) { auto span = internal::MakeSpan( "aiplatform_v1::ModelServiceConnection::ListModelEvaluations"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListModelEvaluations(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::aiplatform::v1::ModelEvaluation>(std::move(span), @@ -209,7 +209,7 @@ ModelServiceTracingConnection::ListModelEvaluationSlices( google::cloud::aiplatform::v1::ListModelEvaluationSlicesRequest request) { auto span = internal::MakeSpan( "aiplatform_v1::ModelServiceConnection::ListModelEvaluationSlices"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListModelEvaluationSlices(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::aiplatform::v1::ModelEvaluationSlice>(std::move(span), diff --git a/google/cloud/aiplatform/v1/internal/model_tracing_stub.cc b/google/cloud/aiplatform/v1/internal/model_tracing_stub.cc index 6031dadc5711..3c6447dc5c33 100644 --- a/google/cloud/aiplatform/v1/internal/model_tracing_stub.cc +++ b/google/cloud/aiplatform/v1/internal/model_tracing_stub.cc @@ -37,10 +37,8 @@ ModelServiceTracingStub::AsyncUploadModel( google::cloud::aiplatform::v1::UploadModelRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.aiplatform.v1.ModelService", "UploadModel"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUploadModel(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -100,10 +98,8 @@ ModelServiceTracingStub::AsyncUpdateExplanationDataset( request) { auto span = internal::MakeSpanGrpc("google.cloud.aiplatform.v1.ModelService", "UpdateExplanationDataset"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateExplanationDataset(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -115,10 +111,8 @@ ModelServiceTracingStub::AsyncDeleteModel( google::cloud::aiplatform::v1::DeleteModelRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.aiplatform.v1.ModelService", "DeleteModel"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteModel(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -130,10 +124,8 @@ ModelServiceTracingStub::AsyncDeleteModelVersion( google::cloud::aiplatform::v1::DeleteModelVersionRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.aiplatform.v1.ModelService", "DeleteModelVersion"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteModelVersion(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -157,10 +149,8 @@ ModelServiceTracingStub::AsyncExportModel( google::cloud::aiplatform::v1::ExportModelRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.aiplatform.v1.ModelService", "ExportModel"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncExportModel(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -172,10 +162,8 @@ ModelServiceTracingStub::AsyncCopyModel( google::cloud::aiplatform::v1::CopyModelRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.aiplatform.v1.ModelService", "CopyModel"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCopyModel(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -279,10 +267,8 @@ ModelServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -293,10 +279,8 @@ future ModelServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/aiplatform/v1/internal/pipeline_tracing_connection.cc b/google/cloud/aiplatform/v1/internal/pipeline_tracing_connection.cc index 4f8d51c31801..5b3bdc0d9e41 100644 --- a/google/cloud/aiplatform/v1/internal/pipeline_tracing_connection.cc +++ b/google/cloud/aiplatform/v1/internal/pipeline_tracing_connection.cc @@ -56,7 +56,7 @@ PipelineServiceTracingConnection::ListTrainingPipelines( google::cloud::aiplatform::v1::ListTrainingPipelinesRequest request) { auto span = internal::MakeSpan( "aiplatform_v1::PipelineServiceConnection::ListTrainingPipelines"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListTrainingPipelines(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::aiplatform::v1::TrainingPipeline>(std::move(span), @@ -69,7 +69,7 @@ PipelineServiceTracingConnection::DeleteTrainingPipeline( request) { auto span = internal::MakeSpan( "aiplatform_v1::PipelineServiceConnection::DeleteTrainingPipeline"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteTrainingPipeline(request)); } @@ -106,7 +106,7 @@ PipelineServiceTracingConnection::ListPipelineJobs( google::cloud::aiplatform::v1::ListPipelineJobsRequest request) { auto span = internal::MakeSpan( "aiplatform_v1::PipelineServiceConnection::ListPipelineJobs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListPipelineJobs(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::aiplatform::v1::PipelineJob>(std::move(span), @@ -118,7 +118,7 @@ PipelineServiceTracingConnection::DeletePipelineJob( google::cloud::aiplatform::v1::DeletePipelineJobRequest const& request) { auto span = internal::MakeSpan( "aiplatform_v1::PipelineServiceConnection::DeletePipelineJob"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeletePipelineJob(request)); } diff --git a/google/cloud/aiplatform/v1/internal/pipeline_tracing_stub.cc b/google/cloud/aiplatform/v1/internal/pipeline_tracing_stub.cc index 377f7ee76480..761e19b1ae5e 100644 --- a/google/cloud/aiplatform/v1/internal/pipeline_tracing_stub.cc +++ b/google/cloud/aiplatform/v1/internal/pipeline_tracing_stub.cc @@ -76,10 +76,8 @@ PipelineServiceTracingStub::AsyncDeleteTrainingPipeline( request) { auto span = internal::MakeSpanGrpc( "google.cloud.aiplatform.v1.PipelineService", "DeleteTrainingPipeline"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteTrainingPipeline(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -139,10 +137,8 @@ PipelineServiceTracingStub::AsyncDeletePipelineJob( google::cloud::aiplatform::v1::DeletePipelineJobRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.aiplatform.v1.PipelineService", "DeletePipelineJob"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeletePipelineJob(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -165,10 +161,8 @@ PipelineServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -179,10 +173,8 @@ future PipelineServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/aiplatform/v1/internal/prediction_tracing_connection.cc b/google/cloud/aiplatform/v1/internal/prediction_tracing_connection.cc index 78dff42cebc1..2c3991705a7d 100644 --- a/google/cloud/aiplatform/v1/internal/prediction_tracing_connection.cc +++ b/google/cloud/aiplatform/v1/internal/prediction_tracing_connection.cc @@ -54,7 +54,7 @@ PredictionServiceTracingConnection::ServerStreamingPredict( google::cloud::aiplatform::v1::StreamingPredictRequest const& request) { auto span = internal::MakeSpan( "aiplatform_v1::PredictionServiceConnection::ServerStreamingPredict"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ServerStreamingPredict(request); return internal::MakeTracedStreamRange< google::cloud::aiplatform::v1::StreamingPredictResponse>(std::move(span), diff --git a/google/cloud/aiplatform/v1/internal/specialist_pool_tracing_connection.cc b/google/cloud/aiplatform/v1/internal/specialist_pool_tracing_connection.cc index 803c7820f193..56c1a5d15bd3 100644 --- a/google/cloud/aiplatform/v1/internal/specialist_pool_tracing_connection.cc +++ b/google/cloud/aiplatform/v1/internal/specialist_pool_tracing_connection.cc @@ -37,7 +37,7 @@ SpecialistPoolServiceTracingConnection::CreateSpecialistPool( google::cloud::aiplatform::v1::CreateSpecialistPoolRequest const& request) { auto span = internal::MakeSpan( "aiplatform_v1::SpecialistPoolServiceConnection::CreateSpecialistPool"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateSpecialistPool(request)); } @@ -56,7 +56,7 @@ SpecialistPoolServiceTracingConnection::ListSpecialistPools( google::cloud::aiplatform::v1::ListSpecialistPoolsRequest request) { auto span = internal::MakeSpan( "aiplatform_v1::SpecialistPoolServiceConnection::ListSpecialistPools"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListSpecialistPools(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::aiplatform::v1::SpecialistPool>(std::move(span), @@ -68,7 +68,7 @@ SpecialistPoolServiceTracingConnection::DeleteSpecialistPool( google::cloud::aiplatform::v1::DeleteSpecialistPoolRequest const& request) { auto span = internal::MakeSpan( "aiplatform_v1::SpecialistPoolServiceConnection::DeleteSpecialistPool"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteSpecialistPool(request)); } @@ -78,7 +78,7 @@ SpecialistPoolServiceTracingConnection::UpdateSpecialistPool( google::cloud::aiplatform::v1::UpdateSpecialistPoolRequest const& request) { auto span = internal::MakeSpan( "aiplatform_v1::SpecialistPoolServiceConnection::UpdateSpecialistPool"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateSpecialistPool(request)); } diff --git a/google/cloud/aiplatform/v1/internal/specialist_pool_tracing_stub.cc b/google/cloud/aiplatform/v1/internal/specialist_pool_tracing_stub.cc index 8514b2a16f06..f020145c05d0 100644 --- a/google/cloud/aiplatform/v1/internal/specialist_pool_tracing_stub.cc +++ b/google/cloud/aiplatform/v1/internal/specialist_pool_tracing_stub.cc @@ -38,10 +38,8 @@ SpecialistPoolServiceTracingStub::AsyncCreateSpecialistPool( auto span = internal::MakeSpanGrpc("google.cloud.aiplatform.v1.SpecialistPoolService", "CreateSpecialistPool"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateSpecialistPool(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -79,10 +77,8 @@ SpecialistPoolServiceTracingStub::AsyncDeleteSpecialistPool( auto span = internal::MakeSpanGrpc("google.cloud.aiplatform.v1.SpecialistPoolService", "DeleteSpecialistPool"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteSpecialistPool(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -95,10 +91,8 @@ SpecialistPoolServiceTracingStub::AsyncUpdateSpecialistPool( auto span = internal::MakeSpanGrpc("google.cloud.aiplatform.v1.SpecialistPoolService", "UpdateSpecialistPool"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateSpecialistPool(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -110,10 +104,8 @@ SpecialistPoolServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -124,10 +116,8 @@ future SpecialistPoolServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/aiplatform/v1/internal/tensorboard_tracing_connection.cc b/google/cloud/aiplatform/v1/internal/tensorboard_tracing_connection.cc index ca99cf1d5bb0..c9ce8fb5c8c2 100644 --- a/google/cloud/aiplatform/v1/internal/tensorboard_tracing_connection.cc +++ b/google/cloud/aiplatform/v1/internal/tensorboard_tracing_connection.cc @@ -37,7 +37,7 @@ TensorboardServiceTracingConnection::CreateTensorboard( google::cloud::aiplatform::v1::CreateTensorboardRequest const& request) { auto span = internal::MakeSpan( "aiplatform_v1::TensorboardServiceConnection::CreateTensorboard"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateTensorboard(request)); } @@ -55,7 +55,7 @@ TensorboardServiceTracingConnection::UpdateTensorboard( google::cloud::aiplatform::v1::UpdateTensorboardRequest const& request) { auto span = internal::MakeSpan( "aiplatform_v1::TensorboardServiceConnection::UpdateTensorboard"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateTensorboard(request)); } @@ -64,7 +64,7 @@ TensorboardServiceTracingConnection::ListTensorboards( google::cloud::aiplatform::v1::ListTensorboardsRequest request) { auto span = internal::MakeSpan( "aiplatform_v1::TensorboardServiceConnection::ListTensorboards"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListTensorboards(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::aiplatform::v1::Tensorboard>(std::move(span), @@ -76,7 +76,7 @@ TensorboardServiceTracingConnection::DeleteTensorboard( google::cloud::aiplatform::v1::DeleteTensorboardRequest const& request) { auto span = internal::MakeSpan( "aiplatform_v1::TensorboardServiceConnection::DeleteTensorboard"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteTensorboard(request)); } @@ -136,7 +136,7 @@ TensorboardServiceTracingConnection::ListTensorboardExperiments( auto span = internal::MakeSpan( "aiplatform_v1::TensorboardServiceConnection::" "ListTensorboardExperiments"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListTensorboardExperiments(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::aiplatform::v1::TensorboardExperiment>(std::move(span), @@ -150,7 +150,7 @@ TensorboardServiceTracingConnection::DeleteTensorboardExperiment( auto span = internal::MakeSpan( "aiplatform_v1::TensorboardServiceConnection::" "DeleteTensorboardExperiment"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteTensorboardExperiment(request)); } @@ -198,7 +198,7 @@ TensorboardServiceTracingConnection::ListTensorboardRuns( google::cloud::aiplatform::v1::ListTensorboardRunsRequest request) { auto span = internal::MakeSpan( "aiplatform_v1::TensorboardServiceConnection::ListTensorboardRuns"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListTensorboardRuns(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::aiplatform::v1::TensorboardRun>(std::move(span), @@ -210,7 +210,7 @@ TensorboardServiceTracingConnection::DeleteTensorboardRun( google::cloud::aiplatform::v1::DeleteTensorboardRunRequest const& request) { auto span = internal::MakeSpan( "aiplatform_v1::TensorboardServiceConnection::DeleteTensorboardRun"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteTensorboardRun(request)); } @@ -265,7 +265,7 @@ TensorboardServiceTracingConnection::ListTensorboardTimeSeries( google::cloud::aiplatform::v1::ListTensorboardTimeSeriesRequest request) { auto span = internal::MakeSpan( "aiplatform_v1::TensorboardServiceConnection::ListTensorboardTimeSeries"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListTensorboardTimeSeries(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::aiplatform::v1::TensorboardTimeSeries>(std::move(span), @@ -279,7 +279,7 @@ TensorboardServiceTracingConnection::DeleteTensorboardTimeSeries( auto span = internal::MakeSpan( "aiplatform_v1::TensorboardServiceConnection::" "DeleteTensorboardTimeSeries"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteTensorboardTimeSeries(request)); } @@ -315,7 +315,7 @@ TensorboardServiceTracingConnection::ReadTensorboardBlobData( request) { auto span = internal::MakeSpan( "aiplatform_v1::TensorboardServiceConnection::ReadTensorboardBlobData"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ReadTensorboardBlobData(request); return internal::MakeTracedStreamRange< google::cloud::aiplatform::v1::ReadTensorboardBlobDataResponse>( @@ -350,7 +350,7 @@ TensorboardServiceTracingConnection::ExportTensorboardTimeSeriesData( auto span = internal::MakeSpan( "aiplatform_v1::TensorboardServiceConnection::" "ExportTensorboardTimeSeriesData"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ExportTensorboardTimeSeriesData(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::aiplatform::v1::TimeSeriesDataPoint>(std::move(span), diff --git a/google/cloud/aiplatform/v1/internal/tensorboard_tracing_stub.cc b/google/cloud/aiplatform/v1/internal/tensorboard_tracing_stub.cc index 5fe007ddea90..eff7a3e5ce3e 100644 --- a/google/cloud/aiplatform/v1/internal/tensorboard_tracing_stub.cc +++ b/google/cloud/aiplatform/v1/internal/tensorboard_tracing_stub.cc @@ -38,10 +38,8 @@ TensorboardServiceTracingStub::AsyncCreateTensorboard( google::cloud::aiplatform::v1::CreateTensorboardRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.aiplatform.v1.TensorboardService", "CreateTensorboard"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateTensorboard(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -65,10 +63,8 @@ TensorboardServiceTracingStub::AsyncUpdateTensorboard( google::cloud::aiplatform::v1::UpdateTensorboardRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.aiplatform.v1.TensorboardService", "UpdateTensorboard"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateTensorboard(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -92,10 +88,8 @@ TensorboardServiceTracingStub::AsyncDeleteTensorboard( google::cloud::aiplatform::v1::DeleteTensorboardRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.aiplatform.v1.TensorboardService", "DeleteTensorboard"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteTensorboard(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -189,10 +183,8 @@ TensorboardServiceTracingStub::AsyncDeleteTensorboardExperiment( auto span = internal::MakeSpanGrpc("google.cloud.aiplatform.v1.TensorboardService", "DeleteTensorboardExperiment"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteTensorboardExperiment(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -266,10 +258,8 @@ TensorboardServiceTracingStub::AsyncDeleteTensorboardRun( google::cloud::aiplatform::v1::DeleteTensorboardRunRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.aiplatform.v1.TensorboardService", "DeleteTensorboardRun"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteTensorboardRun(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -355,10 +345,8 @@ TensorboardServiceTracingStub::AsyncDeleteTensorboardTimeSeries( auto span = internal::MakeSpanGrpc("google.cloud.aiplatform.v1.TensorboardService", "DeleteTensorboardTimeSeries"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteTensorboardTimeSeries(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -460,10 +448,8 @@ TensorboardServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -474,10 +460,8 @@ future TensorboardServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/aiplatform/v1/internal/vizier_tracing_connection.cc b/google/cloud/aiplatform/v1/internal/vizier_tracing_connection.cc index 9ae7f7ca517c..95825127ee58 100644 --- a/google/cloud/aiplatform/v1/internal/vizier_tracing_connection.cc +++ b/google/cloud/aiplatform/v1/internal/vizier_tracing_connection.cc @@ -55,7 +55,7 @@ VizierServiceTracingConnection::ListStudies( google::cloud::aiplatform::v1::ListStudiesRequest request) { auto span = internal::MakeSpan("aiplatform_v1::VizierServiceConnection::ListStudies"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListStudies(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -83,7 +83,7 @@ VizierServiceTracingConnection::SuggestTrials( google::cloud::aiplatform::v1::SuggestTrialsRequest const& request) { auto span = internal::MakeSpan( "aiplatform_v1::VizierServiceConnection::SuggestTrials"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SuggestTrials(request)); } @@ -110,7 +110,7 @@ VizierServiceTracingConnection::ListTrials( google::cloud::aiplatform::v1::ListTrialsRequest request) { auto span = internal::MakeSpan("aiplatform_v1::VizierServiceConnection::ListTrials"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListTrials(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -149,7 +149,7 @@ VizierServiceTracingConnection::CheckTrialEarlyStoppingState( request) { auto span = internal::MakeSpan( "aiplatform_v1::VizierServiceConnection::CheckTrialEarlyStoppingState"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CheckTrialEarlyStoppingState(request)); } diff --git a/google/cloud/aiplatform/v1/internal/vizier_tracing_stub.cc b/google/cloud/aiplatform/v1/internal/vizier_tracing_stub.cc index 64dddda14cbf..af954a69f5b5 100644 --- a/google/cloud/aiplatform/v1/internal/vizier_tracing_stub.cc +++ b/google/cloud/aiplatform/v1/internal/vizier_tracing_stub.cc @@ -95,10 +95,8 @@ VizierServiceTracingStub::AsyncSuggestTrials( google::cloud::aiplatform::v1::SuggestTrialsRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.aiplatform.v1.VizierService", "SuggestTrials"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncSuggestTrials(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -181,10 +179,8 @@ VizierServiceTracingStub::AsyncCheckTrialEarlyStoppingState( request) { auto span = internal::MakeSpanGrpc("google.cloud.aiplatform.v1.VizierService", "CheckTrialEarlyStoppingState"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCheckTrialEarlyStoppingState(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -219,10 +215,8 @@ VizierServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -233,10 +227,8 @@ future VizierServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/alloydb/v1/internal/alloy_db_admin_tracing_connection.cc b/google/cloud/alloydb/v1/internal/alloy_db_admin_tracing_connection.cc index 02573ce1e5e6..5380be336832 100644 --- a/google/cloud/alloydb/v1/internal/alloy_db_admin_tracing_connection.cc +++ b/google/cloud/alloydb/v1/internal/alloy_db_admin_tracing_connection.cc @@ -37,7 +37,7 @@ AlloyDBAdminTracingConnection::ListClusters( google::cloud::alloydb::v1::ListClustersRequest request) { auto span = internal::MakeSpan("alloydb_v1::AlloyDBAdminConnection::ListClusters"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListClusters(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -57,7 +57,7 @@ AlloyDBAdminTracingConnection::CreateCluster( google::cloud::alloydb::v1::CreateClusterRequest const& request) { auto span = internal::MakeSpan("alloydb_v1::AlloyDBAdminConnection::CreateCluster"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateCluster(request)); } @@ -66,7 +66,7 @@ AlloyDBAdminTracingConnection::UpdateCluster( google::cloud::alloydb::v1::UpdateClusterRequest const& request) { auto span = internal::MakeSpan("alloydb_v1::AlloyDBAdminConnection::UpdateCluster"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateCluster(request)); } @@ -75,7 +75,7 @@ AlloyDBAdminTracingConnection::DeleteCluster( google::cloud::alloydb::v1::DeleteClusterRequest const& request) { auto span = internal::MakeSpan("alloydb_v1::AlloyDBAdminConnection::DeleteCluster"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteCluster(request)); } @@ -84,7 +84,7 @@ AlloyDBAdminTracingConnection::PromoteCluster( google::cloud::alloydb::v1::PromoteClusterRequest const& request) { auto span = internal::MakeSpan("alloydb_v1::AlloyDBAdminConnection::PromoteCluster"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PromoteCluster(request)); } @@ -93,7 +93,7 @@ AlloyDBAdminTracingConnection::RestoreCluster( google::cloud::alloydb::v1::RestoreClusterRequest const& request) { auto span = internal::MakeSpan("alloydb_v1::AlloyDBAdminConnection::RestoreCluster"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RestoreCluster(request)); } @@ -102,7 +102,7 @@ AlloyDBAdminTracingConnection::CreateSecondaryCluster( google::cloud::alloydb::v1::CreateSecondaryClusterRequest const& request) { auto span = internal::MakeSpan( "alloydb_v1::AlloyDBAdminConnection::CreateSecondaryCluster"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateSecondaryCluster(request)); } @@ -112,7 +112,7 @@ AlloyDBAdminTracingConnection::ListInstances( google::cloud::alloydb::v1::ListInstancesRequest request) { auto span = internal::MakeSpan("alloydb_v1::AlloyDBAdminConnection::ListInstances"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListInstances(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -132,7 +132,7 @@ AlloyDBAdminTracingConnection::CreateInstance( google::cloud::alloydb::v1::CreateInstanceRequest const& request) { auto span = internal::MakeSpan("alloydb_v1::AlloyDBAdminConnection::CreateInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateInstance(request)); } @@ -141,7 +141,7 @@ AlloyDBAdminTracingConnection::CreateSecondaryInstance( google::cloud::alloydb::v1::CreateSecondaryInstanceRequest const& request) { auto span = internal::MakeSpan( "alloydb_v1::AlloyDBAdminConnection::CreateSecondaryInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateSecondaryInstance(request)); } @@ -151,7 +151,7 @@ AlloyDBAdminTracingConnection::BatchCreateInstances( google::cloud::alloydb::v1::BatchCreateInstancesRequest const& request) { auto span = internal::MakeSpan( "alloydb_v1::AlloyDBAdminConnection::BatchCreateInstances"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->BatchCreateInstances(request)); } @@ -161,7 +161,7 @@ AlloyDBAdminTracingConnection::UpdateInstance( google::cloud::alloydb::v1::UpdateInstanceRequest const& request) { auto span = internal::MakeSpan("alloydb_v1::AlloyDBAdminConnection::UpdateInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateInstance(request)); } @@ -170,7 +170,7 @@ AlloyDBAdminTracingConnection::DeleteInstance( google::cloud::alloydb::v1::DeleteInstanceRequest const& request) { auto span = internal::MakeSpan("alloydb_v1::AlloyDBAdminConnection::DeleteInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteInstance(request)); } @@ -179,7 +179,7 @@ AlloyDBAdminTracingConnection::FailoverInstance( google::cloud::alloydb::v1::FailoverInstanceRequest const& request) { auto span = internal::MakeSpan( "alloydb_v1::AlloyDBAdminConnection::FailoverInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->FailoverInstance(request)); } @@ -188,7 +188,7 @@ AlloyDBAdminTracingConnection::InjectFault( google::cloud::alloydb::v1::InjectFaultRequest const& request) { auto span = internal::MakeSpan("alloydb_v1::AlloyDBAdminConnection::InjectFault"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InjectFault(request)); } @@ -197,7 +197,7 @@ AlloyDBAdminTracingConnection::RestartInstance( google::cloud::alloydb::v1::RestartInstanceRequest const& request) { auto span = internal::MakeSpan("alloydb_v1::AlloyDBAdminConnection::RestartInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RestartInstance(request)); } @@ -206,7 +206,7 @@ AlloyDBAdminTracingConnection::ListBackups( google::cloud::alloydb::v1::ListBackupsRequest request) { auto span = internal::MakeSpan("alloydb_v1::AlloyDBAdminConnection::ListBackups"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListBackups(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -226,7 +226,7 @@ AlloyDBAdminTracingConnection::CreateBackup( google::cloud::alloydb::v1::CreateBackupRequest const& request) { auto span = internal::MakeSpan("alloydb_v1::AlloyDBAdminConnection::CreateBackup"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateBackup(request)); } @@ -235,7 +235,7 @@ AlloyDBAdminTracingConnection::UpdateBackup( google::cloud::alloydb::v1::UpdateBackupRequest const& request) { auto span = internal::MakeSpan("alloydb_v1::AlloyDBAdminConnection::UpdateBackup"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateBackup(request)); } @@ -244,7 +244,7 @@ AlloyDBAdminTracingConnection::DeleteBackup( google::cloud::alloydb::v1::DeleteBackupRequest const& request) { auto span = internal::MakeSpan("alloydb_v1::AlloyDBAdminConnection::DeleteBackup"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteBackup(request)); } @@ -253,7 +253,7 @@ AlloyDBAdminTracingConnection::ListSupportedDatabaseFlags( google::cloud::alloydb::v1::ListSupportedDatabaseFlagsRequest request) { auto span = internal::MakeSpan( "alloydb_v1::AlloyDBAdminConnection::ListSupportedDatabaseFlags"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListSupportedDatabaseFlags(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::alloydb::v1::SupportedDatabaseFlag>(std::move(span), @@ -284,7 +284,7 @@ AlloyDBAdminTracingConnection::ListUsers( google::cloud::alloydb::v1::ListUsersRequest request) { auto span = internal::MakeSpan("alloydb_v1::AlloyDBAdminConnection::ListUsers"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListUsers(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); diff --git a/google/cloud/alloydb/v1/internal/alloy_db_admin_tracing_stub.cc b/google/cloud/alloydb/v1/internal/alloy_db_admin_tracing_stub.cc index f4976ba87adc..c29a1b49a292 100644 --- a/google/cloud/alloydb/v1/internal/alloy_db_admin_tracing_stub.cc +++ b/google/cloud/alloydb/v1/internal/alloy_db_admin_tracing_stub.cc @@ -61,10 +61,8 @@ AlloyDBAdminTracingStub::AsyncCreateCluster( google::cloud::alloydb::v1::CreateClusterRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.alloydb.v1.AlloyDBAdmin", "CreateCluster"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateCluster(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -76,10 +74,8 @@ AlloyDBAdminTracingStub::AsyncUpdateCluster( google::cloud::alloydb::v1::UpdateClusterRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.alloydb.v1.AlloyDBAdmin", "UpdateCluster"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateCluster(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -91,10 +87,8 @@ AlloyDBAdminTracingStub::AsyncDeleteCluster( google::cloud::alloydb::v1::DeleteClusterRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.alloydb.v1.AlloyDBAdmin", "DeleteCluster"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteCluster(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -106,10 +100,8 @@ AlloyDBAdminTracingStub::AsyncPromoteCluster( google::cloud::alloydb::v1::PromoteClusterRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.alloydb.v1.AlloyDBAdmin", "PromoteCluster"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncPromoteCluster(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -121,10 +113,8 @@ AlloyDBAdminTracingStub::AsyncRestoreCluster( google::cloud::alloydb::v1::RestoreClusterRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.alloydb.v1.AlloyDBAdmin", "RestoreCluster"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncRestoreCluster(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -136,10 +126,8 @@ AlloyDBAdminTracingStub::AsyncCreateSecondaryCluster( google::cloud::alloydb::v1::CreateSecondaryClusterRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.alloydb.v1.AlloyDBAdmin", "CreateSecondaryCluster"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateSecondaryCluster(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -175,10 +163,8 @@ AlloyDBAdminTracingStub::AsyncCreateInstance( google::cloud::alloydb::v1::CreateInstanceRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.alloydb.v1.AlloyDBAdmin", "CreateInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -190,10 +176,8 @@ AlloyDBAdminTracingStub::AsyncCreateSecondaryInstance( google::cloud::alloydb::v1::CreateSecondaryInstanceRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.alloydb.v1.AlloyDBAdmin", "CreateSecondaryInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateSecondaryInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -205,10 +189,8 @@ AlloyDBAdminTracingStub::AsyncBatchCreateInstances( google::cloud::alloydb::v1::BatchCreateInstancesRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.alloydb.v1.AlloyDBAdmin", "BatchCreateInstances"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncBatchCreateInstances(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -220,10 +202,8 @@ AlloyDBAdminTracingStub::AsyncUpdateInstance( google::cloud::alloydb::v1::UpdateInstanceRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.alloydb.v1.AlloyDBAdmin", "UpdateInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -235,10 +215,8 @@ AlloyDBAdminTracingStub::AsyncDeleteInstance( google::cloud::alloydb::v1::DeleteInstanceRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.alloydb.v1.AlloyDBAdmin", "DeleteInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -250,10 +228,8 @@ AlloyDBAdminTracingStub::AsyncFailoverInstance( google::cloud::alloydb::v1::FailoverInstanceRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.alloydb.v1.AlloyDBAdmin", "FailoverInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncFailoverInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -265,10 +241,8 @@ AlloyDBAdminTracingStub::AsyncInjectFault( google::cloud::alloydb::v1::InjectFaultRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.alloydb.v1.AlloyDBAdmin", "InjectFault"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncInjectFault(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -280,10 +254,8 @@ AlloyDBAdminTracingStub::AsyncRestartInstance( google::cloud::alloydb::v1::RestartInstanceRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.alloydb.v1.AlloyDBAdmin", "RestartInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncRestartInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -317,10 +289,8 @@ AlloyDBAdminTracingStub::AsyncCreateBackup( google::cloud::alloydb::v1::CreateBackupRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.alloydb.v1.AlloyDBAdmin", "CreateBackup"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateBackup(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -332,10 +302,8 @@ AlloyDBAdminTracingStub::AsyncUpdateBackup( google::cloud::alloydb::v1::UpdateBackupRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.alloydb.v1.AlloyDBAdmin", "UpdateBackup"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateBackup(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -347,10 +315,8 @@ AlloyDBAdminTracingStub::AsyncDeleteBackup( google::cloud::alloydb::v1::DeleteBackupRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.alloydb.v1.AlloyDBAdmin", "DeleteBackup"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteBackup(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -454,10 +420,8 @@ AlloyDBAdminTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -468,10 +432,8 @@ future AlloyDBAdminTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/apigateway/v1/internal/api_gateway_tracing_connection.cc b/google/cloud/apigateway/v1/internal/api_gateway_tracing_connection.cc index bd4a9eebe7f8..3c836118dfb8 100644 --- a/google/cloud/apigateway/v1/internal/api_gateway_tracing_connection.cc +++ b/google/cloud/apigateway/v1/internal/api_gateway_tracing_connection.cc @@ -37,7 +37,7 @@ ApiGatewayServiceTracingConnection::ListGateways( google::cloud::apigateway::v1::ListGatewaysRequest request) { auto span = internal::MakeSpan( "apigateway_v1::ApiGatewayServiceConnection::ListGateways"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListGateways(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::apigateway::v1::Gateway>(std::move(span), std::move(sr)); @@ -57,7 +57,7 @@ ApiGatewayServiceTracingConnection::CreateGateway( google::cloud::apigateway::v1::CreateGatewayRequest const& request) { auto span = internal::MakeSpan( "apigateway_v1::ApiGatewayServiceConnection::CreateGateway"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateGateway(request)); } @@ -66,7 +66,7 @@ ApiGatewayServiceTracingConnection::UpdateGateway( google::cloud::apigateway::v1::UpdateGatewayRequest const& request) { auto span = internal::MakeSpan( "apigateway_v1::ApiGatewayServiceConnection::UpdateGateway"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateGateway(request)); } @@ -75,7 +75,7 @@ ApiGatewayServiceTracingConnection::DeleteGateway( google::cloud::apigateway::v1::DeleteGatewayRequest const& request) { auto span = internal::MakeSpan( "apigateway_v1::ApiGatewayServiceConnection::DeleteGateway"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteGateway(request)); } @@ -84,7 +84,7 @@ ApiGatewayServiceTracingConnection::ListApis( google::cloud::apigateway::v1::ListApisRequest request) { auto span = internal::MakeSpan( "apigateway_v1::ApiGatewayServiceConnection::ListApis"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListApis(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -104,7 +104,7 @@ ApiGatewayServiceTracingConnection::CreateApi( google::cloud::apigateway::v1::CreateApiRequest const& request) { auto span = internal::MakeSpan( "apigateway_v1::ApiGatewayServiceConnection::CreateApi"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateApi(request)); } @@ -113,7 +113,7 @@ ApiGatewayServiceTracingConnection::UpdateApi( google::cloud::apigateway::v1::UpdateApiRequest const& request) { auto span = internal::MakeSpan( "apigateway_v1::ApiGatewayServiceConnection::UpdateApi"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateApi(request)); } @@ -122,7 +122,7 @@ ApiGatewayServiceTracingConnection::DeleteApi( google::cloud::apigateway::v1::DeleteApiRequest const& request) { auto span = internal::MakeSpan( "apigateway_v1::ApiGatewayServiceConnection::DeleteApi"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteApi(request)); } @@ -131,7 +131,7 @@ ApiGatewayServiceTracingConnection::ListApiConfigs( google::cloud::apigateway::v1::ListApiConfigsRequest request) { auto span = internal::MakeSpan( "apigateway_v1::ApiGatewayServiceConnection::ListApiConfigs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListApiConfigs(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::apigateway::v1::ApiConfig>(std::move(span), std::move(sr)); @@ -151,7 +151,7 @@ ApiGatewayServiceTracingConnection::CreateApiConfig( google::cloud::apigateway::v1::CreateApiConfigRequest const& request) { auto span = internal::MakeSpan( "apigateway_v1::ApiGatewayServiceConnection::CreateApiConfig"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateApiConfig(request)); } @@ -160,7 +160,7 @@ ApiGatewayServiceTracingConnection::UpdateApiConfig( google::cloud::apigateway::v1::UpdateApiConfigRequest const& request) { auto span = internal::MakeSpan( "apigateway_v1::ApiGatewayServiceConnection::UpdateApiConfig"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateApiConfig(request)); } @@ -169,7 +169,7 @@ ApiGatewayServiceTracingConnection::DeleteApiConfig( google::cloud::apigateway::v1::DeleteApiConfigRequest const& request) { auto span = internal::MakeSpan( "apigateway_v1::ApiGatewayServiceConnection::DeleteApiConfig"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteApiConfig(request)); } diff --git a/google/cloud/apigateway/v1/internal/api_gateway_tracing_stub.cc b/google/cloud/apigateway/v1/internal/api_gateway_tracing_stub.cc index d946b13145c7..180bb836133d 100644 --- a/google/cloud/apigateway/v1/internal/api_gateway_tracing_stub.cc +++ b/google/cloud/apigateway/v1/internal/api_gateway_tracing_stub.cc @@ -61,10 +61,8 @@ ApiGatewayServiceTracingStub::AsyncCreateGateway( google::cloud::apigateway::v1::CreateGatewayRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.apigateway.v1.ApiGatewayService", "CreateGateway"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateGateway(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -76,10 +74,8 @@ ApiGatewayServiceTracingStub::AsyncUpdateGateway( google::cloud::apigateway::v1::UpdateGatewayRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.apigateway.v1.ApiGatewayService", "UpdateGateway"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateGateway(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -91,10 +87,8 @@ ApiGatewayServiceTracingStub::AsyncDeleteGateway( google::cloud::apigateway::v1::DeleteGatewayRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.apigateway.v1.ApiGatewayService", "DeleteGateway"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteGateway(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -128,10 +122,8 @@ ApiGatewayServiceTracingStub::AsyncCreateApi( google::cloud::apigateway::v1::CreateApiRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.apigateway.v1.ApiGatewayService", "CreateApi"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateApi(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -143,10 +135,8 @@ ApiGatewayServiceTracingStub::AsyncUpdateApi( google::cloud::apigateway::v1::UpdateApiRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.apigateway.v1.ApiGatewayService", "UpdateApi"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateApi(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -158,10 +148,8 @@ ApiGatewayServiceTracingStub::AsyncDeleteApi( google::cloud::apigateway::v1::DeleteApiRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.apigateway.v1.ApiGatewayService", "DeleteApi"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteApi(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -197,10 +185,8 @@ ApiGatewayServiceTracingStub::AsyncCreateApiConfig( google::cloud::apigateway::v1::CreateApiConfigRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.apigateway.v1.ApiGatewayService", "CreateApiConfig"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateApiConfig(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -212,10 +198,8 @@ ApiGatewayServiceTracingStub::AsyncUpdateApiConfig( google::cloud::apigateway::v1::UpdateApiConfigRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.apigateway.v1.ApiGatewayService", "UpdateApiConfig"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateApiConfig(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -227,10 +211,8 @@ ApiGatewayServiceTracingStub::AsyncDeleteApiConfig( google::cloud::apigateway::v1::DeleteApiConfigRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.apigateway.v1.ApiGatewayService", "DeleteApiConfig"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteApiConfig(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -242,10 +224,8 @@ ApiGatewayServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -256,10 +236,8 @@ future ApiGatewayServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/apigeeconnect/v1/internal/connection_tracing_connection.cc b/google/cloud/apigeeconnect/v1/internal/connection_tracing_connection.cc index 8d38f6f2247a..50787465ecf2 100644 --- a/google/cloud/apigeeconnect/v1/internal/connection_tracing_connection.cc +++ b/google/cloud/apigeeconnect/v1/internal/connection_tracing_connection.cc @@ -37,7 +37,7 @@ ConnectionServiceTracingConnection::ListConnections( google::cloud::apigeeconnect::v1::ListConnectionsRequest request) { auto span = internal::MakeSpan( "apigeeconnect_v1::ConnectionServiceConnection::ListConnections"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListConnections(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::apigeeconnect::v1::Connection>(std::move(span), diff --git a/google/cloud/apikeys/v2/internal/api_keys_tracing_connection.cc b/google/cloud/apikeys/v2/internal/api_keys_tracing_connection.cc index a9e3b55b7f0b..f8bc4e1309ae 100644 --- a/google/cloud/apikeys/v2/internal/api_keys_tracing_connection.cc +++ b/google/cloud/apikeys/v2/internal/api_keys_tracing_connection.cc @@ -36,14 +36,14 @@ future> ApiKeysTracingConnection::CreateKey( google::api::apikeys::v2::CreateKeyRequest const& request) { auto span = internal::MakeSpan("apikeys_v2::ApiKeysConnection::CreateKey"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateKey(request)); } StreamRange ApiKeysTracingConnection::ListKeys( google::api::apikeys::v2::ListKeysRequest request) { auto span = internal::MakeSpan("apikeys_v2::ApiKeysConnection::ListKeys"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListKeys(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -68,7 +68,7 @@ future> ApiKeysTracingConnection::UpdateKey( google::api::apikeys::v2::UpdateKeyRequest const& request) { auto span = internal::MakeSpan("apikeys_v2::ApiKeysConnection::UpdateKey"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateKey(request)); } @@ -76,7 +76,7 @@ future> ApiKeysTracingConnection::DeleteKey( google::api::apikeys::v2::DeleteKeyRequest const& request) { auto span = internal::MakeSpan("apikeys_v2::ApiKeysConnection::DeleteKey"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteKey(request)); } @@ -84,7 +84,7 @@ future> ApiKeysTracingConnection::UndeleteKey( google::api::apikeys::v2::UndeleteKeyRequest const& request) { auto span = internal::MakeSpan("apikeys_v2::ApiKeysConnection::UndeleteKey"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UndeleteKey(request)); } diff --git a/google/cloud/apikeys/v2/internal/api_keys_tracing_stub.cc b/google/cloud/apikeys/v2/internal/api_keys_tracing_stub.cc index 536fc4b4a1a0..dcfde30021c9 100644 --- a/google/cloud/apikeys/v2/internal/api_keys_tracing_stub.cc +++ b/google/cloud/apikeys/v2/internal/api_keys_tracing_stub.cc @@ -36,10 +36,8 @@ ApiKeysTracingStub::AsyncCreateKey( google::api::apikeys::v2::CreateKeyRequest const& request) { auto span = internal::MakeSpanGrpc("google.api.apikeys.v2.ApiKeys", "CreateKey"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateKey(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -83,10 +81,8 @@ ApiKeysTracingStub::AsyncUpdateKey( google::api::apikeys::v2::UpdateKeyRequest const& request) { auto span = internal::MakeSpanGrpc("google.api.apikeys.v2.ApiKeys", "UpdateKey"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateKey(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -98,10 +94,8 @@ ApiKeysTracingStub::AsyncDeleteKey( google::api::apikeys::v2::DeleteKeyRequest const& request) { auto span = internal::MakeSpanGrpc("google.api.apikeys.v2.ApiKeys", "DeleteKey"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteKey(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -113,10 +107,8 @@ ApiKeysTracingStub::AsyncUndeleteKey( google::api::apikeys::v2::UndeleteKeyRequest const& request) { auto span = internal::MakeSpanGrpc("google.api.apikeys.v2.ApiKeys", "UndeleteKey"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUndeleteKey(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -139,10 +131,8 @@ ApiKeysTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -153,10 +143,8 @@ future ApiKeysTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/appengine/v1/internal/applications_tracing_connection.cc b/google/cloud/appengine/v1/internal/applications_tracing_connection.cc index 5675595f00e7..29d91215dd0a 100644 --- a/google/cloud/appengine/v1/internal/applications_tracing_connection.cc +++ b/google/cloud/appengine/v1/internal/applications_tracing_connection.cc @@ -45,7 +45,7 @@ ApplicationsTracingConnection::CreateApplication( google::appengine::v1::CreateApplicationRequest const& request) { auto span = internal::MakeSpan( "appengine_v1::ApplicationsConnection::CreateApplication"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateApplication(request)); } @@ -54,7 +54,7 @@ ApplicationsTracingConnection::UpdateApplication( google::appengine::v1::UpdateApplicationRequest const& request) { auto span = internal::MakeSpan( "appengine_v1::ApplicationsConnection::UpdateApplication"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateApplication(request)); } @@ -63,7 +63,7 @@ ApplicationsTracingConnection::RepairApplication( google::appengine::v1::RepairApplicationRequest const& request) { auto span = internal::MakeSpan( "appengine_v1::ApplicationsConnection::RepairApplication"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RepairApplication(request)); } diff --git a/google/cloud/appengine/v1/internal/applications_tracing_stub.cc b/google/cloud/appengine/v1/internal/applications_tracing_stub.cc index 9221115fa722..e536aa6a71fb 100644 --- a/google/cloud/appengine/v1/internal/applications_tracing_stub.cc +++ b/google/cloud/appengine/v1/internal/applications_tracing_stub.cc @@ -49,10 +49,8 @@ ApplicationsTracingStub::AsyncCreateApplication( google::appengine::v1::CreateApplicationRequest const& request) { auto span = internal::MakeSpanGrpc("google.appengine.v1.Applications", "CreateApplication"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateApplication(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -64,10 +62,8 @@ ApplicationsTracingStub::AsyncUpdateApplication( google::appengine::v1::UpdateApplicationRequest const& request) { auto span = internal::MakeSpanGrpc("google.appengine.v1.Applications", "UpdateApplication"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateApplication(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -79,10 +75,8 @@ ApplicationsTracingStub::AsyncRepairApplication( google::appengine::v1::RepairApplicationRequest const& request) { auto span = internal::MakeSpanGrpc("google.appengine.v1.Applications", "RepairApplication"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncRepairApplication(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -94,10 +88,8 @@ ApplicationsTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -108,10 +100,8 @@ future ApplicationsTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/appengine/v1/internal/authorized_certificates_tracing_connection.cc b/google/cloud/appengine/v1/internal/authorized_certificates_tracing_connection.cc index 335dcf00f0d2..65246d2adee3 100644 --- a/google/cloud/appengine/v1/internal/authorized_certificates_tracing_connection.cc +++ b/google/cloud/appengine/v1/internal/authorized_certificates_tracing_connection.cc @@ -39,7 +39,7 @@ AuthorizedCertificatesTracingConnection::ListAuthorizedCertificates( auto span = internal::MakeSpan( "appengine_v1::AuthorizedCertificatesConnection::" "ListAuthorizedCertificates"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListAuthorizedCertificates(std::move(request)); return internal::MakeTracedStreamRange< google::appengine::v1::AuthorizedCertificate>(std::move(span), diff --git a/google/cloud/appengine/v1/internal/authorized_domains_tracing_connection.cc b/google/cloud/appengine/v1/internal/authorized_domains_tracing_connection.cc index ff07118785f5..37790bec8b7b 100644 --- a/google/cloud/appengine/v1/internal/authorized_domains_tracing_connection.cc +++ b/google/cloud/appengine/v1/internal/authorized_domains_tracing_connection.cc @@ -37,7 +37,7 @@ AuthorizedDomainsTracingConnection::ListAuthorizedDomains( google::appengine::v1::ListAuthorizedDomainsRequest request) { auto span = internal::MakeSpan( "appengine_v1::AuthorizedDomainsConnection::ListAuthorizedDomains"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListAuthorizedDomains(std::move(request)); return internal::MakeTracedStreamRange< google::appengine::v1::AuthorizedDomain>(std::move(span), std::move(sr)); diff --git a/google/cloud/appengine/v1/internal/domain_mappings_tracing_connection.cc b/google/cloud/appengine/v1/internal/domain_mappings_tracing_connection.cc index 0cb4c6e78bb3..7da21a3ce2f8 100644 --- a/google/cloud/appengine/v1/internal/domain_mappings_tracing_connection.cc +++ b/google/cloud/appengine/v1/internal/domain_mappings_tracing_connection.cc @@ -37,7 +37,7 @@ DomainMappingsTracingConnection::ListDomainMappings( google::appengine::v1::ListDomainMappingsRequest request) { auto span = internal::MakeSpan( "appengine_v1::DomainMappingsConnection::ListDomainMappings"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListDomainMappings(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -57,7 +57,7 @@ DomainMappingsTracingConnection::CreateDomainMapping( google::appengine::v1::CreateDomainMappingRequest const& request) { auto span = internal::MakeSpan( "appengine_v1::DomainMappingsConnection::CreateDomainMapping"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateDomainMapping(request)); } @@ -67,7 +67,7 @@ DomainMappingsTracingConnection::UpdateDomainMapping( google::appengine::v1::UpdateDomainMappingRequest const& request) { auto span = internal::MakeSpan( "appengine_v1::DomainMappingsConnection::UpdateDomainMapping"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateDomainMapping(request)); } @@ -77,7 +77,7 @@ DomainMappingsTracingConnection::DeleteDomainMapping( google::appengine::v1::DeleteDomainMappingRequest const& request) { auto span = internal::MakeSpan( "appengine_v1::DomainMappingsConnection::DeleteDomainMapping"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteDomainMapping(request)); } diff --git a/google/cloud/appengine/v1/internal/domain_mappings_tracing_stub.cc b/google/cloud/appengine/v1/internal/domain_mappings_tracing_stub.cc index 7ac17436be53..7865df0720ea 100644 --- a/google/cloud/appengine/v1/internal/domain_mappings_tracing_stub.cc +++ b/google/cloud/appengine/v1/internal/domain_mappings_tracing_stub.cc @@ -61,10 +61,8 @@ DomainMappingsTracingStub::AsyncCreateDomainMapping( google::appengine::v1::CreateDomainMappingRequest const& request) { auto span = internal::MakeSpanGrpc("google.appengine.v1.DomainMappings", "CreateDomainMapping"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateDomainMapping(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -76,10 +74,8 @@ DomainMappingsTracingStub::AsyncUpdateDomainMapping( google::appengine::v1::UpdateDomainMappingRequest const& request) { auto span = internal::MakeSpanGrpc("google.appengine.v1.DomainMappings", "UpdateDomainMapping"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateDomainMapping(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -91,10 +87,8 @@ DomainMappingsTracingStub::AsyncDeleteDomainMapping( google::appengine::v1::DeleteDomainMappingRequest const& request) { auto span = internal::MakeSpanGrpc("google.appengine.v1.DomainMappings", "DeleteDomainMapping"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteDomainMapping(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -106,10 +100,8 @@ DomainMappingsTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -120,10 +112,8 @@ future DomainMappingsTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/appengine/v1/internal/firewall_tracing_connection.cc b/google/cloud/appengine/v1/internal/firewall_tracing_connection.cc index ab1a03946678..10dcfb7ba87b 100644 --- a/google/cloud/appengine/v1/internal/firewall_tracing_connection.cc +++ b/google/cloud/appengine/v1/internal/firewall_tracing_connection.cc @@ -37,7 +37,7 @@ FirewallTracingConnection::ListIngressRules( google::appengine::v1::ListIngressRulesRequest request) { auto span = internal::MakeSpan("appengine_v1::FirewallConnection::ListIngressRules"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListIngressRules(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); diff --git a/google/cloud/appengine/v1/internal/instances_tracing_connection.cc b/google/cloud/appengine/v1/internal/instances_tracing_connection.cc index adc092100c55..607606814809 100644 --- a/google/cloud/appengine/v1/internal/instances_tracing_connection.cc +++ b/google/cloud/appengine/v1/internal/instances_tracing_connection.cc @@ -37,7 +37,7 @@ InstancesTracingConnection::ListInstances( google::appengine::v1::ListInstancesRequest request) { auto span = internal::MakeSpan("appengine_v1::InstancesConnection::ListInstances"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListInstances(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -57,7 +57,7 @@ InstancesTracingConnection::DeleteInstance( google::appengine::v1::DeleteInstanceRequest const& request) { auto span = internal::MakeSpan("appengine_v1::InstancesConnection::DeleteInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteInstance(request)); } @@ -66,7 +66,7 @@ InstancesTracingConnection::DebugInstance( google::appengine::v1::DebugInstanceRequest const& request) { auto span = internal::MakeSpan("appengine_v1::InstancesConnection::DebugInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DebugInstance(request)); } diff --git a/google/cloud/appengine/v1/internal/instances_tracing_stub.cc b/google/cloud/appengine/v1/internal/instances_tracing_stub.cc index 7223fcb01106..7b7851b6ed17 100644 --- a/google/cloud/appengine/v1/internal/instances_tracing_stub.cc +++ b/google/cloud/appengine/v1/internal/instances_tracing_stub.cc @@ -59,10 +59,8 @@ InstancesTracingStub::AsyncDeleteInstance( google::appengine::v1::DeleteInstanceRequest const& request) { auto span = internal::MakeSpanGrpc("google.appengine.v1.Instances", "DeleteInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -74,10 +72,8 @@ InstancesTracingStub::AsyncDebugInstance( google::appengine::v1::DebugInstanceRequest const& request) { auto span = internal::MakeSpanGrpc("google.appengine.v1.Instances", "DebugInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDebugInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -89,10 +85,8 @@ InstancesTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -103,10 +97,8 @@ future InstancesTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/appengine/v1/internal/services_tracing_connection.cc b/google/cloud/appengine/v1/internal/services_tracing_connection.cc index d9055c6e8f0a..fb0a957a288b 100644 --- a/google/cloud/appengine/v1/internal/services_tracing_connection.cc +++ b/google/cloud/appengine/v1/internal/services_tracing_connection.cc @@ -37,7 +37,7 @@ ServicesTracingConnection::ListServices( google::appengine::v1::ListServicesRequest request) { auto span = internal::MakeSpan("appengine_v1::ServicesConnection::ListServices"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListServices(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -56,7 +56,7 @@ ServicesTracingConnection::UpdateService( google::appengine::v1::UpdateServiceRequest const& request) { auto span = internal::MakeSpan("appengine_v1::ServicesConnection::UpdateService"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateService(request)); } @@ -65,7 +65,7 @@ ServicesTracingConnection::DeleteService( google::appengine::v1::DeleteServiceRequest const& request) { auto span = internal::MakeSpan("appengine_v1::ServicesConnection::DeleteService"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteService(request)); } diff --git a/google/cloud/appengine/v1/internal/services_tracing_stub.cc b/google/cloud/appengine/v1/internal/services_tracing_stub.cc index b08028189fec..aedfdfd03d2a 100644 --- a/google/cloud/appengine/v1/internal/services_tracing_stub.cc +++ b/google/cloud/appengine/v1/internal/services_tracing_stub.cc @@ -59,10 +59,8 @@ ServicesTracingStub::AsyncUpdateService( google::appengine::v1::UpdateServiceRequest const& request) { auto span = internal::MakeSpanGrpc("google.appengine.v1.Services", "UpdateService"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateService(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -74,10 +72,8 @@ ServicesTracingStub::AsyncDeleteService( google::appengine::v1::DeleteServiceRequest const& request) { auto span = internal::MakeSpanGrpc("google.appengine.v1.Services", "DeleteService"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteService(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -89,10 +85,8 @@ ServicesTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -103,10 +97,8 @@ future ServicesTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/appengine/v1/internal/versions_tracing_connection.cc b/google/cloud/appengine/v1/internal/versions_tracing_connection.cc index 358f036ce7ca..b42269403328 100644 --- a/google/cloud/appengine/v1/internal/versions_tracing_connection.cc +++ b/google/cloud/appengine/v1/internal/versions_tracing_connection.cc @@ -37,7 +37,7 @@ VersionsTracingConnection::ListVersions( google::appengine::v1::ListVersionsRequest request) { auto span = internal::MakeSpan("appengine_v1::VersionsConnection::ListVersions"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListVersions(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -56,7 +56,7 @@ VersionsTracingConnection::CreateVersion( google::appengine::v1::CreateVersionRequest const& request) { auto span = internal::MakeSpan("appengine_v1::VersionsConnection::CreateVersion"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateVersion(request)); } @@ -65,7 +65,7 @@ VersionsTracingConnection::UpdateVersion( google::appengine::v1::UpdateVersionRequest const& request) { auto span = internal::MakeSpan("appengine_v1::VersionsConnection::UpdateVersion"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateVersion(request)); } @@ -74,7 +74,7 @@ VersionsTracingConnection::DeleteVersion( google::appengine::v1::DeleteVersionRequest const& request) { auto span = internal::MakeSpan("appengine_v1::VersionsConnection::DeleteVersion"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteVersion(request)); } diff --git a/google/cloud/appengine/v1/internal/versions_tracing_stub.cc b/google/cloud/appengine/v1/internal/versions_tracing_stub.cc index cf8a1a8bcb0c..454af76a0fe2 100644 --- a/google/cloud/appengine/v1/internal/versions_tracing_stub.cc +++ b/google/cloud/appengine/v1/internal/versions_tracing_stub.cc @@ -59,10 +59,8 @@ VersionsTracingStub::AsyncCreateVersion( google::appengine::v1::CreateVersionRequest const& request) { auto span = internal::MakeSpanGrpc("google.appengine.v1.Versions", "CreateVersion"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateVersion(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -74,10 +72,8 @@ VersionsTracingStub::AsyncUpdateVersion( google::appengine::v1::UpdateVersionRequest const& request) { auto span = internal::MakeSpanGrpc("google.appengine.v1.Versions", "UpdateVersion"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateVersion(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -89,10 +85,8 @@ VersionsTracingStub::AsyncDeleteVersion( google::appengine::v1::DeleteVersionRequest const& request) { auto span = internal::MakeSpanGrpc("google.appengine.v1.Versions", "DeleteVersion"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteVersion(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -104,10 +98,8 @@ VersionsTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -118,10 +110,8 @@ future VersionsTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/artifactregistry/v1/internal/artifact_registry_tracing_connection.cc b/google/cloud/artifactregistry/v1/internal/artifact_registry_tracing_connection.cc index 0134073d643b..e599b64ceaf7 100644 --- a/google/cloud/artifactregistry/v1/internal/artifact_registry_tracing_connection.cc +++ b/google/cloud/artifactregistry/v1/internal/artifact_registry_tracing_connection.cc @@ -37,7 +37,7 @@ ArtifactRegistryTracingConnection::ListDockerImages( google::devtools::artifactregistry::v1::ListDockerImagesRequest request) { auto span = internal::MakeSpan( "artifactregistry_v1::ArtifactRegistryConnection::ListDockerImages"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListDockerImages(std::move(request)); return internal::MakeTracedStreamRange< google::devtools::artifactregistry::v1::DockerImage>(std::move(span), @@ -59,7 +59,7 @@ ArtifactRegistryTracingConnection::ListMavenArtifacts( google::devtools::artifactregistry::v1::ListMavenArtifactsRequest request) { auto span = internal::MakeSpan( "artifactregistry_v1::ArtifactRegistryConnection::ListMavenArtifacts"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListMavenArtifacts(std::move(request)); return internal::MakeTracedStreamRange< google::devtools::artifactregistry::v1::MavenArtifact>(std::move(span), @@ -81,7 +81,7 @@ ArtifactRegistryTracingConnection::ListNpmPackages( google::devtools::artifactregistry::v1::ListNpmPackagesRequest request) { auto span = internal::MakeSpan( "artifactregistry_v1::ArtifactRegistryConnection::ListNpmPackages"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListNpmPackages(std::move(request)); return internal::MakeTracedStreamRange< google::devtools::artifactregistry::v1::NpmPackage>(std::move(span), @@ -103,7 +103,7 @@ ArtifactRegistryTracingConnection::ListPythonPackages( google::devtools::artifactregistry::v1::ListPythonPackagesRequest request) { auto span = internal::MakeSpan( "artifactregistry_v1::ArtifactRegistryConnection::ListPythonPackages"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListPythonPackages(std::move(request)); return internal::MakeTracedStreamRange< google::devtools::artifactregistry::v1::PythonPackage>(std::move(span), @@ -127,7 +127,7 @@ ArtifactRegistryTracingConnection::ImportAptArtifacts( request) { auto span = internal::MakeSpan( "artifactregistry_v1::ArtifactRegistryConnection::ImportAptArtifacts"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ImportAptArtifacts(request)); } @@ -139,7 +139,7 @@ ArtifactRegistryTracingConnection::ImportYumArtifacts( request) { auto span = internal::MakeSpan( "artifactregistry_v1::ArtifactRegistryConnection::ImportYumArtifacts"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ImportYumArtifacts(request)); } @@ -149,7 +149,7 @@ ArtifactRegistryTracingConnection::ListRepositories( google::devtools::artifactregistry::v1::ListRepositoriesRequest request) { auto span = internal::MakeSpan( "artifactregistry_v1::ArtifactRegistryConnection::ListRepositories"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListRepositories(std::move(request)); return internal::MakeTracedStreamRange< google::devtools::artifactregistry::v1::Repository>(std::move(span), @@ -172,7 +172,7 @@ ArtifactRegistryTracingConnection::CreateRepository( request) { auto span = internal::MakeSpan( "artifactregistry_v1::ArtifactRegistryConnection::CreateRepository"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateRepository(request)); } @@ -192,7 +192,7 @@ ArtifactRegistryTracingConnection::DeleteRepository( request) { auto span = internal::MakeSpan( "artifactregistry_v1::ArtifactRegistryConnection::DeleteRepository"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteRepository(request)); } @@ -201,7 +201,7 @@ ArtifactRegistryTracingConnection::ListPackages( google::devtools::artifactregistry::v1::ListPackagesRequest request) { auto span = internal::MakeSpan( "artifactregistry_v1::ArtifactRegistryConnection::ListPackages"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListPackages(std::move(request)); return internal::MakeTracedStreamRange< google::devtools::artifactregistry::v1::Package>(std::move(span), @@ -223,7 +223,7 @@ ArtifactRegistryTracingConnection::DeletePackage( request) { auto span = internal::MakeSpan( "artifactregistry_v1::ArtifactRegistryConnection::DeletePackage"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeletePackage(request)); } @@ -232,7 +232,7 @@ ArtifactRegistryTracingConnection::ListVersions( google::devtools::artifactregistry::v1::ListVersionsRequest request) { auto span = internal::MakeSpan( "artifactregistry_v1::ArtifactRegistryConnection::ListVersions"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListVersions(std::move(request)); return internal::MakeTracedStreamRange< google::devtools::artifactregistry::v1::Version>(std::move(span), @@ -254,7 +254,7 @@ ArtifactRegistryTracingConnection::DeleteVersion( request) { auto span = internal::MakeSpan( "artifactregistry_v1::ArtifactRegistryConnection::DeleteVersion"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteVersion(request)); } @@ -263,7 +263,7 @@ ArtifactRegistryTracingConnection::ListFiles( google::devtools::artifactregistry::v1::ListFilesRequest request) { auto span = internal::MakeSpan( "artifactregistry_v1::ArtifactRegistryConnection::ListFiles"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListFiles(std::move(request)); return internal::MakeTracedStreamRange< google::devtools::artifactregistry::v1::File>(std::move(span), @@ -284,7 +284,7 @@ ArtifactRegistryTracingConnection::ListTags( google::devtools::artifactregistry::v1::ListTagsRequest request) { auto span = internal::MakeSpan( "artifactregistry_v1::ArtifactRegistryConnection::ListTags"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListTags(std::move(request)); return internal::MakeTracedStreamRange< google::devtools::artifactregistry::v1::Tag>(std::move(span), diff --git a/google/cloud/artifactregistry/v1/internal/artifact_registry_tracing_stub.cc b/google/cloud/artifactregistry/v1/internal/artifact_registry_tracing_stub.cc index 99f637800ccf..c9fe9b5cf02f 100644 --- a/google/cloud/artifactregistry/v1/internal/artifact_registry_tracing_stub.cc +++ b/google/cloud/artifactregistry/v1/internal/artifact_registry_tracing_stub.cc @@ -149,10 +149,8 @@ ArtifactRegistryTracingStub::AsyncImportAptArtifacts( auto span = internal::MakeSpanGrpc( "google.devtools.artifactregistry.v1.ArtifactRegistry", "ImportAptArtifacts"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncImportAptArtifacts(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -166,10 +164,8 @@ ArtifactRegistryTracingStub::AsyncImportYumArtifacts( auto span = internal::MakeSpanGrpc( "google.devtools.artifactregistry.v1.ArtifactRegistry", "ImportYumArtifacts"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncImportYumArtifacts(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -210,10 +206,8 @@ ArtifactRegistryTracingStub::AsyncCreateRepository( auto span = internal::MakeSpanGrpc( "google.devtools.artifactregistry.v1.ArtifactRegistry", "CreateRepository"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateRepository(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -241,10 +235,8 @@ ArtifactRegistryTracingStub::AsyncDeleteRepository( auto span = internal::MakeSpanGrpc( "google.devtools.artifactregistry.v1.ArtifactRegistry", "DeleteRepository"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteRepository(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -282,10 +274,8 @@ ArtifactRegistryTracingStub::AsyncDeletePackage( request) { auto span = internal::MakeSpanGrpc( "google.devtools.artifactregistry.v1.ArtifactRegistry", "DeletePackage"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeletePackage(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -323,10 +313,8 @@ ArtifactRegistryTracingStub::AsyncDeleteVersion( request) { auto span = internal::MakeSpanGrpc( "google.devtools.artifactregistry.v1.ArtifactRegistry", "DeleteVersion"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteVersion(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -504,10 +492,8 @@ ArtifactRegistryTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -518,10 +504,8 @@ future ArtifactRegistryTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/asset/v1/internal/asset_tracing_connection.cc b/google/cloud/asset/v1/internal/asset_tracing_connection.cc index 7da42ed4948f..8fe5fad54496 100644 --- a/google/cloud/asset/v1/internal/asset_tracing_connection.cc +++ b/google/cloud/asset/v1/internal/asset_tracing_connection.cc @@ -37,7 +37,7 @@ AssetServiceTracingConnection::ExportAssets( google::cloud::asset::v1::ExportAssetsRequest const& request) { auto span = internal::MakeSpan("asset_v1::AssetServiceConnection::ExportAssets"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ExportAssets(request)); } @@ -46,7 +46,7 @@ AssetServiceTracingConnection::ListAssets( google::cloud::asset::v1::ListAssetsRequest request) { auto span = internal::MakeSpan("asset_v1::AssetServiceConnection::ListAssets"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListAssets(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -107,7 +107,7 @@ AssetServiceTracingConnection::SearchAllResources( google::cloud::asset::v1::SearchAllResourcesRequest request) { auto span = internal::MakeSpan( "asset_v1::AssetServiceConnection::SearchAllResources"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->SearchAllResources(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::asset::v1::ResourceSearchResult>(std::move(span), @@ -119,7 +119,7 @@ AssetServiceTracingConnection::SearchAllIamPolicies( google::cloud::asset::v1::SearchAllIamPoliciesRequest request) { auto span = internal::MakeSpan( "asset_v1::AssetServiceConnection::SearchAllIamPolicies"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->SearchAllIamPolicies(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::asset::v1::IamPolicySearchResult>(std::move(span), @@ -141,7 +141,7 @@ AssetServiceTracingConnection::AnalyzeIamPolicyLongrunning( request) { auto span = internal::MakeSpan( "asset_v1::AssetServiceConnection::AnalyzeIamPolicyLongrunning"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->AnalyzeIamPolicyLongrunning(request)); } @@ -187,7 +187,7 @@ AssetServiceTracingConnection::ListSavedQueries( google::cloud::asset::v1::ListSavedQueriesRequest request) { auto span = internal::MakeSpan("asset_v1::AssetServiceConnection::ListSavedQueries"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListSavedQueries(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -227,7 +227,7 @@ AssetServiceTracingConnection::AnalyzeOrgPolicies( google::cloud::asset::v1::AnalyzeOrgPoliciesRequest request) { auto span = internal::MakeSpan( "asset_v1::AssetServiceConnection::AnalyzeOrgPolicies"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->AnalyzeOrgPolicies(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::asset::v1::AnalyzeOrgPoliciesResponse::OrgPolicyResult>( @@ -241,7 +241,7 @@ AssetServiceTracingConnection::AnalyzeOrgPolicyGovernedContainers( request) { auto span = internal::MakeSpan( "asset_v1::AssetServiceConnection::AnalyzeOrgPolicyGovernedContainers"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->AnalyzeOrgPolicyGovernedContainers(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::asset::v1::AnalyzeOrgPolicyGovernedContainersResponse:: @@ -254,7 +254,7 @@ AssetServiceTracingConnection::AnalyzeOrgPolicyGovernedAssets( google::cloud::asset::v1::AnalyzeOrgPolicyGovernedAssetsRequest request) { auto span = internal::MakeSpan( "asset_v1::AssetServiceConnection::AnalyzeOrgPolicyGovernedAssets"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->AnalyzeOrgPolicyGovernedAssets(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::asset::v1::AnalyzeOrgPolicyGovernedAssetsResponse:: diff --git a/google/cloud/asset/v1/internal/asset_tracing_stub.cc b/google/cloud/asset/v1/internal/asset_tracing_stub.cc index c586b5981cde..bc5b831f2512 100644 --- a/google/cloud/asset/v1/internal/asset_tracing_stub.cc +++ b/google/cloud/asset/v1/internal/asset_tracing_stub.cc @@ -37,10 +37,8 @@ AssetServiceTracingStub::AsyncExportAssets( google::cloud::asset::v1::ExportAssetsRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.asset.v1.AssetService", "ExportAssets"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncExportAssets(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -167,10 +165,8 @@ AssetServiceTracingStub::AsyncAnalyzeIamPolicyLongrunning( request) { auto span = internal::MakeSpanGrpc("google.cloud.asset.v1.AssetService", "AnalyzeIamPolicyLongrunning"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncAnalyzeIamPolicyLongrunning(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -317,10 +313,8 @@ AssetServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -331,10 +325,8 @@ future AssetServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/assuredworkloads/v1/internal/assured_workloads_tracing_connection.cc b/google/cloud/assuredworkloads/v1/internal/assured_workloads_tracing_connection.cc index d32326c1eca4..04b22c5a0939 100644 --- a/google/cloud/assuredworkloads/v1/internal/assured_workloads_tracing_connection.cc +++ b/google/cloud/assuredworkloads/v1/internal/assured_workloads_tracing_connection.cc @@ -39,7 +39,7 @@ AssuredWorkloadsServiceTracingConnection::CreateWorkload( google::cloud::assuredworkloads::v1::CreateWorkloadRequest const& request) { auto span = internal::MakeSpan( "assuredworkloads_v1::AssuredWorkloadsServiceConnection::CreateWorkload"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateWorkload(request)); } @@ -85,7 +85,7 @@ AssuredWorkloadsServiceTracingConnection::ListWorkloads( google::cloud::assuredworkloads::v1::ListWorkloadsRequest request) { auto span = internal::MakeSpan( "assuredworkloads_v1::AssuredWorkloadsServiceConnection::ListWorkloads"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListWorkloads(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::assuredworkloads::v1::Workload>(std::move(span), @@ -97,7 +97,7 @@ AssuredWorkloadsServiceTracingConnection::ListViolations( google::cloud::assuredworkloads::v1::ListViolationsRequest request) { auto span = internal::MakeSpan( "assuredworkloads_v1::AssuredWorkloadsServiceConnection::ListViolations"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListViolations(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::assuredworkloads::v1::Violation>(std::move(span), diff --git a/google/cloud/assuredworkloads/v1/internal/assured_workloads_tracing_stub.cc b/google/cloud/assuredworkloads/v1/internal/assured_workloads_tracing_stub.cc index f544e8f05f36..2a7c22d1f3b5 100644 --- a/google/cloud/assuredworkloads/v1/internal/assured_workloads_tracing_stub.cc +++ b/google/cloud/assuredworkloads/v1/internal/assured_workloads_tracing_stub.cc @@ -38,10 +38,8 @@ AssuredWorkloadsServiceTracingStub::AsyncCreateWorkload( auto span = internal::MakeSpanGrpc( "google.cloud.assuredworkloads.v1.AssuredWorkloadsService", "CreateWorkload"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateWorkload(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -158,10 +156,8 @@ AssuredWorkloadsServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -172,10 +168,8 @@ future AssuredWorkloadsServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/automl/v1/internal/auto_ml_tracing_connection.cc b/google/cloud/automl/v1/internal/auto_ml_tracing_connection.cc index f16baee73dd7..18c9f65f99b2 100644 --- a/google/cloud/automl/v1/internal/auto_ml_tracing_connection.cc +++ b/google/cloud/automl/v1/internal/auto_ml_tracing_connection.cc @@ -36,7 +36,7 @@ future> AutoMlTracingConnection::CreateDataset( google::cloud::automl::v1::CreateDatasetRequest const& request) { auto span = internal::MakeSpan("automl_v1::AutoMlConnection::CreateDataset"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateDataset(request)); } @@ -52,7 +52,7 @@ StreamRange AutoMlTracingConnection::ListDatasets( google::cloud::automl::v1::ListDatasetsRequest request) { auto span = internal::MakeSpan("automl_v1::AutoMlConnection::ListDatasets"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListDatasets(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -70,7 +70,7 @@ future> AutoMlTracingConnection::DeleteDataset( google::cloud::automl::v1::DeleteDatasetRequest const& request) { auto span = internal::MakeSpan("automl_v1::AutoMlConnection::DeleteDataset"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteDataset(request)); } @@ -78,7 +78,7 @@ future> AutoMlTracingConnection::ImportData( google::cloud::automl::v1::ImportDataRequest const& request) { auto span = internal::MakeSpan("automl_v1::AutoMlConnection::ImportData"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ImportData(request)); } @@ -86,7 +86,7 @@ future> AutoMlTracingConnection::ExportData( google::cloud::automl::v1::ExportDataRequest const& request) { auto span = internal::MakeSpan("automl_v1::AutoMlConnection::ExportData"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ExportData(request)); } @@ -103,7 +103,7 @@ future> AutoMlTracingConnection::CreateModel( google::cloud::automl::v1::CreateModelRequest const& request) { auto span = internal::MakeSpan("automl_v1::AutoMlConnection::CreateModel"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateModel(request)); } @@ -118,7 +118,7 @@ StreamRange AutoMlTracingConnection::ListModels( google::cloud::automl::v1::ListModelsRequest request) { auto span = internal::MakeSpan("automl_v1::AutoMlConnection::ListModels"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListModels(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -128,7 +128,7 @@ future> AutoMlTracingConnection::DeleteModel( google::cloud::automl::v1::DeleteModelRequest const& request) { auto span = internal::MakeSpan("automl_v1::AutoMlConnection::DeleteModel"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteModel(request)); } @@ -143,7 +143,7 @@ future> AutoMlTracingConnection::DeployModel( google::cloud::automl::v1::DeployModelRequest const& request) { auto span = internal::MakeSpan("automl_v1::AutoMlConnection::DeployModel"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeployModel(request)); } @@ -151,7 +151,7 @@ future> AutoMlTracingConnection::UndeployModel( google::cloud::automl::v1::UndeployModelRequest const& request) { auto span = internal::MakeSpan("automl_v1::AutoMlConnection::UndeployModel"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UndeployModel(request)); } @@ -159,7 +159,7 @@ future> AutoMlTracingConnection::ExportModel( google::cloud::automl::v1::ExportModelRequest const& request) { auto span = internal::MakeSpan("automl_v1::AutoMlConnection::ExportModel"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ExportModel(request)); } @@ -177,7 +177,7 @@ AutoMlTracingConnection::ListModelEvaluations( google::cloud::automl::v1::ListModelEvaluationsRequest request) { auto span = internal::MakeSpan("automl_v1::AutoMlConnection::ListModelEvaluations"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListModelEvaluations(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::automl::v1::ModelEvaluation>(std::move(span), diff --git a/google/cloud/automl/v1/internal/auto_ml_tracing_stub.cc b/google/cloud/automl/v1/internal/auto_ml_tracing_stub.cc index 5fbae0095545..ab8f8258043d 100644 --- a/google/cloud/automl/v1/internal/auto_ml_tracing_stub.cc +++ b/google/cloud/automl/v1/internal/auto_ml_tracing_stub.cc @@ -36,10 +36,8 @@ AutoMlTracingStub::AsyncCreateDataset( google::cloud::automl::v1::CreateDatasetRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.automl.v1.AutoMl", "CreateDataset"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateDataset(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -85,10 +83,8 @@ AutoMlTracingStub::AsyncDeleteDataset( google::cloud::automl::v1::DeleteDatasetRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.automl.v1.AutoMl", "DeleteDataset"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteDataset(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -100,10 +96,8 @@ AutoMlTracingStub::AsyncImportData( google::cloud::automl::v1::ImportDataRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.automl.v1.AutoMl", "ImportData"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncImportData(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -115,10 +109,8 @@ AutoMlTracingStub::AsyncExportData( google::cloud::automl::v1::ExportDataRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.automl.v1.AutoMl", "ExportData"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncExportData(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -142,10 +134,8 @@ AutoMlTracingStub::AsyncCreateModel( google::cloud::automl::v1::CreateModelRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.automl.v1.AutoMl", "CreateModel"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateModel(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -179,10 +169,8 @@ AutoMlTracingStub::AsyncDeleteModel( google::cloud::automl::v1::DeleteModelRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.automl.v1.AutoMl", "DeleteModel"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteModel(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -205,10 +193,8 @@ AutoMlTracingStub::AsyncDeployModel( google::cloud::automl::v1::DeployModelRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.automl.v1.AutoMl", "DeployModel"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeployModel(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -220,10 +206,8 @@ AutoMlTracingStub::AsyncUndeployModel( google::cloud::automl::v1::UndeployModelRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.automl.v1.AutoMl", "UndeployModel"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUndeployModel(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -235,10 +219,8 @@ AutoMlTracingStub::AsyncExportModel( google::cloud::automl::v1::ExportModelRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.automl.v1.AutoMl", "ExportModel"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncExportModel(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -274,10 +256,8 @@ AutoMlTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -288,10 +268,8 @@ future AutoMlTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/automl/v1/internal/prediction_tracing_connection.cc b/google/cloud/automl/v1/internal/prediction_tracing_connection.cc index d2cdfa292bfc..d670fc6945db 100644 --- a/google/cloud/automl/v1/internal/prediction_tracing_connection.cc +++ b/google/cloud/automl/v1/internal/prediction_tracing_connection.cc @@ -45,7 +45,7 @@ PredictionServiceTracingConnection::BatchPredict( google::cloud::automl::v1::BatchPredictRequest const& request) { auto span = internal::MakeSpan( "automl_v1::PredictionServiceConnection::BatchPredict"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->BatchPredict(request)); } diff --git a/google/cloud/automl/v1/internal/prediction_tracing_stub.cc b/google/cloud/automl/v1/internal/prediction_tracing_stub.cc index d4fd1d72adc3..6a015727ca41 100644 --- a/google/cloud/automl/v1/internal/prediction_tracing_stub.cc +++ b/google/cloud/automl/v1/internal/prediction_tracing_stub.cc @@ -48,10 +48,8 @@ PredictionServiceTracingStub::AsyncBatchPredict( google::cloud::automl::v1::BatchPredictRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.automl.v1.PredictionService", "BatchPredict"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncBatchPredict(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -63,10 +61,8 @@ PredictionServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -77,10 +73,8 @@ future PredictionServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_tracing_connection.cc b/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_tracing_connection.cc index 50e93b1ba51d..63cd8c913002 100644 --- a/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_tracing_connection.cc +++ b/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_tracing_connection.cc @@ -37,7 +37,7 @@ BareMetalSolutionTracingConnection::ListInstances( google::cloud::baremetalsolution::v2::ListInstancesRequest request) { auto span = internal::MakeSpan( "baremetalsolution_v2::BareMetalSolutionConnection::ListInstances"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListInstances(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::baremetalsolution::v2::Instance>(std::move(span), @@ -59,7 +59,7 @@ BareMetalSolutionTracingConnection::UpdateInstance( request) { auto span = internal::MakeSpan( "baremetalsolution_v2::BareMetalSolutionConnection::UpdateInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateInstance(request)); } @@ -78,7 +78,7 @@ BareMetalSolutionTracingConnection::ResetInstance( google::cloud::baremetalsolution::v2::ResetInstanceRequest const& request) { auto span = internal::MakeSpan( "baremetalsolution_v2::BareMetalSolutionConnection::ResetInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ResetInstance(request)); } @@ -87,7 +87,7 @@ BareMetalSolutionTracingConnection::StartInstance( google::cloud::baremetalsolution::v2::StartInstanceRequest const& request) { auto span = internal::MakeSpan( "baremetalsolution_v2::BareMetalSolutionConnection::StartInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->StartInstance(request)); } @@ -96,7 +96,7 @@ BareMetalSolutionTracingConnection::StopInstance( google::cloud::baremetalsolution::v2::StopInstanceRequest const& request) { auto span = internal::MakeSpan( "baremetalsolution_v2::BareMetalSolutionConnection::StopInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->StopInstance(request)); } @@ -108,7 +108,7 @@ BareMetalSolutionTracingConnection::EnableInteractiveSerialConsole( auto span = internal::MakeSpan( "baremetalsolution_v2::BareMetalSolutionConnection::" "EnableInteractiveSerialConsole"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->EnableInteractiveSerialConsole(request)); } @@ -121,7 +121,7 @@ BareMetalSolutionTracingConnection::DisableInteractiveSerialConsole( auto span = internal::MakeSpan( "baremetalsolution_v2::BareMetalSolutionConnection::" "DisableInteractiveSerialConsole"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DisableInteractiveSerialConsole(request)); } @@ -131,7 +131,7 @@ BareMetalSolutionTracingConnection::DetachLun( google::cloud::baremetalsolution::v2::DetachLunRequest const& request) { auto span = internal::MakeSpan( "baremetalsolution_v2::BareMetalSolutionConnection::DetachLun"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DetachLun(request)); } @@ -140,7 +140,7 @@ BareMetalSolutionTracingConnection::ListSSHKeys( google::cloud::baremetalsolution::v2::ListSSHKeysRequest request) { auto span = internal::MakeSpan( "baremetalsolution_v2::BareMetalSolutionConnection::ListSSHKeys"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListSSHKeys(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::baremetalsolution::v2::SSHKey>(std::move(span), @@ -169,7 +169,7 @@ BareMetalSolutionTracingConnection::ListVolumes( google::cloud::baremetalsolution::v2::ListVolumesRequest request) { auto span = internal::MakeSpan( "baremetalsolution_v2::BareMetalSolutionConnection::ListVolumes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListVolumes(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::baremetalsolution::v2::Volume>(std::move(span), @@ -190,7 +190,7 @@ BareMetalSolutionTracingConnection::UpdateVolume( google::cloud::baremetalsolution::v2::UpdateVolumeRequest const& request) { auto span = internal::MakeSpan( "baremetalsolution_v2::BareMetalSolutionConnection::UpdateVolume"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateVolume(request)); } @@ -208,7 +208,7 @@ BareMetalSolutionTracingConnection::EvictVolume( google::cloud::baremetalsolution::v2::EvictVolumeRequest const& request) { auto span = internal::MakeSpan( "baremetalsolution_v2::BareMetalSolutionConnection::EvictVolume"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->EvictVolume(request)); } @@ -217,7 +217,7 @@ BareMetalSolutionTracingConnection::ResizeVolume( google::cloud::baremetalsolution::v2::ResizeVolumeRequest const& request) { auto span = internal::MakeSpan( "baremetalsolution_v2::BareMetalSolutionConnection::ResizeVolume"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ResizeVolume(request)); } @@ -226,7 +226,7 @@ BareMetalSolutionTracingConnection::ListNetworks( google::cloud::baremetalsolution::v2::ListNetworksRequest request) { auto span = internal::MakeSpan( "baremetalsolution_v2::BareMetalSolutionConnection::ListNetworks"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListNetworks(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::baremetalsolution::v2::Network>(std::move(span), @@ -257,7 +257,7 @@ BareMetalSolutionTracingConnection::UpdateNetwork( google::cloud::baremetalsolution::v2::UpdateNetworkRequest const& request) { auto span = internal::MakeSpan( "baremetalsolution_v2::BareMetalSolutionConnection::UpdateNetwork"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateNetwork(request)); } @@ -279,7 +279,7 @@ BareMetalSolutionTracingConnection::RestoreVolumeSnapshot( auto span = internal::MakeSpan( "baremetalsolution_v2::BareMetalSolutionConnection::" "RestoreVolumeSnapshot"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RestoreVolumeSnapshot(request)); } @@ -309,7 +309,7 @@ BareMetalSolutionTracingConnection::ListVolumeSnapshots( google::cloud::baremetalsolution::v2::ListVolumeSnapshotsRequest request) { auto span = internal::MakeSpan( "baremetalsolution_v2::BareMetalSolutionConnection::ListVolumeSnapshots"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListVolumeSnapshots(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::baremetalsolution::v2::VolumeSnapshot>(std::move(span), @@ -330,7 +330,7 @@ BareMetalSolutionTracingConnection::ListLuns( google::cloud::baremetalsolution::v2::ListLunsRequest request) { auto span = internal::MakeSpan( "baremetalsolution_v2::BareMetalSolutionConnection::ListLuns"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListLuns(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::baremetalsolution::v2::Lun>(std::move(span), @@ -342,7 +342,7 @@ BareMetalSolutionTracingConnection::EvictLun( google::cloud::baremetalsolution::v2::EvictLunRequest const& request) { auto span = internal::MakeSpan( "baremetalsolution_v2::BareMetalSolutionConnection::EvictLun"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->EvictLun(request)); } @@ -360,7 +360,7 @@ BareMetalSolutionTracingConnection::ListNfsShares( google::cloud::baremetalsolution::v2::ListNfsSharesRequest request) { auto span = internal::MakeSpan( "baremetalsolution_v2::BareMetalSolutionConnection::ListNfsShares"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListNfsShares(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::baremetalsolution::v2::NfsShare>(std::move(span), @@ -373,7 +373,7 @@ BareMetalSolutionTracingConnection::UpdateNfsShare( request) { auto span = internal::MakeSpan( "baremetalsolution_v2::BareMetalSolutionConnection::UpdateNfsShare"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateNfsShare(request)); } @@ -383,7 +383,7 @@ BareMetalSolutionTracingConnection::CreateNfsShare( request) { auto span = internal::MakeSpan( "baremetalsolution_v2::BareMetalSolutionConnection::CreateNfsShare"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateNfsShare(request)); } @@ -403,7 +403,7 @@ BareMetalSolutionTracingConnection::DeleteNfsShare( request) { auto span = internal::MakeSpan( "baremetalsolution_v2::BareMetalSolutionConnection::DeleteNfsShare"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteNfsShare(request)); } @@ -414,7 +414,7 @@ BareMetalSolutionTracingConnection::ListProvisioningQuotas( auto span = internal::MakeSpan( "baremetalsolution_v2::BareMetalSolutionConnection::" "ListProvisioningQuotas"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListProvisioningQuotas(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::baremetalsolution::v2::ProvisioningQuota>(std::move(span), @@ -479,7 +479,7 @@ BareMetalSolutionTracingConnection::ListOSImages( google::cloud::baremetalsolution::v2::ListOSImagesRequest request) { auto span = internal::MakeSpan( "baremetalsolution_v2::BareMetalSolutionConnection::ListOSImages"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListOSImages(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::baremetalsolution::v2::OSImage>(std::move(span), diff --git a/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_tracing_stub.cc b/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_tracing_stub.cc index c4edc70c42c5..6ebbe99292ce 100644 --- a/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_tracing_stub.cc +++ b/google/cloud/baremetalsolution/v2/internal/bare_metal_solution_tracing_stub.cc @@ -62,10 +62,8 @@ BareMetalSolutionTracingStub::AsyncUpdateInstance( request) { auto span = internal::MakeSpanGrpc( "google.cloud.baremetalsolution.v2.BareMetalSolution", "UpdateInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -90,10 +88,8 @@ BareMetalSolutionTracingStub::AsyncResetInstance( google::cloud::baremetalsolution::v2::ResetInstanceRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.baremetalsolution.v2.BareMetalSolution", "ResetInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncResetInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -105,10 +101,8 @@ BareMetalSolutionTracingStub::AsyncStartInstance( google::cloud::baremetalsolution::v2::StartInstanceRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.baremetalsolution.v2.BareMetalSolution", "StartInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncStartInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -120,10 +114,8 @@ BareMetalSolutionTracingStub::AsyncStopInstance( google::cloud::baremetalsolution::v2::StopInstanceRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.baremetalsolution.v2.BareMetalSolution", "StopInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncStopInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -137,10 +129,8 @@ BareMetalSolutionTracingStub::AsyncEnableInteractiveSerialConsole( auto span = internal::MakeSpanGrpc( "google.cloud.baremetalsolution.v2.BareMetalSolution", "EnableInteractiveSerialConsole"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncEnableInteractiveSerialConsole(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -154,10 +144,8 @@ BareMetalSolutionTracingStub::AsyncDisableInteractiveSerialConsole( auto span = internal::MakeSpanGrpc( "google.cloud.baremetalsolution.v2.BareMetalSolution", "DisableInteractiveSerialConsole"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDisableInteractiveSerialConsole(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -169,10 +157,8 @@ BareMetalSolutionTracingStub::AsyncDetachLun( google::cloud::baremetalsolution::v2::DetachLunRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.baremetalsolution.v2.BareMetalSolution", "DetachLun"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDetachLun(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -242,10 +228,8 @@ BareMetalSolutionTracingStub::AsyncUpdateVolume( google::cloud::baremetalsolution::v2::UpdateVolumeRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.baremetalsolution.v2.BareMetalSolution", "UpdateVolume"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateVolume(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -269,10 +253,8 @@ BareMetalSolutionTracingStub::AsyncEvictVolume( google::cloud::baremetalsolution::v2::EvictVolumeRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.baremetalsolution.v2.BareMetalSolution", "EvictVolume"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncEvictVolume(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -284,10 +266,8 @@ BareMetalSolutionTracingStub::AsyncResizeVolume( google::cloud::baremetalsolution::v2::ResizeVolumeRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.baremetalsolution.v2.BareMetalSolution", "ResizeVolume"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncResizeVolume(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -337,10 +317,8 @@ BareMetalSolutionTracingStub::AsyncUpdateNetwork( google::cloud::baremetalsolution::v2::UpdateNetworkRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.baremetalsolution.v2.BareMetalSolution", "UpdateNetwork"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateNetwork(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -368,10 +346,8 @@ BareMetalSolutionTracingStub::AsyncRestoreVolumeSnapshot( auto span = internal::MakeSpanGrpc( "google.cloud.baremetalsolution.v2.BareMetalSolution", "RestoreVolumeSnapshot"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncRestoreVolumeSnapshot(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -446,10 +422,8 @@ BareMetalSolutionTracingStub::AsyncEvictLun( google::cloud::baremetalsolution::v2::EvictLunRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.baremetalsolution.v2.BareMetalSolution", "EvictLun"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncEvictLun(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -486,10 +460,8 @@ BareMetalSolutionTracingStub::AsyncUpdateNfsShare( request) { auto span = internal::MakeSpanGrpc( "google.cloud.baremetalsolution.v2.BareMetalSolution", "UpdateNfsShare"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateNfsShare(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -502,10 +474,8 @@ BareMetalSolutionTracingStub::AsyncCreateNfsShare( request) { auto span = internal::MakeSpanGrpc( "google.cloud.baremetalsolution.v2.BareMetalSolution", "CreateNfsShare"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateNfsShare(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -531,10 +501,8 @@ BareMetalSolutionTracingStub::AsyncDeleteNfsShare( request) { auto span = internal::MakeSpanGrpc( "google.cloud.baremetalsolution.v2.BareMetalSolution", "DeleteNfsShare"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteNfsShare(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -640,10 +608,8 @@ BareMetalSolutionTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -654,10 +620,8 @@ future BareMetalSolutionTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/batch/v1/internal/batch_tracing_connection.cc b/google/cloud/batch/v1/internal/batch_tracing_connection.cc index 7cf9129e95d8..4399a488f87a 100644 --- a/google/cloud/batch/v1/internal/batch_tracing_connection.cc +++ b/google/cloud/batch/v1/internal/batch_tracing_connection.cc @@ -51,7 +51,7 @@ future> BatchServiceTracingConnection::DeleteJob( google::cloud::batch::v1::DeleteJobRequest const& request) { auto span = internal::MakeSpan("batch_v1::BatchServiceConnection::DeleteJob"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteJob(request)); } @@ -59,7 +59,7 @@ StreamRange BatchServiceTracingConnection::ListJobs( google::cloud::batch::v1::ListJobsRequest request) { auto span = internal::MakeSpan("batch_v1::BatchServiceConnection::ListJobs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListJobs(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -76,7 +76,7 @@ StreamRange BatchServiceTracingConnection::ListTasks( google::cloud::batch::v1::ListTasksRequest request) { auto span = internal::MakeSpan("batch_v1::BatchServiceConnection::ListTasks"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListTasks(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); diff --git a/google/cloud/batch/v1/internal/batch_tracing_stub.cc b/google/cloud/batch/v1/internal/batch_tracing_stub.cc index 10da539daf72..a2862fae7bde 100644 --- a/google/cloud/batch/v1/internal/batch_tracing_stub.cc +++ b/google/cloud/batch/v1/internal/batch_tracing_stub.cc @@ -57,10 +57,8 @@ BatchServiceTracingStub::AsyncDeleteJob( google::cloud::batch::v1::DeleteJobRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.batch.v1.BatchService", "DeleteJob"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteJob(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -104,10 +102,8 @@ BatchServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -118,10 +114,8 @@ future BatchServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_tracing_connection.cc b/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_tracing_connection.cc index 0b63c0a50130..b011d7aa5b58 100644 --- a/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_tracing_connection.cc +++ b/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_tracing_connection.cc @@ -42,7 +42,7 @@ AppConnectionsServiceTracingConnection::ListAppConnections( auto span = internal::MakeSpan( "beyondcorp_appconnections_v1::AppConnectionsServiceConnection::" "ListAppConnections"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListAppConnections(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::beyondcorp::appconnections::v1::AppConnection>( @@ -67,7 +67,7 @@ AppConnectionsServiceTracingConnection::CreateAppConnection( auto span = internal::MakeSpan( "beyondcorp_appconnections_v1::AppConnectionsServiceConnection::" "CreateAppConnection"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateAppConnection(request)); } @@ -79,7 +79,7 @@ AppConnectionsServiceTracingConnection::UpdateAppConnection( auto span = internal::MakeSpan( "beyondcorp_appconnections_v1::AppConnectionsServiceConnection::" "UpdateAppConnection"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateAppConnection(request)); } @@ -92,7 +92,7 @@ AppConnectionsServiceTracingConnection::DeleteAppConnection( auto span = internal::MakeSpan( "beyondcorp_appconnections_v1::AppConnectionsServiceConnection::" "DeleteAppConnection"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteAppConnection(request)); } @@ -105,7 +105,7 @@ AppConnectionsServiceTracingConnection::ResolveAppConnections( auto span = internal::MakeSpan( "beyondcorp_appconnections_v1::AppConnectionsServiceConnection::" "ResolveAppConnections"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ResolveAppConnections(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::beyondcorp::appconnections::v1:: diff --git a/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_tracing_stub.cc b/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_tracing_stub.cc index 92773ccf74f1..5b4982c2a107 100644 --- a/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_tracing_stub.cc +++ b/google/cloud/beyondcorp/appconnections/v1/internal/app_connections_tracing_stub.cc @@ -69,10 +69,8 @@ AppConnectionsServiceTracingStub::AsyncCreateAppConnection( auto span = internal::MakeSpanGrpc( "google.cloud.beyondcorp.appconnections.v1.AppConnectionsService", "CreateAppConnection"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateAppConnection(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -86,10 +84,8 @@ AppConnectionsServiceTracingStub::AsyncUpdateAppConnection( auto span = internal::MakeSpanGrpc( "google.cloud.beyondcorp.appconnections.v1.AppConnectionsService", "UpdateAppConnection"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateAppConnection(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -103,10 +99,8 @@ AppConnectionsServiceTracingStub::AsyncDeleteAppConnection( auto span = internal::MakeSpanGrpc( "google.cloud.beyondcorp.appconnections.v1.AppConnectionsService", "DeleteAppConnection"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteAppConnection(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -133,10 +127,8 @@ AppConnectionsServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -147,10 +139,8 @@ future AppConnectionsServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_tracing_connection.cc b/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_tracing_connection.cc index bf9b42bdac61..3059f30b5ce3 100644 --- a/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_tracing_connection.cc +++ b/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_tracing_connection.cc @@ -40,7 +40,7 @@ AppConnectorsServiceTracingConnection::ListAppConnectors( auto span = internal::MakeSpan( "beyondcorp_appconnectors_v1::AppConnectorsServiceConnection::" "ListAppConnectors"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListAppConnectors(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::beyondcorp::appconnectors::v1::AppConnector>( @@ -65,7 +65,7 @@ AppConnectorsServiceTracingConnection::CreateAppConnector( auto span = internal::MakeSpan( "beyondcorp_appconnectors_v1::AppConnectorsServiceConnection::" "CreateAppConnector"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateAppConnector(request)); } @@ -77,7 +77,7 @@ AppConnectorsServiceTracingConnection::UpdateAppConnector( auto span = internal::MakeSpan( "beyondcorp_appconnectors_v1::AppConnectorsServiceConnection::" "UpdateAppConnector"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateAppConnector(request)); } @@ -90,7 +90,7 @@ AppConnectorsServiceTracingConnection::DeleteAppConnector( auto span = internal::MakeSpan( "beyondcorp_appconnectors_v1::AppConnectorsServiceConnection::" "DeleteAppConnector"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteAppConnector(request)); } @@ -102,7 +102,7 @@ AppConnectorsServiceTracingConnection::ReportStatus( auto span = internal::MakeSpan( "beyondcorp_appconnectors_v1::AppConnectorsServiceConnection::" "ReportStatus"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ReportStatus(request)); } diff --git a/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_tracing_stub.cc b/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_tracing_stub.cc index 9cff2c35d60b..0ee56bf8c1e6 100644 --- a/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_tracing_stub.cc +++ b/google/cloud/beyondcorp/appconnectors/v1/internal/app_connectors_tracing_stub.cc @@ -67,10 +67,8 @@ AppConnectorsServiceTracingStub::AsyncCreateAppConnector( auto span = internal::MakeSpanGrpc( "google.cloud.beyondcorp.appconnectors.v1.AppConnectorsService", "CreateAppConnector"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateAppConnector(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -84,10 +82,8 @@ AppConnectorsServiceTracingStub::AsyncUpdateAppConnector( auto span = internal::MakeSpanGrpc( "google.cloud.beyondcorp.appconnectors.v1.AppConnectorsService", "UpdateAppConnector"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateAppConnector(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -101,10 +97,8 @@ AppConnectorsServiceTracingStub::AsyncDeleteAppConnector( auto span = internal::MakeSpanGrpc( "google.cloud.beyondcorp.appconnectors.v1.AppConnectorsService", "DeleteAppConnector"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteAppConnector(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -118,10 +112,8 @@ AppConnectorsServiceTracingStub::AsyncReportStatus( auto span = internal::MakeSpanGrpc( "google.cloud.beyondcorp.appconnectors.v1.AppConnectorsService", "ReportStatus"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncReportStatus(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -133,10 +125,8 @@ AppConnectorsServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -147,10 +137,8 @@ future AppConnectorsServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_tracing_connection.cc b/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_tracing_connection.cc index ee93e8fb7bd9..a00f637e574b 100644 --- a/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_tracing_connection.cc +++ b/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_tracing_connection.cc @@ -40,7 +40,7 @@ AppGatewaysServiceTracingConnection::ListAppGateways( auto span = internal::MakeSpan( "beyondcorp_appgateways_v1::AppGatewaysServiceConnection::" "ListAppGateways"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListAppGateways(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::beyondcorp::appgateways::v1::AppGateway>(std::move(span), @@ -64,7 +64,7 @@ AppGatewaysServiceTracingConnection::CreateAppGateway( auto span = internal::MakeSpan( "beyondcorp_appgateways_v1::AppGatewaysServiceConnection::" "CreateAppGateway"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateAppGateway(request)); } @@ -76,7 +76,7 @@ AppGatewaysServiceTracingConnection::DeleteAppGateway( auto span = internal::MakeSpan( "beyondcorp_appgateways_v1::AppGatewaysServiceConnection::" "DeleteAppGateway"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteAppGateway(request)); } diff --git a/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_tracing_stub.cc b/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_tracing_stub.cc index 77d8a33fd447..bd63535a86a5 100644 --- a/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_tracing_stub.cc +++ b/google/cloud/beyondcorp/appgateways/v1/internal/app_gateways_tracing_stub.cc @@ -67,10 +67,8 @@ AppGatewaysServiceTracingStub::AsyncCreateAppGateway( auto span = internal::MakeSpanGrpc( "google.cloud.beyondcorp.appgateways.v1.AppGatewaysService", "CreateAppGateway"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateAppGateway(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -84,10 +82,8 @@ AppGatewaysServiceTracingStub::AsyncDeleteAppGateway( auto span = internal::MakeSpanGrpc( "google.cloud.beyondcorp.appgateways.v1.AppGatewaysService", "DeleteAppGateway"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteAppGateway(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -99,10 +95,8 @@ AppGatewaysServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -113,10 +107,8 @@ future AppGatewaysServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_tracing_connection.cc b/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_tracing_connection.cc index fa70a400109d..14e90cf084a5 100644 --- a/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_tracing_connection.cc +++ b/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_tracing_connection.cc @@ -40,7 +40,7 @@ AnalyticsHubServiceTracingConnection::ListDataExchanges( auto span = internal::MakeSpan( "bigquery_analyticshub_v1::AnalyticsHubServiceConnection::" "ListDataExchanges"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListDataExchanges(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::bigquery::analyticshub::v1::DataExchange>(std::move(span), @@ -54,7 +54,7 @@ AnalyticsHubServiceTracingConnection::ListOrgDataExchanges( auto span = internal::MakeSpan( "bigquery_analyticshub_v1::AnalyticsHubServiceConnection::" "ListOrgDataExchanges"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListOrgDataExchanges(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::bigquery::analyticshub::v1::DataExchange>(std::move(span), @@ -109,7 +109,7 @@ AnalyticsHubServiceTracingConnection::ListListings( google::cloud::bigquery::analyticshub::v1::ListListingsRequest request) { auto span = internal::MakeSpan( "bigquery_analyticshub_v1::AnalyticsHubServiceConnection::ListListings"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListListings(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::bigquery::analyticshub::v1::Listing>(std::move(span), @@ -174,7 +174,7 @@ AnalyticsHubServiceTracingConnection::SubscribeDataExchange( auto span = internal::MakeSpan( "bigquery_analyticshub_v1::AnalyticsHubServiceConnection::" "SubscribeDataExchange"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SubscribeDataExchange(request)); } @@ -187,7 +187,7 @@ AnalyticsHubServiceTracingConnection::RefreshSubscription( auto span = internal::MakeSpan( "bigquery_analyticshub_v1::AnalyticsHubServiceConnection::" "RefreshSubscription"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RefreshSubscription(request)); } @@ -210,7 +210,7 @@ AnalyticsHubServiceTracingConnection::ListSubscriptions( auto span = internal::MakeSpan( "bigquery_analyticshub_v1::AnalyticsHubServiceConnection::" "ListSubscriptions"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListSubscriptions(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::bigquery::analyticshub::v1::Subscription>(std::move(span), @@ -224,7 +224,7 @@ AnalyticsHubServiceTracingConnection::ListSharedResourceSubscriptions( auto span = internal::MakeSpan( "bigquery_analyticshub_v1::AnalyticsHubServiceConnection::" "ListSharedResourceSubscriptions"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListSharedResourceSubscriptions(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::bigquery::analyticshub::v1::Subscription>(std::move(span), @@ -249,7 +249,7 @@ AnalyticsHubServiceTracingConnection::DeleteSubscription( auto span = internal::MakeSpan( "bigquery_analyticshub_v1::AnalyticsHubServiceConnection::" "DeleteSubscription"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteSubscription(request)); } diff --git a/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_tracing_stub.cc b/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_tracing_stub.cc index fd95de32b9c7..259a7a2eaaea 100644 --- a/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_tracing_stub.cc +++ b/google/cloud/bigquery/analyticshub/v1/internal/analytics_hub_tracing_stub.cc @@ -206,10 +206,8 @@ AnalyticsHubServiceTracingStub::AsyncSubscribeDataExchange( auto span = internal::MakeSpanGrpc( "google.cloud.bigquery.analyticshub.v1.AnalyticsHubService", "SubscribeDataExchange"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncSubscribeDataExchange(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -223,10 +221,8 @@ AnalyticsHubServiceTracingStub::AsyncRefreshSubscription( auto span = internal::MakeSpanGrpc( "google.cloud.bigquery.analyticshub.v1.AnalyticsHubService", "RefreshSubscription"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncRefreshSubscription(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -298,10 +294,8 @@ AnalyticsHubServiceTracingStub::AsyncDeleteSubscription( auto span = internal::MakeSpanGrpc( "google.cloud.bigquery.analyticshub.v1.AnalyticsHubService", "DeleteSubscription"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteSubscription(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -350,10 +344,8 @@ AnalyticsHubServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -364,10 +356,8 @@ future AnalyticsHubServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/bigquery/biglake/v1/internal/metastore_tracing_connection.cc b/google/cloud/bigquery/biglake/v1/internal/metastore_tracing_connection.cc index 85280c55e991..cdef01a9b17c 100644 --- a/google/cloud/bigquery/biglake/v1/internal/metastore_tracing_connection.cc +++ b/google/cloud/bigquery/biglake/v1/internal/metastore_tracing_connection.cc @@ -64,7 +64,7 @@ MetastoreServiceTracingConnection::ListCatalogs( google::cloud::bigquery::biglake::v1::ListCatalogsRequest request) { auto span = internal::MakeSpan( "bigquery_biglake_v1::MetastoreServiceConnection::ListCatalogs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListCatalogs(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::bigquery::biglake::v1::Catalog>(std::move(span), @@ -115,7 +115,7 @@ MetastoreServiceTracingConnection::ListDatabases( google::cloud::bigquery::biglake::v1::ListDatabasesRequest request) { auto span = internal::MakeSpan( "bigquery_biglake_v1::MetastoreServiceConnection::ListDatabases"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListDatabases(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::bigquery::biglake::v1::Database>(std::move(span), @@ -172,7 +172,7 @@ MetastoreServiceTracingConnection::ListTables( google::cloud::bigquery::biglake::v1::ListTablesRequest request) { auto span = internal::MakeSpan( "bigquery_biglake_v1::MetastoreServiceConnection::ListTables"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListTables(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::bigquery::biglake::v1::Table>(std::move(span), diff --git a/google/cloud/bigquery/connection/v1/internal/connection_tracing_connection.cc b/google/cloud/bigquery/connection/v1/internal/connection_tracing_connection.cc index a0bc00da298d..1d54d726db56 100644 --- a/google/cloud/bigquery/connection/v1/internal/connection_tracing_connection.cc +++ b/google/cloud/bigquery/connection/v1/internal/connection_tracing_connection.cc @@ -57,7 +57,7 @@ ConnectionServiceTracingConnection::ListConnections( google::cloud::bigquery::connection::v1::ListConnectionsRequest request) { auto span = internal::MakeSpan( "bigquery_connection_v1::ConnectionServiceConnection::ListConnections"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListConnections(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::bigquery::connection::v1::Connection>(std::move(span), diff --git a/google/cloud/bigquery/datapolicies/v1/internal/data_policy_tracing_connection.cc b/google/cloud/bigquery/datapolicies/v1/internal/data_policy_tracing_connection.cc index 1b9a04f220eb..5525ba213f7a 100644 --- a/google/cloud/bigquery/datapolicies/v1/internal/data_policy_tracing_connection.cc +++ b/google/cloud/bigquery/datapolicies/v1/internal/data_policy_tracing_connection.cc @@ -93,7 +93,7 @@ DataPolicyServiceTracingConnection::ListDataPolicies( auto span = internal::MakeSpan( "bigquery_datapolicies_v1::DataPolicyServiceConnection::" "ListDataPolicies"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListDataPolicies(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::bigquery::datapolicies::v1::DataPolicy>(std::move(span), diff --git a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_tracing_connection.cc b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_tracing_connection.cc index d3a60c26cc44..26d5a88d1cae 100644 --- a/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_tracing_connection.cc +++ b/google/cloud/bigquery/datatransfer/v1/internal/data_transfer_tracing_connection.cc @@ -49,7 +49,7 @@ DataTransferServiceTracingConnection::ListDataSources( auto span = internal::MakeSpan( "bigquery_datatransfer_v1::DataTransferServiceConnection::" "ListDataSources"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListDataSources(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::bigquery::datatransfer::v1::DataSource>(std::move(span), @@ -106,7 +106,7 @@ DataTransferServiceTracingConnection::ListTransferConfigs( auto span = internal::MakeSpan( "bigquery_datatransfer_v1::DataTransferServiceConnection::" "ListTransferConfigs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListTransferConfigs(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::bigquery::datatransfer::v1::TransferConfig>( @@ -165,7 +165,7 @@ DataTransferServiceTracingConnection::ListTransferRuns( auto span = internal::MakeSpan( "bigquery_datatransfer_v1::DataTransferServiceConnection::" "ListTransferRuns"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListTransferRuns(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::bigquery::datatransfer::v1::TransferRun>(std::move(span), @@ -179,7 +179,7 @@ DataTransferServiceTracingConnection::ListTransferLogs( auto span = internal::MakeSpan( "bigquery_datatransfer_v1::DataTransferServiceConnection::" "ListTransferLogs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListTransferLogs(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::bigquery::datatransfer::v1::TransferMessage>( diff --git a/google/cloud/bigquery/migration/v2/internal/migration_tracing_connection.cc b/google/cloud/bigquery/migration/v2/internal/migration_tracing_connection.cc index 773970ed516f..89ff0b9358f1 100644 --- a/google/cloud/bigquery/migration/v2/internal/migration_tracing_connection.cc +++ b/google/cloud/bigquery/migration/v2/internal/migration_tracing_connection.cc @@ -61,7 +61,7 @@ MigrationServiceTracingConnection::ListMigrationWorkflows( auto span = internal::MakeSpan( "bigquery_migration_v2::MigrationServiceConnection::" "ListMigrationWorkflows"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListMigrationWorkflows(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::bigquery::migration::v2::MigrationWorkflow>( @@ -105,7 +105,7 @@ MigrationServiceTracingConnection::ListMigrationSubtasks( auto span = internal::MakeSpan( "bigquery_migration_v2::MigrationServiceConnection::" "ListMigrationSubtasks"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListMigrationSubtasks(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::bigquery::migration::v2::MigrationSubtask>(std::move(span), diff --git a/google/cloud/bigquery/reservation/v1/internal/reservation_tracing_connection.cc b/google/cloud/bigquery/reservation/v1/internal/reservation_tracing_connection.cc index efe01cc78a2e..9311f928da7d 100644 --- a/google/cloud/bigquery/reservation/v1/internal/reservation_tracing_connection.cc +++ b/google/cloud/bigquery/reservation/v1/internal/reservation_tracing_connection.cc @@ -50,7 +50,7 @@ ReservationServiceTracingConnection::ListReservations( auto span = internal::MakeSpan( "bigquery_reservation_v1::ReservationServiceConnection::" "ListReservations"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListReservations(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::bigquery::reservation::v1::Reservation>(std::move(span), @@ -106,7 +106,7 @@ ReservationServiceTracingConnection::ListCapacityCommitments( auto span = internal::MakeSpan( "bigquery_reservation_v1::ReservationServiceConnection::" "ListCapacityCommitments"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListCapacityCommitments(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::bigquery::reservation::v1::CapacityCommitment>( @@ -184,7 +184,7 @@ ReservationServiceTracingConnection::ListAssignments( google::cloud::bigquery::reservation::v1::ListAssignmentsRequest request) { auto span = internal::MakeSpan( "bigquery_reservation_v1::ReservationServiceConnection::ListAssignments"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListAssignments(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::bigquery::reservation::v1::Assignment>(std::move(span), @@ -208,7 +208,7 @@ ReservationServiceTracingConnection::SearchAssignments( auto span = internal::MakeSpan( "bigquery_reservation_v1::ReservationServiceConnection::" "SearchAssignments"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->SearchAssignments(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::bigquery::reservation::v1::Assignment>(std::move(span), @@ -222,7 +222,7 @@ ReservationServiceTracingConnection::SearchAllAssignments( auto span = internal::MakeSpan( "bigquery_reservation_v1::ReservationServiceConnection::" "SearchAllAssignments"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->SearchAllAssignments(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::bigquery::reservation::v1::Assignment>(std::move(span), diff --git a/google/cloud/bigquery/storage/v1/internal/bigquery_read_tracing_connection.cc b/google/cloud/bigquery/storage/v1/internal/bigquery_read_tracing_connection.cc index 9a38ba3905a1..b65af8007347 100644 --- a/google/cloud/bigquery/storage/v1/internal/bigquery_read_tracing_connection.cc +++ b/google/cloud/bigquery/storage/v1/internal/bigquery_read_tracing_connection.cc @@ -47,7 +47,7 @@ BigQueryReadTracingConnection::ReadRows( google::cloud::bigquery::storage::v1::ReadRowsRequest const& request) { auto span = internal::MakeSpan( "bigquery_storage_v1::BigQueryReadConnection::ReadRows"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ReadRows(request); return internal::MakeTracedStreamRange< google::cloud::bigquery::storage::v1::ReadRowsResponse>(std::move(span), diff --git a/google/cloud/bigquery/storage/v1/internal/bigquery_write_tracing_stub.cc b/google/cloud/bigquery/storage/v1/internal/bigquery_write_tracing_stub.cc index d48e2648ca78..ad27bfdebf1b 100644 --- a/google/cloud/bigquery/storage/v1/internal/bigquery_write_tracing_stub.cc +++ b/google/cloud/bigquery/storage/v1/internal/bigquery_write_tracing_stub.cc @@ -51,7 +51,7 @@ BigQueryWriteTracingStub::AsyncAppendRows( CompletionQueue const& cq, std::shared_ptr context) { auto span = internal::MakeSpanGrpc( "google.cloud.bigquery.storage.v1.BigQueryWrite", "AppendRows"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); internal::InjectTraceContext(*context, *propagator_); auto stream = child_->AsyncAppendRows(cq, context); return std::make_uniqueCreateInstance(request)); } @@ -73,7 +73,7 @@ BigtableInstanceAdminTracingConnection::PartialUpdateInstance( google::bigtable::admin::v2::PartialUpdateInstanceRequest const& request) { auto span = internal::MakeSpan( "bigtable_admin::BigtableInstanceAdminConnection::PartialUpdateInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PartialUpdateInstance(request)); } @@ -91,7 +91,7 @@ BigtableInstanceAdminTracingConnection::CreateCluster( google::bigtable::admin::v2::CreateClusterRequest const& request) { auto span = internal::MakeSpan( "bigtable_admin::BigtableInstanceAdminConnection::CreateCluster"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateCluster(request)); } @@ -118,7 +118,7 @@ BigtableInstanceAdminTracingConnection::UpdateCluster( google::bigtable::admin::v2::Cluster const& request) { auto span = internal::MakeSpan( "bigtable_admin::BigtableInstanceAdminConnection::UpdateCluster"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateCluster(request)); } @@ -127,7 +127,7 @@ BigtableInstanceAdminTracingConnection::PartialUpdateCluster( google::bigtable::admin::v2::PartialUpdateClusterRequest const& request) { auto span = internal::MakeSpan( "bigtable_admin::BigtableInstanceAdminConnection::PartialUpdateCluster"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PartialUpdateCluster(request)); } @@ -163,7 +163,7 @@ BigtableInstanceAdminTracingConnection::ListAppProfiles( google::bigtable::admin::v2::ListAppProfilesRequest request) { auto span = internal::MakeSpan( "bigtable_admin::BigtableInstanceAdminConnection::ListAppProfiles"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListAppProfiles(std::move(request)); return internal::MakeTracedStreamRange< google::bigtable::admin::v2::AppProfile>(std::move(span), std::move(sr)); @@ -174,7 +174,7 @@ BigtableInstanceAdminTracingConnection::UpdateAppProfile( google::bigtable::admin::v2::UpdateAppProfileRequest const& request) { auto span = internal::MakeSpan( "bigtable_admin::BigtableInstanceAdminConnection::UpdateAppProfile"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateAppProfile(request)); } @@ -218,7 +218,7 @@ BigtableInstanceAdminTracingConnection::ListHotTablets( google::bigtable::admin::v2::ListHotTabletsRequest request) { auto span = internal::MakeSpan( "bigtable_admin::BigtableInstanceAdminConnection::ListHotTablets"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListHotTablets(std::move(request)); return internal::MakeTracedStreamRange< google::bigtable::admin::v2::HotTablet>(std::move(span), std::move(sr)); diff --git a/google/cloud/bigtable/admin/internal/bigtable_instance_admin_tracing_stub.cc b/google/cloud/bigtable/admin/internal/bigtable_instance_admin_tracing_stub.cc index d4b9c54ebc51..20ce727bf5dc 100644 --- a/google/cloud/bigtable/admin/internal/bigtable_instance_admin_tracing_stub.cc +++ b/google/cloud/bigtable/admin/internal/bigtable_instance_admin_tracing_stub.cc @@ -37,10 +37,8 @@ BigtableInstanceAdminTracingStub::AsyncCreateInstance( google::bigtable::admin::v2::CreateInstanceRequest const& request) { auto span = internal::MakeSpanGrpc( "google.bigtable.admin.v2.BigtableInstanceAdmin", "CreateInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -89,10 +87,8 @@ BigtableInstanceAdminTracingStub::AsyncPartialUpdateInstance( auto span = internal::MakeSpanGrpc("google.bigtable.admin.v2.BigtableInstanceAdmin", "PartialUpdateInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncPartialUpdateInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -115,10 +111,8 @@ BigtableInstanceAdminTracingStub::AsyncCreateCluster( google::bigtable::admin::v2::CreateClusterRequest const& request) { auto span = internal::MakeSpanGrpc( "google.bigtable.admin.v2.BigtableInstanceAdmin", "CreateCluster"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateCluster(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -154,10 +148,8 @@ BigtableInstanceAdminTracingStub::AsyncUpdateCluster( google::bigtable::admin::v2::Cluster const& request) { auto span = internal::MakeSpanGrpc( "google.bigtable.admin.v2.BigtableInstanceAdmin", "UpdateCluster"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateCluster(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -169,10 +161,8 @@ BigtableInstanceAdminTracingStub::AsyncPartialUpdateCluster( google::bigtable::admin::v2::PartialUpdateClusterRequest const& request) { auto span = internal::MakeSpanGrpc( "google.bigtable.admin.v2.BigtableInstanceAdmin", "PartialUpdateCluster"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncPartialUpdateCluster(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -231,10 +221,8 @@ BigtableInstanceAdminTracingStub::AsyncUpdateAppProfile( google::bigtable::admin::v2::UpdateAppProfileRequest const& request) { auto span = internal::MakeSpanGrpc( "google.bigtable.admin.v2.BigtableInstanceAdmin", "UpdateAppProfile"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateAppProfile(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -305,10 +293,8 @@ BigtableInstanceAdminTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -319,10 +305,8 @@ future BigtableInstanceAdminTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/bigtable/admin/internal/bigtable_table_admin_tracing_connection.cc b/google/cloud/bigtable/admin/internal/bigtable_table_admin_tracing_connection.cc index 0c9d3c41d8e7..be8fd11170b6 100644 --- a/google/cloud/bigtable/admin/internal/bigtable_table_admin_tracing_connection.cc +++ b/google/cloud/bigtable/admin/internal/bigtable_table_admin_tracing_connection.cc @@ -46,7 +46,7 @@ BigtableTableAdminTracingConnection::ListTables( google::bigtable::admin::v2::ListTablesRequest request) { auto span = internal::MakeSpan( "bigtable_admin::BigtableTableAdminConnection::ListTables"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListTables(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -66,7 +66,7 @@ BigtableTableAdminTracingConnection::UpdateTable( google::bigtable::admin::v2::UpdateTableRequest const& request) { auto span = internal::MakeSpan( "bigtable_admin::BigtableTableAdminConnection::UpdateTable"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateTable(request)); } @@ -83,7 +83,7 @@ BigtableTableAdminTracingConnection::UndeleteTable( google::bigtable::admin::v2::UndeleteTableRequest const& request) { auto span = internal::MakeSpan( "bigtable_admin::BigtableTableAdminConnection::UndeleteTable"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UndeleteTable(request)); } @@ -128,7 +128,7 @@ BigtableTableAdminTracingConnection::CreateBackup( google::bigtable::admin::v2::CreateBackupRequest const& request) { auto span = internal::MakeSpan( "bigtable_admin::BigtableTableAdminConnection::CreateBackup"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateBackup(request)); } @@ -163,7 +163,7 @@ BigtableTableAdminTracingConnection::ListBackups( google::bigtable::admin::v2::ListBackupsRequest request) { auto span = internal::MakeSpan( "bigtable_admin::BigtableTableAdminConnection::ListBackups"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListBackups(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -174,7 +174,7 @@ BigtableTableAdminTracingConnection::RestoreTable( google::bigtable::admin::v2::RestoreTableRequest const& request) { auto span = internal::MakeSpan( "bigtable_admin::BigtableTableAdminConnection::RestoreTable"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RestoreTable(request)); } @@ -183,7 +183,7 @@ BigtableTableAdminTracingConnection::CopyBackup( google::bigtable::admin::v2::CopyBackupRequest const& request) { auto span = internal::MakeSpan( "bigtable_admin::BigtableTableAdminConnection::CopyBackup"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CopyBackup(request)); } @@ -219,7 +219,7 @@ BigtableTableAdminTracingConnection::AsyncCheckConsistency( google::bigtable::admin::v2::CheckConsistencyRequest const& request) { auto span = internal::MakeSpan( "bigtable_admin::BigtableTableAdminConnection::AsyncCheckConsistency"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->AsyncCheckConsistency(request)); } diff --git a/google/cloud/bigtable/admin/internal/bigtable_table_admin_tracing_stub.cc b/google/cloud/bigtable/admin/internal/bigtable_table_admin_tracing_stub.cc index 4d22b4bbef2c..fdcf8922f9ee 100644 --- a/google/cloud/bigtable/admin/internal/bigtable_table_admin_tracing_stub.cc +++ b/google/cloud/bigtable/admin/internal/bigtable_table_admin_tracing_stub.cc @@ -72,10 +72,8 @@ BigtableTableAdminTracingStub::AsyncUpdateTable( google::bigtable::admin::v2::UpdateTableRequest const& request) { auto span = internal::MakeSpanGrpc( "google.bigtable.admin.v2.BigtableTableAdmin", "UpdateTable"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateTable(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -98,10 +96,8 @@ BigtableTableAdminTracingStub::AsyncUndeleteTable( google::bigtable::admin::v2::UndeleteTableRequest const& request) { auto span = internal::MakeSpanGrpc( "google.bigtable.admin.v2.BigtableTableAdmin", "UndeleteTable"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUndeleteTable(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -162,10 +158,8 @@ BigtableTableAdminTracingStub::AsyncCreateBackup( google::bigtable::admin::v2::CreateBackupRequest const& request) { auto span = internal::MakeSpanGrpc( "google.bigtable.admin.v2.BigtableTableAdmin", "CreateBackup"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateBackup(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -223,10 +217,8 @@ BigtableTableAdminTracingStub::AsyncRestoreTable( google::bigtable::admin::v2::RestoreTableRequest const& request) { auto span = internal::MakeSpanGrpc( "google.bigtable.admin.v2.BigtableTableAdmin", "RestoreTable"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncRestoreTable(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -238,10 +230,8 @@ BigtableTableAdminTracingStub::AsyncCopyBackup( google::bigtable::admin::v2::CopyBackupRequest const& request) { auto span = internal::MakeSpanGrpc( "google.bigtable.admin.v2.BigtableTableAdmin", "CopyBackup"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCopyBackup(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -287,10 +277,8 @@ BigtableTableAdminTracingStub::AsyncCheckConsistency( google::bigtable::admin::v2::CheckConsistencyRequest const& request) { auto span = internal::MakeSpanGrpc( "google.bigtable.admin.v2.BigtableTableAdmin", "CheckConsistency"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCheckConsistency(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -302,10 +290,8 @@ BigtableTableAdminTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -316,10 +302,8 @@ future BigtableTableAdminTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/bigtable/internal/bigtable_tracing_stub.cc b/google/cloud/bigtable/internal/bigtable_tracing_stub.cc index be03d97d9a58..086eec2ca950 100644 --- a/google/cloud/bigtable/internal/bigtable_tracing_stub.cc +++ b/google/cloud/bigtable/internal/bigtable_tracing_stub.cc @@ -129,7 +129,7 @@ BigtableTracingStub::AsyncReadRows( std::shared_ptr context, google::bigtable::v2::ReadRowsRequest const& request) { auto span = internal::MakeSpanGrpc("google.bigtable.v2.Bigtable", "ReadRows"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); internal::InjectTraceContext(*context, *propagator_); auto stream = child_->AsyncReadRows(cq, context, request); return std::make_uniqueAsyncSampleRowKeys(cq, context, request); return std::make_uniqueAsyncMutateRow(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -176,7 +174,7 @@ BigtableTracingStub::AsyncMutateRows( google::bigtable::v2::MutateRowsRequest const& request) { auto span = internal::MakeSpanGrpc("google.bigtable.v2.Bigtable", "MutateRows"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); internal::InjectTraceContext(*context, *propagator_); auto stream = child_->AsyncMutateRows(cq, context, request); return std::make_uniqueAsyncCheckAndMutateRow(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -206,10 +202,8 @@ BigtableTracingStub::AsyncReadModifyWriteRow( google::bigtable::v2::ReadModifyWriteRowRequest const& request) { auto span = internal::MakeSpanGrpc("google.bigtable.v2.Bigtable", "ReadModifyWriteRow"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncReadModifyWriteRow(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/billing/budgets/v1/internal/budget_tracing_connection.cc b/google/cloud/billing/budgets/v1/internal/budget_tracing_connection.cc index cac0f7b983ac..c6717a471b10 100644 --- a/google/cloud/billing/budgets/v1/internal/budget_tracing_connection.cc +++ b/google/cloud/billing/budgets/v1/internal/budget_tracing_connection.cc @@ -64,7 +64,7 @@ BudgetServiceTracingConnection::ListBudgets( google::cloud::billing::budgets::v1::ListBudgetsRequest request) { auto span = internal::MakeSpan( "billing_budgets_v1::BudgetServiceConnection::ListBudgets"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListBudgets(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::billing::budgets::v1::Budget>(std::move(span), diff --git a/google/cloud/billing/v1/internal/cloud_billing_tracing_connection.cc b/google/cloud/billing/v1/internal/cloud_billing_tracing_connection.cc index 21332c781faf..13be71364c04 100644 --- a/google/cloud/billing/v1/internal/cloud_billing_tracing_connection.cc +++ b/google/cloud/billing/v1/internal/cloud_billing_tracing_connection.cc @@ -46,7 +46,7 @@ CloudBillingTracingConnection::ListBillingAccounts( google::cloud::billing::v1::ListBillingAccountsRequest request) { auto span = internal::MakeSpan( "billing_v1::CloudBillingConnection::ListBillingAccounts"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListBillingAccounts(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::billing::v1::BillingAccount>(std::move(span), @@ -76,7 +76,7 @@ CloudBillingTracingConnection::ListProjectBillingInfo( google::cloud::billing::v1::ListProjectBillingInfoRequest request) { auto span = internal::MakeSpan( "billing_v1::CloudBillingConnection::ListProjectBillingInfo"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListProjectBillingInfo(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::billing::v1::ProjectBillingInfo>(std::move(span), diff --git a/google/cloud/billing/v1/internal/cloud_catalog_tracing_connection.cc b/google/cloud/billing/v1/internal/cloud_catalog_tracing_connection.cc index 5c12bf1cb081..a20ea4b2f3bb 100644 --- a/google/cloud/billing/v1/internal/cloud_catalog_tracing_connection.cc +++ b/google/cloud/billing/v1/internal/cloud_catalog_tracing_connection.cc @@ -37,7 +37,7 @@ CloudCatalogTracingConnection::ListServices( google::cloud::billing::v1::ListServicesRequest request) { auto span = internal::MakeSpan("billing_v1::CloudCatalogConnection::ListServices"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListServices(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -48,7 +48,7 @@ CloudCatalogTracingConnection::ListSkus( google::cloud::billing::v1::ListSkusRequest request) { auto span = internal::MakeSpan("billing_v1::CloudCatalogConnection::ListSkus"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListSkus(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); diff --git a/google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_tracing_connection.cc b/google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_tracing_connection.cc index 2746b974c31d..fc7d42307836 100644 --- a/google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_tracing_connection.cc +++ b/google/cloud/binaryauthorization/v1/internal/binauthz_management_service_v1_tracing_connection.cc @@ -94,7 +94,7 @@ BinauthzManagementServiceV1TracingConnection::ListAttestors( auto span = internal::MakeSpan( "binaryauthorization_v1::BinauthzManagementServiceV1Connection::" "ListAttestors"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListAttestors(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::binaryauthorization::v1::Attestor>(std::move(span), diff --git a/google/cloud/certificatemanager/v1/internal/certificate_manager_tracing_connection.cc b/google/cloud/certificatemanager/v1/internal/certificate_manager_tracing_connection.cc index ae302ad92d74..1d5f03989761 100644 --- a/google/cloud/certificatemanager/v1/internal/certificate_manager_tracing_connection.cc +++ b/google/cloud/certificatemanager/v1/internal/certificate_manager_tracing_connection.cc @@ -37,7 +37,7 @@ CertificateManagerTracingConnection::ListCertificates( google::cloud::certificatemanager::v1::ListCertificatesRequest request) { auto span = internal::MakeSpan( "certificatemanager_v1::CertificateManagerConnection::ListCertificates"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListCertificates(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::certificatemanager::v1::Certificate>(std::move(span), @@ -60,7 +60,7 @@ CertificateManagerTracingConnection::CreateCertificate( request) { auto span = internal::MakeSpan( "certificatemanager_v1::CertificateManagerConnection::CreateCertificate"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateCertificate(request)); } @@ -70,7 +70,7 @@ CertificateManagerTracingConnection::UpdateCertificate( request) { auto span = internal::MakeSpan( "certificatemanager_v1::CertificateManagerConnection::UpdateCertificate"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateCertificate(request)); } @@ -80,7 +80,7 @@ CertificateManagerTracingConnection::DeleteCertificate( request) { auto span = internal::MakeSpan( "certificatemanager_v1::CertificateManagerConnection::DeleteCertificate"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteCertificate(request)); } @@ -90,7 +90,7 @@ CertificateManagerTracingConnection::ListCertificateMaps( auto span = internal::MakeSpan( "certificatemanager_v1::CertificateManagerConnection::" "ListCertificateMaps"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListCertificateMaps(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::certificatemanager::v1::CertificateMap>(std::move(span), @@ -114,7 +114,7 @@ CertificateManagerTracingConnection::CreateCertificateMap( auto span = internal::MakeSpan( "certificatemanager_v1::CertificateManagerConnection::" "CreateCertificateMap"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateCertificateMap(request)); } @@ -126,7 +126,7 @@ CertificateManagerTracingConnection::UpdateCertificateMap( auto span = internal::MakeSpan( "certificatemanager_v1::CertificateManagerConnection::" "UpdateCertificateMap"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateCertificateMap(request)); } @@ -138,7 +138,7 @@ CertificateManagerTracingConnection::DeleteCertificateMap( auto span = internal::MakeSpan( "certificatemanager_v1::CertificateManagerConnection::" "DeleteCertificateMap"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteCertificateMap(request)); } @@ -150,7 +150,7 @@ CertificateManagerTracingConnection::ListCertificateMapEntries( auto span = internal::MakeSpan( "certificatemanager_v1::CertificateManagerConnection::" "ListCertificateMapEntries"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListCertificateMapEntries(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::certificatemanager::v1::CertificateMapEntry>( @@ -175,7 +175,7 @@ CertificateManagerTracingConnection::CreateCertificateMapEntry( auto span = internal::MakeSpan( "certificatemanager_v1::CertificateManagerConnection::" "CreateCertificateMapEntry"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateCertificateMapEntry(request)); } @@ -187,7 +187,7 @@ CertificateManagerTracingConnection::UpdateCertificateMapEntry( auto span = internal::MakeSpan( "certificatemanager_v1::CertificateManagerConnection::" "UpdateCertificateMapEntry"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateCertificateMapEntry(request)); } @@ -199,7 +199,7 @@ CertificateManagerTracingConnection::DeleteCertificateMapEntry( auto span = internal::MakeSpan( "certificatemanager_v1::CertificateManagerConnection::" "DeleteCertificateMapEntry"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteCertificateMapEntry(request)); } @@ -211,7 +211,7 @@ CertificateManagerTracingConnection::ListDnsAuthorizations( auto span = internal::MakeSpan( "certificatemanager_v1::CertificateManagerConnection::" "ListDnsAuthorizations"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListDnsAuthorizations(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::certificatemanager::v1::DnsAuthorization>(std::move(span), @@ -236,7 +236,7 @@ CertificateManagerTracingConnection::CreateDnsAuthorization( auto span = internal::MakeSpan( "certificatemanager_v1::CertificateManagerConnection::" "CreateDnsAuthorization"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateDnsAuthorization(request)); } @@ -248,7 +248,7 @@ CertificateManagerTracingConnection::UpdateDnsAuthorization( auto span = internal::MakeSpan( "certificatemanager_v1::CertificateManagerConnection::" "UpdateDnsAuthorization"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateDnsAuthorization(request)); } @@ -260,7 +260,7 @@ CertificateManagerTracingConnection::DeleteDnsAuthorization( auto span = internal::MakeSpan( "certificatemanager_v1::CertificateManagerConnection::" "DeleteDnsAuthorization"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteDnsAuthorization(request)); } @@ -272,7 +272,7 @@ CertificateManagerTracingConnection::ListCertificateIssuanceConfigs( auto span = internal::MakeSpan( "certificatemanager_v1::CertificateManagerConnection::" "ListCertificateIssuanceConfigs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListCertificateIssuanceConfigs(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::certificatemanager::v1::CertificateIssuanceConfig>( @@ -299,7 +299,7 @@ CertificateManagerTracingConnection::CreateCertificateIssuanceConfig( auto span = internal::MakeSpan( "certificatemanager_v1::CertificateManagerConnection::" "CreateCertificateIssuanceConfig"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateCertificateIssuanceConfig(request)); } @@ -311,7 +311,7 @@ CertificateManagerTracingConnection::DeleteCertificateIssuanceConfig( auto span = internal::MakeSpan( "certificatemanager_v1::CertificateManagerConnection::" "DeleteCertificateIssuanceConfig"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteCertificateIssuanceConfig(request)); } diff --git a/google/cloud/certificatemanager/v1/internal/certificate_manager_tracing_stub.cc b/google/cloud/certificatemanager/v1/internal/certificate_manager_tracing_stub.cc index 122767e98920..69cbdf9bd2e4 100644 --- a/google/cloud/certificatemanager/v1/internal/certificate_manager_tracing_stub.cc +++ b/google/cloud/certificatemanager/v1/internal/certificate_manager_tracing_stub.cc @@ -67,10 +67,8 @@ CertificateManagerTracingStub::AsyncCreateCertificate( auto span = internal::MakeSpanGrpc( "google.cloud.certificatemanager.v1.CertificateManager", "CreateCertificate"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateCertificate(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -84,10 +82,8 @@ CertificateManagerTracingStub::AsyncUpdateCertificate( auto span = internal::MakeSpanGrpc( "google.cloud.certificatemanager.v1.CertificateManager", "UpdateCertificate"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateCertificate(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -101,10 +97,8 @@ CertificateManagerTracingStub::AsyncDeleteCertificate( auto span = internal::MakeSpanGrpc( "google.cloud.certificatemanager.v1.CertificateManager", "DeleteCertificate"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteCertificate(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -146,10 +140,8 @@ CertificateManagerTracingStub::AsyncCreateCertificateMap( auto span = internal::MakeSpanGrpc( "google.cloud.certificatemanager.v1.CertificateManager", "CreateCertificateMap"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateCertificateMap(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -163,10 +155,8 @@ CertificateManagerTracingStub::AsyncUpdateCertificateMap( auto span = internal::MakeSpanGrpc( "google.cloud.certificatemanager.v1.CertificateManager", "UpdateCertificateMap"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateCertificateMap(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -180,10 +170,8 @@ CertificateManagerTracingStub::AsyncDeleteCertificateMap( auto span = internal::MakeSpanGrpc( "google.cloud.certificatemanager.v1.CertificateManager", "DeleteCertificateMap"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteCertificateMap(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -226,10 +214,8 @@ CertificateManagerTracingStub::AsyncCreateCertificateMapEntry( auto span = internal::MakeSpanGrpc( "google.cloud.certificatemanager.v1.CertificateManager", "CreateCertificateMapEntry"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateCertificateMapEntry(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -243,10 +229,8 @@ CertificateManagerTracingStub::AsyncUpdateCertificateMapEntry( auto span = internal::MakeSpanGrpc( "google.cloud.certificatemanager.v1.CertificateManager", "UpdateCertificateMapEntry"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateCertificateMapEntry(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -260,10 +244,8 @@ CertificateManagerTracingStub::AsyncDeleteCertificateMapEntry( auto span = internal::MakeSpanGrpc( "google.cloud.certificatemanager.v1.CertificateManager", "DeleteCertificateMapEntry"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteCertificateMapEntry(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -305,10 +287,8 @@ CertificateManagerTracingStub::AsyncCreateDnsAuthorization( auto span = internal::MakeSpanGrpc( "google.cloud.certificatemanager.v1.CertificateManager", "CreateDnsAuthorization"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateDnsAuthorization(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -322,10 +302,8 @@ CertificateManagerTracingStub::AsyncUpdateDnsAuthorization( auto span = internal::MakeSpanGrpc( "google.cloud.certificatemanager.v1.CertificateManager", "UpdateDnsAuthorization"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateDnsAuthorization(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -339,10 +317,8 @@ CertificateManagerTracingStub::AsyncDeleteDnsAuthorization( auto span = internal::MakeSpanGrpc( "google.cloud.certificatemanager.v1.CertificateManager", "DeleteDnsAuthorization"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteDnsAuthorization(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -385,10 +361,8 @@ CertificateManagerTracingStub::AsyncCreateCertificateIssuanceConfig( auto span = internal::MakeSpanGrpc( "google.cloud.certificatemanager.v1.CertificateManager", "CreateCertificateIssuanceConfig"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateCertificateIssuanceConfig(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -402,10 +376,8 @@ CertificateManagerTracingStub::AsyncDeleteCertificateIssuanceConfig( auto span = internal::MakeSpanGrpc( "google.cloud.certificatemanager.v1.CertificateManager", "DeleteCertificateIssuanceConfig"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteCertificateIssuanceConfig(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -417,10 +389,8 @@ CertificateManagerTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -431,10 +401,8 @@ future CertificateManagerTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/channel/v1/internal/cloud_channel_reports_tracing_connection.cc b/google/cloud/channel/v1/internal/cloud_channel_reports_tracing_connection.cc index b7d94d126e3f..b5f53c6e35c6 100644 --- a/google/cloud/channel/v1/internal/cloud_channel_reports_tracing_connection.cc +++ b/google/cloud/channel/v1/internal/cloud_channel_reports_tracing_connection.cc @@ -38,7 +38,7 @@ CloudChannelReportsServiceTracingConnection::RunReportJob( google::cloud::channel::v1::RunReportJobRequest const& request) { auto span = internal::MakeSpan( "channel_v1::CloudChannelReportsServiceConnection::RunReportJob"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RunReportJob(request)); } @@ -47,7 +47,7 @@ CloudChannelReportsServiceTracingConnection::FetchReportResults( google::cloud::channel::v1::FetchReportResultsRequest request) { auto span = internal::MakeSpan( "channel_v1::CloudChannelReportsServiceConnection::FetchReportResults"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->FetchReportResults(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -58,7 +58,7 @@ CloudChannelReportsServiceTracingConnection::ListReports( google::cloud::channel::v1::ListReportsRequest request) { auto span = internal::MakeSpan( "channel_v1::CloudChannelReportsServiceConnection::ListReports"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListReports(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); diff --git a/google/cloud/channel/v1/internal/cloud_channel_reports_tracing_stub.cc b/google/cloud/channel/v1/internal/cloud_channel_reports_tracing_stub.cc index 5c62466d42ee..471d5ba81780 100644 --- a/google/cloud/channel/v1/internal/cloud_channel_reports_tracing_stub.cc +++ b/google/cloud/channel/v1/internal/cloud_channel_reports_tracing_stub.cc @@ -37,10 +37,8 @@ CloudChannelReportsServiceTracingStub::AsyncRunReportJob( google::cloud::channel::v1::RunReportJobRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.channel.v1.CloudChannelReportsService", "RunReportJob"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncRunReportJob(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -77,10 +75,8 @@ CloudChannelReportsServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -91,10 +87,8 @@ future CloudChannelReportsServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/channel/v1/internal/cloud_channel_tracing_connection.cc b/google/cloud/channel/v1/internal/cloud_channel_tracing_connection.cc index d8864c7724b8..1a1278f0fbfa 100644 --- a/google/cloud/channel/v1/internal/cloud_channel_tracing_connection.cc +++ b/google/cloud/channel/v1/internal/cloud_channel_tracing_connection.cc @@ -37,7 +37,7 @@ CloudChannelServiceTracingConnection::ListCustomers( google::cloud::channel::v1::ListCustomersRequest request) { auto span = internal::MakeSpan( "channel_v1::CloudChannelServiceConnection::ListCustomers"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListCustomers(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -104,7 +104,7 @@ CloudChannelServiceTracingConnection::ProvisionCloudIdentity( google::cloud::channel::v1::ProvisionCloudIdentityRequest const& request) { auto span = internal::MakeSpan( "channel_v1::CloudChannelServiceConnection::ProvisionCloudIdentity"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ProvisionCloudIdentity(request)); } @@ -114,7 +114,7 @@ CloudChannelServiceTracingConnection::ListEntitlements( google::cloud::channel::v1::ListEntitlementsRequest request) { auto span = internal::MakeSpan( "channel_v1::CloudChannelServiceConnection::ListEntitlements"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListEntitlements(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::channel::v1::Entitlement>(std::move(span), std::move(sr)); @@ -125,7 +125,7 @@ CloudChannelServiceTracingConnection::ListTransferableSkus( google::cloud::channel::v1::ListTransferableSkusRequest request) { auto span = internal::MakeSpan( "channel_v1::CloudChannelServiceConnection::ListTransferableSkus"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListTransferableSkus(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::channel::v1::TransferableSku>(std::move(span), @@ -137,7 +137,7 @@ CloudChannelServiceTracingConnection::ListTransferableOffers( google::cloud::channel::v1::ListTransferableOffersRequest request) { auto span = internal::MakeSpan( "channel_v1::CloudChannelServiceConnection::ListTransferableOffers"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListTransferableOffers(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::channel::v1::TransferableOffer>(std::move(span), @@ -158,7 +158,7 @@ CloudChannelServiceTracingConnection::CreateEntitlement( google::cloud::channel::v1::CreateEntitlementRequest const& request) { auto span = internal::MakeSpan( "channel_v1::CloudChannelServiceConnection::CreateEntitlement"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateEntitlement(request)); } @@ -167,7 +167,7 @@ CloudChannelServiceTracingConnection::ChangeParameters( google::cloud::channel::v1::ChangeParametersRequest const& request) { auto span = internal::MakeSpan( "channel_v1::CloudChannelServiceConnection::ChangeParameters"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ChangeParameters(request)); } @@ -176,7 +176,7 @@ CloudChannelServiceTracingConnection::ChangeRenewalSettings( google::cloud::channel::v1::ChangeRenewalSettingsRequest const& request) { auto span = internal::MakeSpan( "channel_v1::CloudChannelServiceConnection::ChangeRenewalSettings"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ChangeRenewalSettings(request)); } @@ -186,7 +186,7 @@ CloudChannelServiceTracingConnection::ChangeOffer( google::cloud::channel::v1::ChangeOfferRequest const& request) { auto span = internal::MakeSpan( "channel_v1::CloudChannelServiceConnection::ChangeOffer"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ChangeOffer(request)); } @@ -195,7 +195,7 @@ CloudChannelServiceTracingConnection::StartPaidService( google::cloud::channel::v1::StartPaidServiceRequest const& request) { auto span = internal::MakeSpan( "channel_v1::CloudChannelServiceConnection::StartPaidService"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->StartPaidService(request)); } @@ -204,7 +204,7 @@ CloudChannelServiceTracingConnection::SuspendEntitlement( google::cloud::channel::v1::SuspendEntitlementRequest const& request) { auto span = internal::MakeSpan( "channel_v1::CloudChannelServiceConnection::SuspendEntitlement"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SuspendEntitlement(request)); } @@ -214,7 +214,7 @@ CloudChannelServiceTracingConnection::CancelEntitlement( google::cloud::channel::v1::CancelEntitlementRequest const& request) { auto span = internal::MakeSpan( "channel_v1::CloudChannelServiceConnection::CancelEntitlement"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CancelEntitlement(request)); } @@ -223,7 +223,7 @@ CloudChannelServiceTracingConnection::ActivateEntitlement( google::cloud::channel::v1::ActivateEntitlementRequest const& request) { auto span = internal::MakeSpan( "channel_v1::CloudChannelServiceConnection::ActivateEntitlement"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ActivateEntitlement(request)); } @@ -233,7 +233,7 @@ CloudChannelServiceTracingConnection::TransferEntitlements( google::cloud::channel::v1::TransferEntitlementsRequest const& request) { auto span = internal::MakeSpan( "channel_v1::CloudChannelServiceConnection::TransferEntitlements"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->TransferEntitlements(request)); } @@ -245,7 +245,7 @@ CloudChannelServiceTracingConnection::TransferEntitlementsToGoogle( auto span = internal::MakeSpan( "channel_v1::CloudChannelServiceConnection::" "TransferEntitlementsToGoogle"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->TransferEntitlementsToGoogle(request)); } @@ -255,7 +255,7 @@ CloudChannelServiceTracingConnection::ListChannelPartnerLinks( google::cloud::channel::v1::ListChannelPartnerLinksRequest request) { auto span = internal::MakeSpan( "channel_v1::CloudChannelServiceConnection::ListChannelPartnerLinks"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListChannelPartnerLinks(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::channel::v1::ChannelPartnerLink>(std::move(span), @@ -307,7 +307,7 @@ CloudChannelServiceTracingConnection::ListCustomerRepricingConfigs( auto span = internal::MakeSpan( "channel_v1::CloudChannelServiceConnection::" "ListCustomerRepricingConfigs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListCustomerRepricingConfigs(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::channel::v1::CustomerRepricingConfig>(std::move(span), @@ -368,7 +368,7 @@ CloudChannelServiceTracingConnection::ListChannelPartnerRepricingConfigs( auto span = internal::MakeSpan( "channel_v1::CloudChannelServiceConnection::" "ListChannelPartnerRepricingConfigs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListChannelPartnerRepricingConfigs(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::channel::v1::ChannelPartnerRepricingConfig>( @@ -416,7 +416,7 @@ CloudChannelServiceTracingConnection::ListSkuGroups( google::cloud::channel::v1::ListSkuGroupsRequest request) { auto span = internal::MakeSpan( "channel_v1::CloudChannelServiceConnection::ListSkuGroups"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListSkuGroups(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -427,7 +427,7 @@ CloudChannelServiceTracingConnection::ListSkuGroupBillableSkus( google::cloud::channel::v1::ListSkuGroupBillableSkusRequest request) { auto span = internal::MakeSpan( "channel_v1::CloudChannelServiceConnection::ListSkuGroupBillableSkus"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListSkuGroupBillableSkus(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::channel::v1::BillableSku>(std::move(span), std::move(sr)); @@ -447,7 +447,7 @@ CloudChannelServiceTracingConnection::ListProducts( google::cloud::channel::v1::ListProductsRequest request) { auto span = internal::MakeSpan( "channel_v1::CloudChannelServiceConnection::ListProducts"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListProducts(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -458,7 +458,7 @@ CloudChannelServiceTracingConnection::ListSkus( google::cloud::channel::v1::ListSkusRequest request) { auto span = internal::MakeSpan("channel_v1::CloudChannelServiceConnection::ListSkus"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListSkus(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -469,7 +469,7 @@ CloudChannelServiceTracingConnection::ListOffers( google::cloud::channel::v1::ListOffersRequest request) { auto span = internal::MakeSpan( "channel_v1::CloudChannelServiceConnection::ListOffers"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListOffers(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -480,7 +480,7 @@ CloudChannelServiceTracingConnection::ListPurchasableSkus( google::cloud::channel::v1::ListPurchasableSkusRequest request) { auto span = internal::MakeSpan( "channel_v1::CloudChannelServiceConnection::ListPurchasableSkus"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListPurchasableSkus(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::channel::v1::PurchasableSku>(std::move(span), @@ -492,7 +492,7 @@ CloudChannelServiceTracingConnection::ListPurchasableOffers( google::cloud::channel::v1::ListPurchasableOffersRequest request) { auto span = internal::MakeSpan( "channel_v1::CloudChannelServiceConnection::ListPurchasableOffers"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListPurchasableOffers(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::channel::v1::PurchasableOffer>(std::move(span), @@ -533,7 +533,7 @@ StreamRange CloudChannelServiceTracingConnection::ListSubscribers( google::cloud::channel::v1::ListSubscribersRequest request) { auto span = internal::MakeSpan( "channel_v1::CloudChannelServiceConnection::ListSubscribers"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListSubscribers(std::move(request)); return internal::MakeTracedStreamRange(std::move(span), std::move(sr)); @@ -544,7 +544,7 @@ CloudChannelServiceTracingConnection::ListEntitlementChanges( google::cloud::channel::v1::ListEntitlementChangesRequest request) { auto span = internal::MakeSpan( "channel_v1::CloudChannelServiceConnection::ListEntitlementChanges"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListEntitlementChanges(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::channel::v1::EntitlementChange>(std::move(span), diff --git a/google/cloud/channel/v1/internal/cloud_channel_tracing_stub.cc b/google/cloud/channel/v1/internal/cloud_channel_tracing_stub.cc index 507db4b83fe9..d669439c643b 100644 --- a/google/cloud/channel/v1/internal/cloud_channel_tracing_stub.cc +++ b/google/cloud/channel/v1/internal/cloud_channel_tracing_stub.cc @@ -123,10 +123,8 @@ CloudChannelServiceTracingStub::AsyncProvisionCloudIdentity( google::cloud::channel::v1::ProvisionCloudIdentityRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.channel.v1.CloudChannelService", "ProvisionCloudIdentity"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncProvisionCloudIdentity(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -186,10 +184,8 @@ CloudChannelServiceTracingStub::AsyncCreateEntitlement( google::cloud::channel::v1::CreateEntitlementRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.channel.v1.CloudChannelService", "CreateEntitlement"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateEntitlement(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -201,10 +197,8 @@ CloudChannelServiceTracingStub::AsyncChangeParameters( google::cloud::channel::v1::ChangeParametersRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.channel.v1.CloudChannelService", "ChangeParameters"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncChangeParameters(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -216,10 +210,8 @@ CloudChannelServiceTracingStub::AsyncChangeRenewalSettings( google::cloud::channel::v1::ChangeRenewalSettingsRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.channel.v1.CloudChannelService", "ChangeRenewalSettings"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncChangeRenewalSettings(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -231,10 +223,8 @@ CloudChannelServiceTracingStub::AsyncChangeOffer( google::cloud::channel::v1::ChangeOfferRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.channel.v1.CloudChannelService", "ChangeOffer"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncChangeOffer(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -246,10 +236,8 @@ CloudChannelServiceTracingStub::AsyncStartPaidService( google::cloud::channel::v1::StartPaidServiceRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.channel.v1.CloudChannelService", "StartPaidService"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncStartPaidService(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -261,10 +249,8 @@ CloudChannelServiceTracingStub::AsyncSuspendEntitlement( google::cloud::channel::v1::SuspendEntitlementRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.channel.v1.CloudChannelService", "SuspendEntitlement"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncSuspendEntitlement(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -276,10 +262,8 @@ CloudChannelServiceTracingStub::AsyncCancelEntitlement( google::cloud::channel::v1::CancelEntitlementRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.channel.v1.CloudChannelService", "CancelEntitlement"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelEntitlement(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -291,10 +275,8 @@ CloudChannelServiceTracingStub::AsyncActivateEntitlement( google::cloud::channel::v1::ActivateEntitlementRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.channel.v1.CloudChannelService", "ActivateEntitlement"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncActivateEntitlement(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -306,10 +288,8 @@ CloudChannelServiceTracingStub::AsyncTransferEntitlements( google::cloud::channel::v1::TransferEntitlementsRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.channel.v1.CloudChannelService", "TransferEntitlements"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncTransferEntitlements(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -323,10 +303,8 @@ CloudChannelServiceTracingStub::AsyncTransferEntitlementsToGoogle( auto span = internal::MakeSpanGrpc("google.cloud.channel.v1.CloudChannelService", "TransferEntitlementsToGoogle"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncTransferEntitlementsToGoogle(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -692,10 +670,8 @@ CloudChannelServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -706,10 +682,8 @@ future CloudChannelServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/cloudbuild/v1/internal/cloud_build_tracing_connection.cc b/google/cloud/cloudbuild/v1/internal/cloud_build_tracing_connection.cc index 5e0b1924e59b..fef241ecd84f 100644 --- a/google/cloud/cloudbuild/v1/internal/cloud_build_tracing_connection.cc +++ b/google/cloud/cloudbuild/v1/internal/cloud_build_tracing_connection.cc @@ -37,7 +37,7 @@ CloudBuildTracingConnection::CreateBuild( google::devtools::cloudbuild::v1::CreateBuildRequest const& request) { auto span = internal::MakeSpan("cloudbuild_v1::CloudBuildConnection::CreateBuild"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateBuild(request)); } @@ -55,7 +55,7 @@ CloudBuildTracingConnection::ListBuilds( google::devtools::cloudbuild::v1::ListBuildsRequest request) { auto span = internal::MakeSpan("cloudbuild_v1::CloudBuildConnection::ListBuilds"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListBuilds(std::move(request)); return internal::MakeTracedStreamRange< google::devtools::cloudbuild::v1::Build>(std::move(span), std::move(sr)); @@ -75,7 +75,7 @@ CloudBuildTracingConnection::RetryBuild( google::devtools::cloudbuild::v1::RetryBuildRequest const& request) { auto span = internal::MakeSpan("cloudbuild_v1::CloudBuildConnection::RetryBuild"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RetryBuild(request)); } @@ -84,7 +84,7 @@ CloudBuildTracingConnection::ApproveBuild( google::devtools::cloudbuild::v1::ApproveBuildRequest const& request) { auto span = internal::MakeSpan("cloudbuild_v1::CloudBuildConnection::ApproveBuild"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ApproveBuild(request)); } @@ -112,7 +112,7 @@ CloudBuildTracingConnection::ListBuildTriggers( google::devtools::cloudbuild::v1::ListBuildTriggersRequest request) { auto span = internal::MakeSpan( "cloudbuild_v1::CloudBuildConnection::ListBuildTriggers"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListBuildTriggers(std::move(request)); return internal::MakeTracedStreamRange< google::devtools::cloudbuild::v1::BuildTrigger>(std::move(span), @@ -143,7 +143,7 @@ CloudBuildTracingConnection::RunBuildTrigger( google::devtools::cloudbuild::v1::RunBuildTriggerRequest const& request) { auto span = internal::MakeSpan( "cloudbuild_v1::CloudBuildConnection::RunBuildTrigger"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RunBuildTrigger(request)); } @@ -162,7 +162,7 @@ CloudBuildTracingConnection::CreateWorkerPool( google::devtools::cloudbuild::v1::CreateWorkerPoolRequest const& request) { auto span = internal::MakeSpan( "cloudbuild_v1::CloudBuildConnection::CreateWorkerPool"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateWorkerPool(request)); } @@ -181,7 +181,7 @@ CloudBuildTracingConnection::DeleteWorkerPool( google::devtools::cloudbuild::v1::DeleteWorkerPoolRequest const& request) { auto span = internal::MakeSpan( "cloudbuild_v1::CloudBuildConnection::DeleteWorkerPool"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteWorkerPool(request)); } @@ -190,7 +190,7 @@ CloudBuildTracingConnection::UpdateWorkerPool( google::devtools::cloudbuild::v1::UpdateWorkerPoolRequest const& request) { auto span = internal::MakeSpan( "cloudbuild_v1::CloudBuildConnection::UpdateWorkerPool"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateWorkerPool(request)); } @@ -199,7 +199,7 @@ CloudBuildTracingConnection::ListWorkerPools( google::devtools::cloudbuild::v1::ListWorkerPoolsRequest request) { auto span = internal::MakeSpan( "cloudbuild_v1::CloudBuildConnection::ListWorkerPools"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListWorkerPools(std::move(request)); return internal::MakeTracedStreamRange< google::devtools::cloudbuild::v1::WorkerPool>(std::move(span), diff --git a/google/cloud/cloudbuild/v1/internal/cloud_build_tracing_stub.cc b/google/cloud/cloudbuild/v1/internal/cloud_build_tracing_stub.cc index a4cec8b5412d..2470fdcc3e7e 100644 --- a/google/cloud/cloudbuild/v1/internal/cloud_build_tracing_stub.cc +++ b/google/cloud/cloudbuild/v1/internal/cloud_build_tracing_stub.cc @@ -37,10 +37,8 @@ CloudBuildTracingStub::AsyncCreateBuild( google::devtools::cloudbuild::v1::CreateBuildRequest const& request) { auto span = internal::MakeSpanGrpc("google.devtools.cloudbuild.v1.CloudBuild", "CreateBuild"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateBuild(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -87,10 +85,8 @@ CloudBuildTracingStub::AsyncRetryBuild( google::devtools::cloudbuild::v1::RetryBuildRequest const& request) { auto span = internal::MakeSpanGrpc("google.devtools.cloudbuild.v1.CloudBuild", "RetryBuild"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncRetryBuild(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -102,10 +98,8 @@ CloudBuildTracingStub::AsyncApproveBuild( google::devtools::cloudbuild::v1::ApproveBuildRequest const& request) { auto span = internal::MakeSpanGrpc("google.devtools.cloudbuild.v1.CloudBuild", "ApproveBuild"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncApproveBuild(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -179,10 +173,8 @@ CloudBuildTracingStub::AsyncRunBuildTrigger( google::devtools::cloudbuild::v1::RunBuildTriggerRequest const& request) { auto span = internal::MakeSpanGrpc("google.devtools.cloudbuild.v1.CloudBuild", "RunBuildTrigger"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncRunBuildTrigger(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -207,10 +199,8 @@ CloudBuildTracingStub::AsyncCreateWorkerPool( google::devtools::cloudbuild::v1::CreateWorkerPoolRequest const& request) { auto span = internal::MakeSpanGrpc("google.devtools.cloudbuild.v1.CloudBuild", "CreateWorkerPool"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateWorkerPool(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -234,10 +224,8 @@ CloudBuildTracingStub::AsyncDeleteWorkerPool( google::devtools::cloudbuild::v1::DeleteWorkerPoolRequest const& request) { auto span = internal::MakeSpanGrpc("google.devtools.cloudbuild.v1.CloudBuild", "DeleteWorkerPool"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteWorkerPool(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -249,10 +237,8 @@ CloudBuildTracingStub::AsyncUpdateWorkerPool( google::devtools::cloudbuild::v1::UpdateWorkerPoolRequest const& request) { auto span = internal::MakeSpanGrpc("google.devtools.cloudbuild.v1.CloudBuild", "UpdateWorkerPool"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateWorkerPool(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -276,10 +262,8 @@ CloudBuildTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -290,10 +274,8 @@ future CloudBuildTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/cloudbuild/v2/internal/repository_manager_tracing_connection.cc b/google/cloud/cloudbuild/v2/internal/repository_manager_tracing_connection.cc index 80d70d72e8b2..ff94aa24a9e5 100644 --- a/google/cloud/cloudbuild/v2/internal/repository_manager_tracing_connection.cc +++ b/google/cloud/cloudbuild/v2/internal/repository_manager_tracing_connection.cc @@ -37,7 +37,7 @@ RepositoryManagerTracingConnection::CreateConnection( google::devtools::cloudbuild::v2::CreateConnectionRequest const& request) { auto span = internal::MakeSpan( "cloudbuild_v2::RepositoryManagerConnection::CreateConnection"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateConnection(request)); } @@ -55,7 +55,7 @@ RepositoryManagerTracingConnection::ListConnections( google::devtools::cloudbuild::v2::ListConnectionsRequest request) { auto span = internal::MakeSpan( "cloudbuild_v2::RepositoryManagerConnection::ListConnections"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListConnections(std::move(request)); return internal::MakeTracedStreamRange< google::devtools::cloudbuild::v2::Connection>(std::move(span), @@ -67,7 +67,7 @@ RepositoryManagerTracingConnection::UpdateConnection( google::devtools::cloudbuild::v2::UpdateConnectionRequest const& request) { auto span = internal::MakeSpan( "cloudbuild_v2::RepositoryManagerConnection::UpdateConnection"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateConnection(request)); } @@ -76,7 +76,7 @@ RepositoryManagerTracingConnection::DeleteConnection( google::devtools::cloudbuild::v2::DeleteConnectionRequest const& request) { auto span = internal::MakeSpan( "cloudbuild_v2::RepositoryManagerConnection::DeleteConnection"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteConnection(request)); } @@ -85,7 +85,7 @@ RepositoryManagerTracingConnection::CreateRepository( google::devtools::cloudbuild::v2::CreateRepositoryRequest const& request) { auto span = internal::MakeSpan( "cloudbuild_v2::RepositoryManagerConnection::CreateRepository"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateRepository(request)); } @@ -96,7 +96,7 @@ RepositoryManagerTracingConnection::BatchCreateRepositories( request) { auto span = internal::MakeSpan( "cloudbuild_v2::RepositoryManagerConnection::BatchCreateRepositories"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->BatchCreateRepositories(request)); } @@ -115,7 +115,7 @@ RepositoryManagerTracingConnection::ListRepositories( google::devtools::cloudbuild::v2::ListRepositoriesRequest request) { auto span = internal::MakeSpan( "cloudbuild_v2::RepositoryManagerConnection::ListRepositories"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListRepositories(std::move(request)); return internal::MakeTracedStreamRange< google::devtools::cloudbuild::v2::Repository>(std::move(span), @@ -127,7 +127,7 @@ RepositoryManagerTracingConnection::DeleteRepository( google::devtools::cloudbuild::v2::DeleteRepositoryRequest const& request) { auto span = internal::MakeSpan( "cloudbuild_v2::RepositoryManagerConnection::DeleteRepository"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteRepository(request)); } @@ -156,7 +156,7 @@ RepositoryManagerTracingConnection::FetchLinkableRepositories( request) { auto span = internal::MakeSpan( "cloudbuild_v2::RepositoryManagerConnection::FetchLinkableRepositories"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->FetchLinkableRepositories(std::move(request)); return internal::MakeTracedStreamRange< google::devtools::cloudbuild::v2::Repository>(std::move(span), diff --git a/google/cloud/cloudbuild/v2/internal/repository_manager_tracing_stub.cc b/google/cloud/cloudbuild/v2/internal/repository_manager_tracing_stub.cc index b367bad8edb0..96aaecdb8269 100644 --- a/google/cloud/cloudbuild/v2/internal/repository_manager_tracing_stub.cc +++ b/google/cloud/cloudbuild/v2/internal/repository_manager_tracing_stub.cc @@ -37,10 +37,8 @@ RepositoryManagerTracingStub::AsyncCreateConnection( google::devtools::cloudbuild::v2::CreateConnectionRequest const& request) { auto span = internal::MakeSpanGrpc( "google.devtools.cloudbuild.v2.RepositoryManager", "CreateConnection"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateConnection(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -76,10 +74,8 @@ RepositoryManagerTracingStub::AsyncUpdateConnection( google::devtools::cloudbuild::v2::UpdateConnectionRequest const& request) { auto span = internal::MakeSpanGrpc( "google.devtools.cloudbuild.v2.RepositoryManager", "UpdateConnection"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateConnection(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -91,10 +87,8 @@ RepositoryManagerTracingStub::AsyncDeleteConnection( google::devtools::cloudbuild::v2::DeleteConnectionRequest const& request) { auto span = internal::MakeSpanGrpc( "google.devtools.cloudbuild.v2.RepositoryManager", "DeleteConnection"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteConnection(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -106,10 +100,8 @@ RepositoryManagerTracingStub::AsyncCreateRepository( google::devtools::cloudbuild::v2::CreateRepositoryRequest const& request) { auto span = internal::MakeSpanGrpc( "google.devtools.cloudbuild.v2.RepositoryManager", "CreateRepository"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateRepository(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -123,10 +115,8 @@ RepositoryManagerTracingStub::AsyncBatchCreateRepositories( auto span = internal::MakeSpanGrpc("google.devtools.cloudbuild.v2.RepositoryManager", "BatchCreateRepositories"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncBatchCreateRepositories(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -162,10 +152,8 @@ RepositoryManagerTracingStub::AsyncDeleteRepository( google::devtools::cloudbuild::v2::DeleteRepositoryRequest const& request) { auto span = internal::MakeSpanGrpc( "google.devtools.cloudbuild.v2.RepositoryManager", "DeleteRepository"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteRepository(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -228,10 +216,8 @@ RepositoryManagerTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -242,10 +228,8 @@ future RepositoryManagerTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_tracing_connection.cc b/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_tracing_connection.cc index 8e4076101ed0..447ce50a4dda 100644 --- a/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_tracing_connection.cc +++ b/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_tracing_connection.cc @@ -43,7 +43,7 @@ ConsumerProcurementServiceTracingConnection::PlaceOrder( auto span = internal::MakeSpan( "commerce_consumer_procurement_v1::ConsumerProcurementServiceConnection::" "PlaceOrder"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PlaceOrder(request)); } @@ -65,7 +65,7 @@ ConsumerProcurementServiceTracingConnection::ListOrders( auto span = internal::MakeSpan( "commerce_consumer_procurement_v1::ConsumerProcurementServiceConnection::" "ListOrders"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListOrders(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::commerce::consumer::procurement::v1::Order>( diff --git a/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_tracing_stub.cc b/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_tracing_stub.cc index 04ab01461af7..49319f779ac6 100644 --- a/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_tracing_stub.cc +++ b/google/cloud/commerce/consumer/procurement/v1/internal/consumer_procurement_tracing_stub.cc @@ -41,10 +41,8 @@ ConsumerProcurementServiceTracingStub::AsyncPlaceOrder( "google.cloud.commerce.consumer.procurement.v1." "ConsumerProcurementService", "PlaceOrder"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncPlaceOrder(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -85,10 +83,8 @@ ConsumerProcurementServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -99,10 +95,8 @@ future ConsumerProcurementServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/composer/v1/internal/environments_tracing_connection.cc b/google/cloud/composer/v1/internal/environments_tracing_connection.cc index d0d6779a3602..ffa413a5dbd3 100644 --- a/google/cloud/composer/v1/internal/environments_tracing_connection.cc +++ b/google/cloud/composer/v1/internal/environments_tracing_connection.cc @@ -39,7 +39,7 @@ EnvironmentsTracingConnection::CreateEnvironment( CreateEnvironmentRequest const& request) { auto span = internal::MakeSpan( "composer_v1::EnvironmentsConnection::CreateEnvironment"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateEnvironment(request)); } @@ -59,7 +59,7 @@ EnvironmentsTracingConnection::ListEnvironments( request) { auto span = internal::MakeSpan( "composer_v1::EnvironmentsConnection::ListEnvironments"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListEnvironments(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::orchestration::airflow::service::v1::Environment>( @@ -73,7 +73,7 @@ EnvironmentsTracingConnection::UpdateEnvironment( UpdateEnvironmentRequest const& request) { auto span = internal::MakeSpan( "composer_v1::EnvironmentsConnection::UpdateEnvironment"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateEnvironment(request)); } @@ -84,7 +84,7 @@ EnvironmentsTracingConnection::DeleteEnvironment( DeleteEnvironmentRequest const& request) { auto span = internal::MakeSpan( "composer_v1::EnvironmentsConnection::DeleteEnvironment"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteEnvironment(request)); } @@ -128,7 +128,7 @@ EnvironmentsTracingConnection::SaveSnapshot( SaveSnapshotRequest const& request) { auto span = internal::MakeSpan("composer_v1::EnvironmentsConnection::SaveSnapshot"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SaveSnapshot(request)); } @@ -139,7 +139,7 @@ EnvironmentsTracingConnection::LoadSnapshot( LoadSnapshotRequest const& request) { auto span = internal::MakeSpan("composer_v1::EnvironmentsConnection::LoadSnapshot"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->LoadSnapshot(request)); } @@ -150,7 +150,7 @@ EnvironmentsTracingConnection::DatabaseFailover( DatabaseFailoverRequest const& request) { auto span = internal::MakeSpan( "composer_v1::EnvironmentsConnection::DatabaseFailover"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DatabaseFailover(request)); } diff --git a/google/cloud/composer/v1/internal/environments_tracing_stub.cc b/google/cloud/composer/v1/internal/environments_tracing_stub.cc index bfb69202b8f4..201ccaeea2b4 100644 --- a/google/cloud/composer/v1/internal/environments_tracing_stub.cc +++ b/google/cloud/composer/v1/internal/environments_tracing_stub.cc @@ -39,10 +39,8 @@ EnvironmentsTracingStub::AsyncCreateEnvironment( auto span = internal::MakeSpanGrpc( "google.cloud.orchestration.airflow.service.v1.Environments", "CreateEnvironment"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateEnvironment(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -85,10 +83,8 @@ EnvironmentsTracingStub::AsyncUpdateEnvironment( auto span = internal::MakeSpanGrpc( "google.cloud.orchestration.airflow.service.v1.Environments", "UpdateEnvironment"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateEnvironment(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -102,10 +98,8 @@ EnvironmentsTracingStub::AsyncDeleteEnvironment( auto span = internal::MakeSpanGrpc( "google.cloud.orchestration.airflow.service.v1.Environments", "DeleteEnvironment"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteEnvironment(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -164,10 +158,8 @@ EnvironmentsTracingStub::AsyncSaveSnapshot( auto span = internal::MakeSpanGrpc( "google.cloud.orchestration.airflow.service.v1.Environments", "SaveSnapshot"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncSaveSnapshot(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -181,10 +173,8 @@ EnvironmentsTracingStub::AsyncLoadSnapshot( auto span = internal::MakeSpanGrpc( "google.cloud.orchestration.airflow.service.v1.Environments", "LoadSnapshot"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncLoadSnapshot(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -198,10 +188,8 @@ EnvironmentsTracingStub::AsyncDatabaseFailover( auto span = internal::MakeSpanGrpc( "google.cloud.orchestration.airflow.service.v1.Environments", "DatabaseFailover"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDatabaseFailover(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -228,10 +216,8 @@ EnvironmentsTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -242,10 +228,8 @@ future EnvironmentsTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/composer/v1/internal/image_versions_tracing_connection.cc b/google/cloud/composer/v1/internal/image_versions_tracing_connection.cc index 8fcbeb6cf1dd..344462779e08 100644 --- a/google/cloud/composer/v1/internal/image_versions_tracing_connection.cc +++ b/google/cloud/composer/v1/internal/image_versions_tracing_connection.cc @@ -38,7 +38,7 @@ ImageVersionsTracingConnection::ListImageVersions( request) { auto span = internal::MakeSpan( "composer_v1::ImageVersionsConnection::ListImageVersions"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListImageVersions(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::orchestration::airflow::service::v1::ImageVersion>( diff --git a/google/cloud/compute/accelerator_types/v1/internal/accelerator_types_tracing_connection.cc b/google/cloud/compute/accelerator_types/v1/internal/accelerator_types_tracing_connection.cc index 195c4d85dce5..454635b02513 100644 --- a/google/cloud/compute/accelerator_types/v1/internal/accelerator_types_tracing_connection.cc +++ b/google/cloud/compute/accelerator_types/v1/internal/accelerator_types_tracing_connection.cc @@ -41,7 +41,7 @@ AcceleratorTypesTracingConnection::AggregatedListAcceleratorTypes( auto span = internal::MakeSpan( "compute_accelerator_types_v1::AcceleratorTypesConnection::" "AggregatedListAcceleratorTypes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->AggregatedListAcceleratorTypes(std::move(request)); return internal::MakeTracedStreamRange< std::pairListAcceleratorTypes(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::AcceleratorType>(std::move(span), diff --git a/google/cloud/compute/addresses/v1/internal/addresses_tracing_connection.cc b/google/cloud/compute/addresses/v1/internal/addresses_tracing_connection.cc index e1391281d439..3066423f1ea4 100644 --- a/google/cloud/compute/addresses/v1/internal/addresses_tracing_connection.cc +++ b/google/cloud/compute/addresses/v1/internal/addresses_tracing_connection.cc @@ -39,7 +39,7 @@ AddressesTracingConnection::AggregatedListAddresses( request) { auto span = internal::MakeSpan( "compute_addresses_v1::AddressesConnection::AggregatedListAddresses"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->AggregatedListAddresses(std::move(request)); return internal::MakeTracedStreamRange>( @@ -52,7 +52,7 @@ AddressesTracingConnection::DeleteAddress( request) { auto span = internal::MakeSpan( "compute_addresses_v1::AddressesConnection::DeleteAddress"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteAddress(request)); } @@ -72,7 +72,7 @@ AddressesTracingConnection::InsertAddress( request) { auto span = internal::MakeSpan( "compute_addresses_v1::AddressesConnection::InsertAddress"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertAddress(request)); } @@ -81,7 +81,7 @@ AddressesTracingConnection::ListAddresses( google::cloud::cpp::compute::addresses::v1::ListAddressesRequest request) { auto span = internal::MakeSpan( "compute_addresses_v1::AddressesConnection::ListAddresses"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListAddresses(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::Address>(std::move(span), std::move(sr)); @@ -92,7 +92,7 @@ AddressesTracingConnection::Move( google::cloud::cpp::compute::addresses::v1::MoveRequest const& request) { auto span = internal::MakeSpan("compute_addresses_v1::AddressesConnection::Move"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->Move(request)); } @@ -102,7 +102,7 @@ AddressesTracingConnection::SetLabels( request) { auto span = internal::MakeSpan( "compute_addresses_v1::AddressesConnection::SetLabels"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetLabels(request)); } diff --git a/google/cloud/compute/autoscalers/v1/internal/autoscalers_tracing_connection.cc b/google/cloud/compute/autoscalers/v1/internal/autoscalers_tracing_connection.cc index 78c55be17f14..ce722de460c8 100644 --- a/google/cloud/compute/autoscalers/v1/internal/autoscalers_tracing_connection.cc +++ b/google/cloud/compute/autoscalers/v1/internal/autoscalers_tracing_connection.cc @@ -40,7 +40,7 @@ AutoscalersTracingConnection::AggregatedListAutoscalers( auto span = internal::MakeSpan( "compute_autoscalers_v1::AutoscalersConnection::" "AggregatedListAutoscalers"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->AggregatedListAutoscalers(std::move(request)); return internal::MakeTracedStreamRange>( @@ -53,7 +53,7 @@ AutoscalersTracingConnection::DeleteAutoscaler( request) { auto span = internal::MakeSpan( "compute_autoscalers_v1::AutoscalersConnection::DeleteAutoscaler"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteAutoscaler(request)); } @@ -73,7 +73,7 @@ AutoscalersTracingConnection::InsertAutoscaler( request) { auto span = internal::MakeSpan( "compute_autoscalers_v1::AutoscalersConnection::InsertAutoscaler"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertAutoscaler(request)); } @@ -83,7 +83,7 @@ AutoscalersTracingConnection::ListAutoscalers( request) { auto span = internal::MakeSpan( "compute_autoscalers_v1::AutoscalersConnection::ListAutoscalers"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListAutoscalers(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::Autoscaler>(std::move(span), @@ -96,7 +96,7 @@ AutoscalersTracingConnection::PatchAutoscaler( request) { auto span = internal::MakeSpan( "compute_autoscalers_v1::AutoscalersConnection::PatchAutoscaler"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchAutoscaler(request)); } @@ -106,7 +106,7 @@ AutoscalersTracingConnection::UpdateAutoscaler( request) { auto span = internal::MakeSpan( "compute_autoscalers_v1::AutoscalersConnection::UpdateAutoscaler"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateAutoscaler(request)); } diff --git a/google/cloud/compute/backend_buckets/v1/internal/backend_buckets_tracing_connection.cc b/google/cloud/compute/backend_buckets/v1/internal/backend_buckets_tracing_connection.cc index 15ca02599efa..ee88fff4a9a7 100644 --- a/google/cloud/compute/backend_buckets/v1/internal/backend_buckets_tracing_connection.cc +++ b/google/cloud/compute/backend_buckets/v1/internal/backend_buckets_tracing_connection.cc @@ -38,7 +38,7 @@ BackendBucketsTracingConnection::AddSignedUrlKey( AddSignedUrlKeyRequest const& request) { auto span = internal::MakeSpan( "compute_backend_buckets_v1::BackendBucketsConnection::AddSignedUrlKey"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->AddSignedUrlKey(request)); } @@ -49,7 +49,7 @@ BackendBucketsTracingConnection::DeleteBackendBucket( auto span = internal::MakeSpan( "compute_backend_buckets_v1::BackendBucketsConnection::" "DeleteBackendBucket"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteBackendBucket(request)); } @@ -61,7 +61,7 @@ BackendBucketsTracingConnection::DeleteSignedUrlKey( auto span = internal::MakeSpan( "compute_backend_buckets_v1::BackendBucketsConnection::" "DeleteSignedUrlKey"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteSignedUrlKey(request)); } @@ -83,7 +83,7 @@ BackendBucketsTracingConnection::InsertBackendBucket( auto span = internal::MakeSpan( "compute_backend_buckets_v1::BackendBucketsConnection::" "InsertBackendBucket"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertBackendBucket(request)); } @@ -95,7 +95,7 @@ BackendBucketsTracingConnection::ListBackendBuckets( auto span = internal::MakeSpan( "compute_backend_buckets_v1::BackendBucketsConnection::" "ListBackendBuckets"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListBackendBuckets(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::BackendBucket>(std::move(span), @@ -109,7 +109,7 @@ BackendBucketsTracingConnection::PatchBackendBucket( auto span = internal::MakeSpan( "compute_backend_buckets_v1::BackendBucketsConnection::" "PatchBackendBucket"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchBackendBucket(request)); } @@ -121,7 +121,7 @@ BackendBucketsTracingConnection::SetEdgeSecurityPolicy( auto span = internal::MakeSpan( "compute_backend_buckets_v1::BackendBucketsConnection::" "SetEdgeSecurityPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetEdgeSecurityPolicy(request)); } @@ -133,7 +133,7 @@ BackendBucketsTracingConnection::UpdateBackendBucket( auto span = internal::MakeSpan( "compute_backend_buckets_v1::BackendBucketsConnection::" "UpdateBackendBucket"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateBackendBucket(request)); } diff --git a/google/cloud/compute/backend_services/v1/internal/backend_services_tracing_connection.cc b/google/cloud/compute/backend_services/v1/internal/backend_services_tracing_connection.cc index 69df29ced4f9..1ad7272ec69d 100644 --- a/google/cloud/compute/backend_services/v1/internal/backend_services_tracing_connection.cc +++ b/google/cloud/compute/backend_services/v1/internal/backend_services_tracing_connection.cc @@ -40,7 +40,7 @@ BackendServicesTracingConnection::AddSignedUrlKey( auto span = internal::MakeSpan( "compute_backend_services_v1::BackendServicesConnection::" "AddSignedUrlKey"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->AddSignedUrlKey(request)); } @@ -52,7 +52,7 @@ BackendServicesTracingConnection::AggregatedListBackendServices( auto span = internal::MakeSpan( "compute_backend_services_v1::BackendServicesConnection::" "AggregatedListBackendServices"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->AggregatedListBackendServices(std::move(request)); return internal::MakeTracedStreamRange>( @@ -66,7 +66,7 @@ BackendServicesTracingConnection::DeleteBackendService( auto span = internal::MakeSpan( "compute_backend_services_v1::BackendServicesConnection::" "DeleteBackendService"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteBackendService(request)); } @@ -78,7 +78,7 @@ BackendServicesTracingConnection::DeleteSignedUrlKey( auto span = internal::MakeSpan( "compute_backend_services_v1::BackendServicesConnection::" "DeleteSignedUrlKey"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteSignedUrlKey(request)); } @@ -121,7 +121,7 @@ BackendServicesTracingConnection::InsertBackendService( auto span = internal::MakeSpan( "compute_backend_services_v1::BackendServicesConnection::" "InsertBackendService"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertBackendService(request)); } @@ -133,7 +133,7 @@ BackendServicesTracingConnection::ListBackendServices( auto span = internal::MakeSpan( "compute_backend_services_v1::BackendServicesConnection::" "ListBackendServices"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListBackendServices(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::BackendService>(std::move(span), @@ -146,7 +146,7 @@ BackendServicesTracingConnection::ListUsable( request) { auto span = internal::MakeSpan( "compute_backend_services_v1::BackendServicesConnection::ListUsable"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListUsable(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::BackendService>(std::move(span), @@ -160,7 +160,7 @@ BackendServicesTracingConnection::PatchBackendService( auto span = internal::MakeSpan( "compute_backend_services_v1::BackendServicesConnection::" "PatchBackendService"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchBackendService(request)); } @@ -172,7 +172,7 @@ BackendServicesTracingConnection::SetEdgeSecurityPolicy( auto span = internal::MakeSpan( "compute_backend_services_v1::BackendServicesConnection::" "SetEdgeSecurityPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetEdgeSecurityPolicy(request)); } @@ -194,7 +194,7 @@ BackendServicesTracingConnection::SetSecurityPolicy( auto span = internal::MakeSpan( "compute_backend_services_v1::BackendServicesConnection::" "SetSecurityPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetSecurityPolicy(request)); } @@ -205,7 +205,7 @@ BackendServicesTracingConnection::UpdateBackendService( auto span = internal::MakeSpan( "compute_backend_services_v1::BackendServicesConnection::" "UpdateBackendService"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateBackendService(request)); } diff --git a/google/cloud/compute/disk_types/v1/internal/disk_types_tracing_connection.cc b/google/cloud/compute/disk_types/v1/internal/disk_types_tracing_connection.cc index 1e6c848d3cdb..b7df9478d293 100644 --- a/google/cloud/compute/disk_types/v1/internal/disk_types_tracing_connection.cc +++ b/google/cloud/compute/disk_types/v1/internal/disk_types_tracing_connection.cc @@ -39,7 +39,7 @@ DiskTypesTracingConnection::AggregatedListDiskTypes( request) { auto span = internal::MakeSpan( "compute_disk_types_v1::DiskTypesConnection::AggregatedListDiskTypes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->AggregatedListDiskTypes(std::move(request)); return internal::MakeTracedStreamRange>( @@ -61,7 +61,7 @@ DiskTypesTracingConnection::ListDiskTypes( google::cloud::cpp::compute::disk_types::v1::ListDiskTypesRequest request) { auto span = internal::MakeSpan( "compute_disk_types_v1::DiskTypesConnection::ListDiskTypes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListDiskTypes(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::DiskType>(std::move(span), diff --git a/google/cloud/compute/disks/v1/internal/disks_tracing_connection.cc b/google/cloud/compute/disks/v1/internal/disks_tracing_connection.cc index 75b79c6dc76e..89b4c9cb3d47 100644 --- a/google/cloud/compute/disks/v1/internal/disks_tracing_connection.cc +++ b/google/cloud/compute/disks/v1/internal/disks_tracing_connection.cc @@ -38,7 +38,7 @@ DisksTracingConnection::AddResourcePolicies( request) { auto span = internal::MakeSpan( "compute_disks_v1::DisksConnection::AddResourcePolicies"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->AddResourcePolicies(request)); } @@ -50,7 +50,7 @@ DisksTracingConnection::AggregatedListDisks( request) { auto span = internal::MakeSpan( "compute_disks_v1::DisksConnection::AggregatedListDisks"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->AggregatedListDisks(std::move(request)); return internal::MakeTracedStreamRange< std::pair>( @@ -62,7 +62,7 @@ DisksTracingConnection::BulkInsert( google::cloud::cpp::compute::disks::v1::BulkInsertRequest const& request) { auto span = internal::MakeSpan("compute_disks_v1::DisksConnection::BulkInsert"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->BulkInsert(request)); } @@ -72,7 +72,7 @@ DisksTracingConnection::CreateSnapshot( request) { auto span = internal::MakeSpan("compute_disks_v1::DisksConnection::CreateSnapshot"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateSnapshot(request)); } @@ -81,7 +81,7 @@ DisksTracingConnection::DeleteDisk( google::cloud::cpp::compute::disks::v1::DeleteDiskRequest const& request) { auto span = internal::MakeSpan("compute_disks_v1::DisksConnection::DeleteDisk"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteDisk(request)); } @@ -107,7 +107,7 @@ DisksTracingConnection::InsertDisk( google::cloud::cpp::compute::disks::v1::InsertDiskRequest const& request) { auto span = internal::MakeSpan("compute_disks_v1::DisksConnection::InsertDisk"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertDisk(request)); } @@ -116,7 +116,7 @@ DisksTracingConnection::ListDisks( google::cloud::cpp::compute::disks::v1::ListDisksRequest request) { auto span = internal::MakeSpan("compute_disks_v1::DisksConnection::ListDisks"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListDisks(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -128,7 +128,7 @@ DisksTracingConnection::RemoveResourcePolicies( request) { auto span = internal::MakeSpan( "compute_disks_v1::DisksConnection::RemoveResourcePolicies"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RemoveResourcePolicies(request)); } @@ -137,7 +137,7 @@ future> DisksTracingConnection::Resize( google::cloud::cpp::compute::disks::v1::ResizeRequest const& request) { auto span = internal::MakeSpan("compute_disks_v1::DisksConnection::Resize"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->Resize(request)); } @@ -156,7 +156,7 @@ DisksTracingConnection::SetLabels( google::cloud::cpp::compute::disks::v1::SetLabelsRequest const& request) { auto span = internal::MakeSpan("compute_disks_v1::DisksConnection::SetLabels"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetLabels(request)); } @@ -166,7 +166,7 @@ DisksTracingConnection::StartAsyncReplication( request) { auto span = internal::MakeSpan( "compute_disks_v1::DisksConnection::StartAsyncReplication"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->StartAsyncReplication(request)); } @@ -177,7 +177,7 @@ DisksTracingConnection::StopAsyncReplication( request) { auto span = internal::MakeSpan( "compute_disks_v1::DisksConnection::StopAsyncReplication"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->StopAsyncReplication(request)); } @@ -188,7 +188,7 @@ DisksTracingConnection::StopGroupAsyncReplication( StopGroupAsyncReplicationRequest const& request) { auto span = internal::MakeSpan( "compute_disks_v1::DisksConnection::StopGroupAsyncReplication"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->StopGroupAsyncReplication(request)); } @@ -208,7 +208,7 @@ DisksTracingConnection::UpdateDisk( google::cloud::cpp::compute::disks::v1::UpdateDiskRequest const& request) { auto span = internal::MakeSpan("compute_disks_v1::DisksConnection::UpdateDisk"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateDisk(request)); } diff --git a/google/cloud/compute/external_vpn_gateways/v1/internal/external_vpn_gateways_tracing_connection.cc b/google/cloud/compute/external_vpn_gateways/v1/internal/external_vpn_gateways_tracing_connection.cc index c5edecc25bb3..b07afd038b12 100644 --- a/google/cloud/compute/external_vpn_gateways/v1/internal/external_vpn_gateways_tracing_connection.cc +++ b/google/cloud/compute/external_vpn_gateways/v1/internal/external_vpn_gateways_tracing_connection.cc @@ -42,7 +42,7 @@ ExternalVpnGatewaysTracingConnection::DeleteExternalVpnGateway( auto span = internal::MakeSpan( "compute_external_vpn_gateways_v1::ExternalVpnGatewaysConnection::" "DeleteExternalVpnGateway"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteExternalVpnGateway(request)); } @@ -65,7 +65,7 @@ ExternalVpnGatewaysTracingConnection::InsertExternalVpnGateway( auto span = internal::MakeSpan( "compute_external_vpn_gateways_v1::ExternalVpnGatewaysConnection::" "InsertExternalVpnGateway"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertExternalVpnGateway(request)); } @@ -77,7 +77,7 @@ ExternalVpnGatewaysTracingConnection::ListExternalVpnGateways( auto span = internal::MakeSpan( "compute_external_vpn_gateways_v1::ExternalVpnGatewaysConnection::" "ListExternalVpnGateways"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListExternalVpnGateways(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::ExternalVpnGateway>(std::move(span), @@ -91,7 +91,7 @@ ExternalVpnGatewaysTracingConnection::SetLabels( auto span = internal::MakeSpan( "compute_external_vpn_gateways_v1::ExternalVpnGatewaysConnection::" "SetLabels"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetLabels(request)); } diff --git a/google/cloud/compute/firewall_policies/v1/internal/firewall_policies_tracing_connection.cc b/google/cloud/compute/firewall_policies/v1/internal/firewall_policies_tracing_connection.cc index 4cfc5fe8f707..4b123c5fb6b5 100644 --- a/google/cloud/compute/firewall_policies/v1/internal/firewall_policies_tracing_connection.cc +++ b/google/cloud/compute/firewall_policies/v1/internal/firewall_policies_tracing_connection.cc @@ -40,7 +40,7 @@ FirewallPoliciesTracingConnection::AddAssociation( auto span = internal::MakeSpan( "compute_firewall_policies_v1::FirewallPoliciesConnection::" "AddAssociation"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->AddAssociation(request)); } @@ -50,7 +50,7 @@ FirewallPoliciesTracingConnection::AddRule( request) { auto span = internal::MakeSpan( "compute_firewall_policies_v1::FirewallPoliciesConnection::AddRule"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->AddRule(request)); } @@ -60,7 +60,7 @@ FirewallPoliciesTracingConnection::CloneRules( request) { auto span = internal::MakeSpan( "compute_firewall_policies_v1::FirewallPoliciesConnection::CloneRules"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CloneRules(request)); } @@ -71,7 +71,7 @@ FirewallPoliciesTracingConnection::DeleteFirewallPolicy( auto span = internal::MakeSpan( "compute_firewall_policies_v1::FirewallPoliciesConnection::" "DeleteFirewallPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteFirewallPolicy(request)); } @@ -125,7 +125,7 @@ FirewallPoliciesTracingConnection::InsertFirewallPolicy( auto span = internal::MakeSpan( "compute_firewall_policies_v1::FirewallPoliciesConnection::" "InsertFirewallPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertFirewallPolicy(request)); } @@ -137,7 +137,7 @@ FirewallPoliciesTracingConnection::ListFirewallPolicies( auto span = internal::MakeSpan( "compute_firewall_policies_v1::FirewallPoliciesConnection::" "ListFirewallPolicies"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListFirewallPolicies(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::FirewallPolicy>(std::move(span), @@ -162,7 +162,7 @@ FirewallPoliciesTracingConnection::Move( request) { auto span = internal::MakeSpan( "compute_firewall_policies_v1::FirewallPoliciesConnection::Move"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->Move(request)); } @@ -173,7 +173,7 @@ FirewallPoliciesTracingConnection::PatchFirewallPolicy( auto span = internal::MakeSpan( "compute_firewall_policies_v1::FirewallPoliciesConnection::" "PatchFirewallPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchFirewallPolicy(request)); } @@ -184,7 +184,7 @@ FirewallPoliciesTracingConnection::PatchRule( request) { auto span = internal::MakeSpan( "compute_firewall_policies_v1::FirewallPoliciesConnection::PatchRule"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchRule(request)); } @@ -195,7 +195,7 @@ FirewallPoliciesTracingConnection::RemoveAssociation( auto span = internal::MakeSpan( "compute_firewall_policies_v1::FirewallPoliciesConnection::" "RemoveAssociation"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RemoveAssociation(request)); } @@ -205,7 +205,7 @@ FirewallPoliciesTracingConnection::RemoveRule( request) { auto span = internal::MakeSpan( "compute_firewall_policies_v1::FirewallPoliciesConnection::RemoveRule"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RemoveRule(request)); } diff --git a/google/cloud/compute/firewalls/v1/internal/firewalls_tracing_connection.cc b/google/cloud/compute/firewalls/v1/internal/firewalls_tracing_connection.cc index c2683d12d896..4cab177bd2ec 100644 --- a/google/cloud/compute/firewalls/v1/internal/firewalls_tracing_connection.cc +++ b/google/cloud/compute/firewalls/v1/internal/firewalls_tracing_connection.cc @@ -38,7 +38,7 @@ FirewallsTracingConnection::DeleteFirewall( request) { auto span = internal::MakeSpan( "compute_firewalls_v1::FirewallsConnection::DeleteFirewall"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteFirewall(request)); } @@ -58,7 +58,7 @@ FirewallsTracingConnection::InsertFirewall( request) { auto span = internal::MakeSpan( "compute_firewalls_v1::FirewallsConnection::InsertFirewall"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertFirewall(request)); } @@ -67,7 +67,7 @@ FirewallsTracingConnection::ListFirewalls( google::cloud::cpp::compute::firewalls::v1::ListFirewallsRequest request) { auto span = internal::MakeSpan( "compute_firewalls_v1::FirewallsConnection::ListFirewalls"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListFirewalls(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::Firewall>(std::move(span), @@ -80,7 +80,7 @@ FirewallsTracingConnection::PatchFirewall( request) { auto span = internal::MakeSpan( "compute_firewalls_v1::FirewallsConnection::PatchFirewall"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchFirewall(request)); } @@ -90,7 +90,7 @@ FirewallsTracingConnection::UpdateFirewall( request) { auto span = internal::MakeSpan( "compute_firewalls_v1::FirewallsConnection::UpdateFirewall"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateFirewall(request)); } diff --git a/google/cloud/compute/forwarding_rules/v1/internal/forwarding_rules_tracing_connection.cc b/google/cloud/compute/forwarding_rules/v1/internal/forwarding_rules_tracing_connection.cc index 0802010ae3d4..19b0d08bfcea 100644 --- a/google/cloud/compute/forwarding_rules/v1/internal/forwarding_rules_tracing_connection.cc +++ b/google/cloud/compute/forwarding_rules/v1/internal/forwarding_rules_tracing_connection.cc @@ -41,7 +41,7 @@ ForwardingRulesTracingConnection::AggregatedListForwardingRules( auto span = internal::MakeSpan( "compute_forwarding_rules_v1::ForwardingRulesConnection::" "AggregatedListForwardingRules"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->AggregatedListForwardingRules(std::move(request)); return internal::MakeTracedStreamRange>( @@ -55,7 +55,7 @@ ForwardingRulesTracingConnection::DeleteForwardingRule( auto span = internal::MakeSpan( "compute_forwarding_rules_v1::ForwardingRulesConnection::" "DeleteForwardingRule"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteForwardingRule(request)); } @@ -78,7 +78,7 @@ ForwardingRulesTracingConnection::InsertForwardingRule( auto span = internal::MakeSpan( "compute_forwarding_rules_v1::ForwardingRulesConnection::" "InsertForwardingRule"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertForwardingRule(request)); } @@ -90,7 +90,7 @@ ForwardingRulesTracingConnection::ListForwardingRules( auto span = internal::MakeSpan( "compute_forwarding_rules_v1::ForwardingRulesConnection::" "ListForwardingRules"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListForwardingRules(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::ForwardingRule>(std::move(span), @@ -104,7 +104,7 @@ ForwardingRulesTracingConnection::PatchForwardingRule( auto span = internal::MakeSpan( "compute_forwarding_rules_v1::ForwardingRulesConnection::" "PatchForwardingRule"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchForwardingRule(request)); } @@ -115,7 +115,7 @@ ForwardingRulesTracingConnection::SetLabels( request) { auto span = internal::MakeSpan( "compute_forwarding_rules_v1::ForwardingRulesConnection::SetLabels"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetLabels(request)); } @@ -125,7 +125,7 @@ ForwardingRulesTracingConnection::SetTarget( request) { auto span = internal::MakeSpan( "compute_forwarding_rules_v1::ForwardingRulesConnection::SetTarget"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetTarget(request)); } diff --git a/google/cloud/compute/global_addresses/v1/internal/global_addresses_tracing_connection.cc b/google/cloud/compute/global_addresses/v1/internal/global_addresses_tracing_connection.cc index a3a484a39ce0..82c7d9f04d58 100644 --- a/google/cloud/compute/global_addresses/v1/internal/global_addresses_tracing_connection.cc +++ b/google/cloud/compute/global_addresses/v1/internal/global_addresses_tracing_connection.cc @@ -39,7 +39,7 @@ GlobalAddressesTracingConnection::DeleteAddress( DeleteAddressRequest const& request) { auto span = internal::MakeSpan( "compute_global_addresses_v1::GlobalAddressesConnection::DeleteAddress"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteAddress(request)); } @@ -59,7 +59,7 @@ GlobalAddressesTracingConnection::InsertAddress( InsertAddressRequest const& request) { auto span = internal::MakeSpan( "compute_global_addresses_v1::GlobalAddressesConnection::InsertAddress"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertAddress(request)); } @@ -70,7 +70,7 @@ GlobalAddressesTracingConnection::ListGlobalAddresses( auto span = internal::MakeSpan( "compute_global_addresses_v1::GlobalAddressesConnection::" "ListGlobalAddresses"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListGlobalAddresses(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::Address>(std::move(span), std::move(sr)); @@ -82,7 +82,7 @@ GlobalAddressesTracingConnection::Move( request) { auto span = internal::MakeSpan( "compute_global_addresses_v1::GlobalAddressesConnection::Move"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->Move(request)); } @@ -92,7 +92,7 @@ GlobalAddressesTracingConnection::SetLabels( request) { auto span = internal::MakeSpan( "compute_global_addresses_v1::GlobalAddressesConnection::SetLabels"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetLabels(request)); } diff --git a/google/cloud/compute/global_forwarding_rules/v1/internal/global_forwarding_rules_tracing_connection.cc b/google/cloud/compute/global_forwarding_rules/v1/internal/global_forwarding_rules_tracing_connection.cc index ceefa9ebb7d2..e50a08b2f48c 100644 --- a/google/cloud/compute/global_forwarding_rules/v1/internal/global_forwarding_rules_tracing_connection.cc +++ b/google/cloud/compute/global_forwarding_rules/v1/internal/global_forwarding_rules_tracing_connection.cc @@ -42,7 +42,7 @@ GlobalForwardingRulesTracingConnection::DeleteForwardingRule( auto span = internal::MakeSpan( "compute_global_forwarding_rules_v1::GlobalForwardingRulesConnection::" "DeleteForwardingRule"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteForwardingRule(request)); } @@ -65,7 +65,7 @@ GlobalForwardingRulesTracingConnection::InsertForwardingRule( auto span = internal::MakeSpan( "compute_global_forwarding_rules_v1::GlobalForwardingRulesConnection::" "InsertForwardingRule"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertForwardingRule(request)); } @@ -77,7 +77,7 @@ GlobalForwardingRulesTracingConnection::ListGlobalForwardingRules( auto span = internal::MakeSpan( "compute_global_forwarding_rules_v1::GlobalForwardingRulesConnection::" "ListGlobalForwardingRules"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListGlobalForwardingRules(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::ForwardingRule>(std::move(span), @@ -91,7 +91,7 @@ GlobalForwardingRulesTracingConnection::PatchForwardingRule( auto span = internal::MakeSpan( "compute_global_forwarding_rules_v1::GlobalForwardingRulesConnection::" "PatchForwardingRule"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchForwardingRule(request)); } @@ -103,7 +103,7 @@ GlobalForwardingRulesTracingConnection::SetLabels( auto span = internal::MakeSpan( "compute_global_forwarding_rules_v1::GlobalForwardingRulesConnection::" "SetLabels"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetLabels(request)); } @@ -114,7 +114,7 @@ GlobalForwardingRulesTracingConnection::SetTarget( auto span = internal::MakeSpan( "compute_global_forwarding_rules_v1::GlobalForwardingRulesConnection::" "SetTarget"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetTarget(request)); } diff --git a/google/cloud/compute/global_network_endpoint_groups/v1/internal/global_network_endpoint_groups_tracing_connection.cc b/google/cloud/compute/global_network_endpoint_groups/v1/internal/global_network_endpoint_groups_tracing_connection.cc index 8c9537949f0f..d162dc20be5d 100644 --- a/google/cloud/compute/global_network_endpoint_groups/v1/internal/global_network_endpoint_groups_tracing_connection.cc +++ b/google/cloud/compute/global_network_endpoint_groups/v1/internal/global_network_endpoint_groups_tracing_connection.cc @@ -43,7 +43,7 @@ GlobalNetworkEndpointGroupsTracingConnection::AttachNetworkEndpoints( auto span = internal::MakeSpan( "compute_global_network_endpoint_groups_v1::" "GlobalNetworkEndpointGroupsConnection::AttachNetworkEndpoints"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->AttachNetworkEndpoints(request)); } @@ -55,7 +55,7 @@ GlobalNetworkEndpointGroupsTracingConnection::DeleteNetworkEndpointGroup( auto span = internal::MakeSpan( "compute_global_network_endpoint_groups_v1::" "GlobalNetworkEndpointGroupsConnection::DeleteNetworkEndpointGroup"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteNetworkEndpointGroup(request)); } @@ -67,7 +67,7 @@ GlobalNetworkEndpointGroupsTracingConnection::DetachNetworkEndpoints( auto span = internal::MakeSpan( "compute_global_network_endpoint_groups_v1::" "GlobalNetworkEndpointGroupsConnection::DetachNetworkEndpoints"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DetachNetworkEndpoints(request)); } @@ -90,7 +90,7 @@ GlobalNetworkEndpointGroupsTracingConnection::InsertNetworkEndpointGroup( auto span = internal::MakeSpan( "compute_global_network_endpoint_groups_v1::" "GlobalNetworkEndpointGroupsConnection::InsertNetworkEndpointGroup"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertNetworkEndpointGroup(request)); } @@ -102,7 +102,7 @@ GlobalNetworkEndpointGroupsTracingConnection::ListGlobalNetworkEndpointGroups( auto span = internal::MakeSpan( "compute_global_network_endpoint_groups_v1::" "GlobalNetworkEndpointGroupsConnection::ListGlobalNetworkEndpointGroups"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListGlobalNetworkEndpointGroups(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::NetworkEndpointGroup>(std::move(span), @@ -116,7 +116,7 @@ GlobalNetworkEndpointGroupsTracingConnection::ListNetworkEndpoints( auto span = internal::MakeSpan( "compute_global_network_endpoint_groups_v1::" "GlobalNetworkEndpointGroupsConnection::ListNetworkEndpoints"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListNetworkEndpoints(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::NetworkEndpointWithHealthStatus>( diff --git a/google/cloud/compute/global_operations/v1/internal/global_operations_tracing_connection.cc b/google/cloud/compute/global_operations/v1/internal/global_operations_tracing_connection.cc index 7cf13da427c3..c6eba784f9e7 100644 --- a/google/cloud/compute/global_operations/v1/internal/global_operations_tracing_connection.cc +++ b/google/cloud/compute/global_operations/v1/internal/global_operations_tracing_connection.cc @@ -41,7 +41,7 @@ GlobalOperationsTracingConnection::AggregatedListGlobalOperations( auto span = internal::MakeSpan( "compute_global_operations_v1::GlobalOperationsConnection::" "AggregatedListGlobalOperations"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->AggregatedListGlobalOperations(std::move(request)); return internal::MakeTracedStreamRange>( @@ -75,7 +75,7 @@ GlobalOperationsTracingConnection::ListGlobalOperations( auto span = internal::MakeSpan( "compute_global_operations_v1::GlobalOperationsConnection::" "ListGlobalOperations"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListGlobalOperations(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::Operation>(std::move(span), diff --git a/google/cloud/compute/global_organization_operations/v1/internal/global_organization_operations_tracing_connection.cc b/google/cloud/compute/global_organization_operations/v1/internal/global_organization_operations_tracing_connection.cc index 3086bc540bbc..152cccbaa64c 100644 --- a/google/cloud/compute/global_organization_operations/v1/internal/global_organization_operations_tracing_connection.cc +++ b/google/cloud/compute/global_organization_operations/v1/internal/global_organization_operations_tracing_connection.cc @@ -65,7 +65,7 @@ GlobalOrganizationOperationsTracingConnection::ListGlobalOrganizationOperations( "compute_global_organization_operations_v1::" "GlobalOrganizationOperationsConnection::" "ListGlobalOrganizationOperations"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListGlobalOrganizationOperations(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::Operation>(std::move(span), diff --git a/google/cloud/compute/global_public_delegated_prefixes/v1/internal/global_public_delegated_prefixes_tracing_connection.cc b/google/cloud/compute/global_public_delegated_prefixes/v1/internal/global_public_delegated_prefixes_tracing_connection.cc index 9cdb0b2459a8..259bb642d79d 100644 --- a/google/cloud/compute/global_public_delegated_prefixes/v1/internal/global_public_delegated_prefixes_tracing_connection.cc +++ b/google/cloud/compute/global_public_delegated_prefixes/v1/internal/global_public_delegated_prefixes_tracing_connection.cc @@ -43,7 +43,7 @@ GlobalPublicDelegatedPrefixesTracingConnection::DeletePublicDelegatedPrefix( auto span = internal::MakeSpan( "compute_global_public_delegated_prefixes_v1::" "GlobalPublicDelegatedPrefixesConnection::DeletePublicDelegatedPrefix"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeletePublicDelegatedPrefix(request)); } @@ -66,7 +66,7 @@ GlobalPublicDelegatedPrefixesTracingConnection::InsertPublicDelegatedPrefix( auto span = internal::MakeSpan( "compute_global_public_delegated_prefixes_v1::" "GlobalPublicDelegatedPrefixesConnection::InsertPublicDelegatedPrefix"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertPublicDelegatedPrefix(request)); } @@ -80,7 +80,7 @@ GlobalPublicDelegatedPrefixesTracingConnection:: "compute_global_public_delegated_prefixes_v1::" "GlobalPublicDelegatedPrefixesConnection::" "ListGlobalPublicDelegatedPrefixes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListGlobalPublicDelegatedPrefixes(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::PublicDelegatedPrefix>(std::move(span), @@ -94,7 +94,7 @@ GlobalPublicDelegatedPrefixesTracingConnection::PatchPublicDelegatedPrefix( auto span = internal::MakeSpan( "compute_global_public_delegated_prefixes_v1::" "GlobalPublicDelegatedPrefixesConnection::PatchPublicDelegatedPrefix"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchPublicDelegatedPrefix(request)); } diff --git a/google/cloud/compute/health_checks/v1/internal/health_checks_tracing_connection.cc b/google/cloud/compute/health_checks/v1/internal/health_checks_tracing_connection.cc index c6b34a44cbb2..10c9bce3c691 100644 --- a/google/cloud/compute/health_checks/v1/internal/health_checks_tracing_connection.cc +++ b/google/cloud/compute/health_checks/v1/internal/health_checks_tracing_connection.cc @@ -40,7 +40,7 @@ HealthChecksTracingConnection::AggregatedListHealthChecks( auto span = internal::MakeSpan( "compute_health_checks_v1::HealthChecksConnection::" "AggregatedListHealthChecks"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->AggregatedListHealthChecks(std::move(request)); return internal::MakeTracedStreamRange>( @@ -53,7 +53,7 @@ HealthChecksTracingConnection::DeleteHealthCheck( DeleteHealthCheckRequest const& request) { auto span = internal::MakeSpan( "compute_health_checks_v1::HealthChecksConnection::DeleteHealthCheck"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteHealthCheck(request)); } @@ -73,7 +73,7 @@ HealthChecksTracingConnection::InsertHealthCheck( InsertHealthCheckRequest const& request) { auto span = internal::MakeSpan( "compute_health_checks_v1::HealthChecksConnection::InsertHealthCheck"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertHealthCheck(request)); } @@ -83,7 +83,7 @@ HealthChecksTracingConnection::ListHealthChecks( request) { auto span = internal::MakeSpan( "compute_health_checks_v1::HealthChecksConnection::ListHealthChecks"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListHealthChecks(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::HealthCheck>(std::move(span), @@ -96,7 +96,7 @@ HealthChecksTracingConnection::PatchHealthCheck( PatchHealthCheckRequest const& request) { auto span = internal::MakeSpan( "compute_health_checks_v1::HealthChecksConnection::PatchHealthCheck"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchHealthCheck(request)); } @@ -106,7 +106,7 @@ HealthChecksTracingConnection::UpdateHealthCheck( UpdateHealthCheckRequest const& request) { auto span = internal::MakeSpan( "compute_health_checks_v1::HealthChecksConnection::UpdateHealthCheck"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateHealthCheck(request)); } diff --git a/google/cloud/compute/http_health_checks/v1/internal/http_health_checks_tracing_connection.cc b/google/cloud/compute/http_health_checks/v1/internal/http_health_checks_tracing_connection.cc index 09eaec60445e..8e060d67a0a2 100644 --- a/google/cloud/compute/http_health_checks/v1/internal/http_health_checks_tracing_connection.cc +++ b/google/cloud/compute/http_health_checks/v1/internal/http_health_checks_tracing_connection.cc @@ -40,7 +40,7 @@ HttpHealthChecksTracingConnection::DeleteHttpHealthCheck( auto span = internal::MakeSpan( "compute_http_health_checks_v1::HttpHealthChecksConnection::" "DeleteHttpHealthCheck"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteHttpHealthCheck(request)); } @@ -63,7 +63,7 @@ HttpHealthChecksTracingConnection::InsertHttpHealthCheck( auto span = internal::MakeSpan( "compute_http_health_checks_v1::HttpHealthChecksConnection::" "InsertHttpHealthCheck"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertHttpHealthCheck(request)); } @@ -75,7 +75,7 @@ HttpHealthChecksTracingConnection::ListHttpHealthChecks( auto span = internal::MakeSpan( "compute_http_health_checks_v1::HttpHealthChecksConnection::" "ListHttpHealthChecks"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListHttpHealthChecks(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::HttpHealthCheck>(std::move(span), @@ -89,7 +89,7 @@ HttpHealthChecksTracingConnection::PatchHttpHealthCheck( auto span = internal::MakeSpan( "compute_http_health_checks_v1::HttpHealthChecksConnection::" "PatchHttpHealthCheck"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchHttpHealthCheck(request)); } @@ -101,7 +101,7 @@ HttpHealthChecksTracingConnection::UpdateHttpHealthCheck( auto span = internal::MakeSpan( "compute_http_health_checks_v1::HttpHealthChecksConnection::" "UpdateHttpHealthCheck"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateHttpHealthCheck(request)); } diff --git a/google/cloud/compute/https_health_checks/v1/internal/https_health_checks_tracing_connection.cc b/google/cloud/compute/https_health_checks/v1/internal/https_health_checks_tracing_connection.cc index 7567b16b207f..74cdbc3fadf8 100644 --- a/google/cloud/compute/https_health_checks/v1/internal/https_health_checks_tracing_connection.cc +++ b/google/cloud/compute/https_health_checks/v1/internal/https_health_checks_tracing_connection.cc @@ -40,7 +40,7 @@ HttpsHealthChecksTracingConnection::DeleteHttpsHealthCheck( auto span = internal::MakeSpan( "compute_https_health_checks_v1::HttpsHealthChecksConnection::" "DeleteHttpsHealthCheck"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteHttpsHealthCheck(request)); } @@ -63,7 +63,7 @@ HttpsHealthChecksTracingConnection::InsertHttpsHealthCheck( auto span = internal::MakeSpan( "compute_https_health_checks_v1::HttpsHealthChecksConnection::" "InsertHttpsHealthCheck"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertHttpsHealthCheck(request)); } @@ -75,7 +75,7 @@ HttpsHealthChecksTracingConnection::ListHttpsHealthChecks( auto span = internal::MakeSpan( "compute_https_health_checks_v1::HttpsHealthChecksConnection::" "ListHttpsHealthChecks"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListHttpsHealthChecks(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::HttpsHealthCheck>(std::move(span), @@ -89,7 +89,7 @@ HttpsHealthChecksTracingConnection::PatchHttpsHealthCheck( auto span = internal::MakeSpan( "compute_https_health_checks_v1::HttpsHealthChecksConnection::" "PatchHttpsHealthCheck"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchHttpsHealthCheck(request)); } @@ -101,7 +101,7 @@ HttpsHealthChecksTracingConnection::UpdateHttpsHealthCheck( auto span = internal::MakeSpan( "compute_https_health_checks_v1::HttpsHealthChecksConnection::" "UpdateHttpsHealthCheck"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateHttpsHealthCheck(request)); } diff --git a/google/cloud/compute/images/v1/internal/images_tracing_connection.cc b/google/cloud/compute/images/v1/internal/images_tracing_connection.cc index 6b6b692ab772..806a22895a45 100644 --- a/google/cloud/compute/images/v1/internal/images_tracing_connection.cc +++ b/google/cloud/compute/images/v1/internal/images_tracing_connection.cc @@ -38,7 +38,7 @@ ImagesTracingConnection::DeleteImage( request) { auto span = internal::MakeSpan("compute_images_v1::ImagesConnection::DeleteImage"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteImage(request)); } @@ -47,7 +47,7 @@ ImagesTracingConnection::Deprecate( google::cloud::cpp::compute::images::v1::DeprecateRequest const& request) { auto span = internal::MakeSpan("compute_images_v1::ImagesConnection::Deprecate"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->Deprecate(request)); } @@ -86,7 +86,7 @@ ImagesTracingConnection::InsertImage( request) { auto span = internal::MakeSpan("compute_images_v1::ImagesConnection::InsertImage"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertImage(request)); } @@ -95,7 +95,7 @@ ImagesTracingConnection::ListImages( google::cloud::cpp::compute::images::v1::ListImagesRequest request) { auto span = internal::MakeSpan("compute_images_v1::ImagesConnection::ListImages"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListImages(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::Image>(std::move(span), std::move(sr)); @@ -106,7 +106,7 @@ ImagesTracingConnection::PatchImage( google::cloud::cpp::compute::images::v1::PatchImageRequest const& request) { auto span = internal::MakeSpan("compute_images_v1::ImagesConnection::PatchImage"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchImage(request)); } @@ -125,7 +125,7 @@ ImagesTracingConnection::SetLabels( google::cloud::cpp::compute::images::v1::SetLabelsRequest const& request) { auto span = internal::MakeSpan("compute_images_v1::ImagesConnection::SetLabels"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetLabels(request)); } diff --git a/google/cloud/compute/instance_group_managers/v1/internal/instance_group_managers_tracing_connection.cc b/google/cloud/compute/instance_group_managers/v1/internal/instance_group_managers_tracing_connection.cc index b4f4d38e58ee..a5508c6c7e7f 100644 --- a/google/cloud/compute/instance_group_managers/v1/internal/instance_group_managers_tracing_connection.cc +++ b/google/cloud/compute/instance_group_managers/v1/internal/instance_group_managers_tracing_connection.cc @@ -42,7 +42,7 @@ InstanceGroupManagersTracingConnection::AbandonInstances( auto span = internal::MakeSpan( "compute_instance_group_managers_v1::InstanceGroupManagersConnection::" "AbandonInstances"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->AbandonInstances(request)); } @@ -55,7 +55,7 @@ InstanceGroupManagersTracingConnection::AggregatedListInstanceGroupManagers( auto span = internal::MakeSpan( "compute_instance_group_managers_v1::InstanceGroupManagersConnection::" "AggregatedListInstanceGroupManagers"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->AggregatedListInstanceGroupManagers(std::move(request)); return internal::MakeTracedStreamRangeApplyUpdatesToInstances(request)); } @@ -82,7 +82,7 @@ InstanceGroupManagersTracingConnection::CreateInstances( auto span = internal::MakeSpan( "compute_instance_group_managers_v1::InstanceGroupManagersConnection::" "CreateInstances"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateInstances(request)); } @@ -93,7 +93,7 @@ InstanceGroupManagersTracingConnection::DeleteInstanceGroupManager( auto span = internal::MakeSpan( "compute_instance_group_managers_v1::InstanceGroupManagersConnection::" "DeleteInstanceGroupManager"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteInstanceGroupManager(request)); } @@ -105,7 +105,7 @@ InstanceGroupManagersTracingConnection::DeleteInstances( auto span = internal::MakeSpan( "compute_instance_group_managers_v1::InstanceGroupManagersConnection::" "DeleteInstances"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteInstances(request)); } @@ -116,7 +116,7 @@ InstanceGroupManagersTracingConnection::DeletePerInstanceConfigs( auto span = internal::MakeSpan( "compute_instance_group_managers_v1::InstanceGroupManagersConnection::" "DeletePerInstanceConfigs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeletePerInstanceConfigs(request)); } @@ -139,7 +139,7 @@ InstanceGroupManagersTracingConnection::InsertInstanceGroupManager( auto span = internal::MakeSpan( "compute_instance_group_managers_v1::InstanceGroupManagersConnection::" "InsertInstanceGroupManager"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertInstanceGroupManager(request)); } @@ -151,7 +151,7 @@ InstanceGroupManagersTracingConnection::ListInstanceGroupManagers( auto span = internal::MakeSpan( "compute_instance_group_managers_v1::InstanceGroupManagersConnection::" "ListInstanceGroupManagers"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListInstanceGroupManagers(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::InstanceGroupManager>(std::move(span), @@ -165,7 +165,7 @@ InstanceGroupManagersTracingConnection::ListErrors( auto span = internal::MakeSpan( "compute_instance_group_managers_v1::InstanceGroupManagersConnection::" "ListErrors"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListErrors(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::InstanceManagedByIgmError>( @@ -191,7 +191,7 @@ InstanceGroupManagersTracingConnection::ListPerInstanceConfigs( auto span = internal::MakeSpan( "compute_instance_group_managers_v1::InstanceGroupManagersConnection::" "ListPerInstanceConfigs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListPerInstanceConfigs(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::PerInstanceConfig>(std::move(span), @@ -205,7 +205,7 @@ InstanceGroupManagersTracingConnection::PatchInstanceGroupManager( auto span = internal::MakeSpan( "compute_instance_group_managers_v1::InstanceGroupManagersConnection::" "PatchInstanceGroupManager"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchInstanceGroupManager(request)); } @@ -217,7 +217,7 @@ InstanceGroupManagersTracingConnection::PatchPerInstanceConfigs( auto span = internal::MakeSpan( "compute_instance_group_managers_v1::InstanceGroupManagersConnection::" "PatchPerInstanceConfigs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchPerInstanceConfigs(request)); } @@ -229,7 +229,7 @@ InstanceGroupManagersTracingConnection::RecreateInstances( auto span = internal::MakeSpan( "compute_instance_group_managers_v1::InstanceGroupManagersConnection::" "RecreateInstances"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RecreateInstances(request)); } @@ -240,7 +240,7 @@ InstanceGroupManagersTracingConnection::Resize( auto span = internal::MakeSpan( "compute_instance_group_managers_v1::InstanceGroupManagersConnection::" "Resize"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->Resize(request)); } @@ -251,7 +251,7 @@ InstanceGroupManagersTracingConnection::SetInstanceTemplate( auto span = internal::MakeSpan( "compute_instance_group_managers_v1::InstanceGroupManagersConnection::" "SetInstanceTemplate"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetInstanceTemplate(request)); } @@ -263,7 +263,7 @@ InstanceGroupManagersTracingConnection::SetTargetPools( auto span = internal::MakeSpan( "compute_instance_group_managers_v1::InstanceGroupManagersConnection::" "SetTargetPools"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetTargetPools(request)); } @@ -274,7 +274,7 @@ InstanceGroupManagersTracingConnection::UpdatePerInstanceConfigs( auto span = internal::MakeSpan( "compute_instance_group_managers_v1::InstanceGroupManagersConnection::" "UpdatePerInstanceConfigs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdatePerInstanceConfigs(request)); } diff --git a/google/cloud/compute/instance_groups/v1/internal/instance_groups_tracing_connection.cc b/google/cloud/compute/instance_groups/v1/internal/instance_groups_tracing_connection.cc index 8daef87c1b3b..bddbd6f1ad52 100644 --- a/google/cloud/compute/instance_groups/v1/internal/instance_groups_tracing_connection.cc +++ b/google/cloud/compute/instance_groups/v1/internal/instance_groups_tracing_connection.cc @@ -38,7 +38,7 @@ InstanceGroupsTracingConnection::AddInstances( request) { auto span = internal::MakeSpan( "compute_instance_groups_v1::InstanceGroupsConnection::AddInstances"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->AddInstances(request)); } @@ -50,7 +50,7 @@ InstanceGroupsTracingConnection::AggregatedListInstanceGroups( auto span = internal::MakeSpan( "compute_instance_groups_v1::InstanceGroupsConnection::" "AggregatedListInstanceGroups"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->AggregatedListInstanceGroups(std::move(request)); return internal::MakeTracedStreamRange>( @@ -64,7 +64,7 @@ InstanceGroupsTracingConnection::DeleteInstanceGroup( auto span = internal::MakeSpan( "compute_instance_groups_v1::InstanceGroupsConnection::" "DeleteInstanceGroup"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteInstanceGroup(request)); } @@ -86,7 +86,7 @@ InstanceGroupsTracingConnection::InsertInstanceGroup( auto span = internal::MakeSpan( "compute_instance_groups_v1::InstanceGroupsConnection::" "InsertInstanceGroup"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertInstanceGroup(request)); } @@ -98,7 +98,7 @@ InstanceGroupsTracingConnection::ListInstanceGroups( auto span = internal::MakeSpan( "compute_instance_groups_v1::InstanceGroupsConnection::" "ListInstanceGroups"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListInstanceGroups(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::InstanceGroup>(std::move(span), @@ -111,7 +111,7 @@ InstanceGroupsTracingConnection::ListInstances( request) { auto span = internal::MakeSpan( "compute_instance_groups_v1::InstanceGroupsConnection::ListInstances"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListInstances(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::InstanceWithNamedPorts>(std::move(span), @@ -124,7 +124,7 @@ InstanceGroupsTracingConnection::RemoveInstances( RemoveInstancesRequest const& request) { auto span = internal::MakeSpan( "compute_instance_groups_v1::InstanceGroupsConnection::RemoveInstances"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RemoveInstances(request)); } @@ -134,7 +134,7 @@ InstanceGroupsTracingConnection::SetNamedPorts( SetNamedPortsRequest const& request) { auto span = internal::MakeSpan( "compute_instance_groups_v1::InstanceGroupsConnection::SetNamedPorts"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetNamedPorts(request)); } diff --git a/google/cloud/compute/instance_templates/v1/internal/instance_templates_tracing_connection.cc b/google/cloud/compute/instance_templates/v1/internal/instance_templates_tracing_connection.cc index de870bf2ab95..29bf8f4a0a22 100644 --- a/google/cloud/compute/instance_templates/v1/internal/instance_templates_tracing_connection.cc +++ b/google/cloud/compute/instance_templates/v1/internal/instance_templates_tracing_connection.cc @@ -41,7 +41,7 @@ InstanceTemplatesTracingConnection::AggregatedListInstanceTemplates( auto span = internal::MakeSpan( "compute_instance_templates_v1::InstanceTemplatesConnection::" "AggregatedListInstanceTemplates"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->AggregatedListInstanceTemplates(std::move(request)); return internal::MakeTracedStreamRange< std::pairDeleteInstanceTemplate(request)); } @@ -90,7 +90,7 @@ InstanceTemplatesTracingConnection::InsertInstanceTemplate( auto span = internal::MakeSpan( "compute_instance_templates_v1::InstanceTemplatesConnection::" "InsertInstanceTemplate"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertInstanceTemplate(request)); } @@ -102,7 +102,7 @@ InstanceTemplatesTracingConnection::ListInstanceTemplates( auto span = internal::MakeSpan( "compute_instance_templates_v1::InstanceTemplatesConnection::" "ListInstanceTemplates"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListInstanceTemplates(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::InstanceTemplate>(std::move(span), diff --git a/google/cloud/compute/instances/v1/internal/instances_tracing_connection.cc b/google/cloud/compute/instances/v1/internal/instances_tracing_connection.cc index 1e82cb6bc148..ca80cc1b3581 100644 --- a/google/cloud/compute/instances/v1/internal/instances_tracing_connection.cc +++ b/google/cloud/compute/instances/v1/internal/instances_tracing_connection.cc @@ -38,7 +38,7 @@ InstancesTracingConnection::AddAccessConfig( request) { auto span = internal::MakeSpan( "compute_instances_v1::InstancesConnection::AddAccessConfig"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->AddAccessConfig(request)); } @@ -48,7 +48,7 @@ InstancesTracingConnection::AddResourcePolicies( AddResourcePoliciesRequest const& request) { auto span = internal::MakeSpan( "compute_instances_v1::InstancesConnection::AddResourcePolicies"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->AddResourcePolicies(request)); } @@ -60,7 +60,7 @@ InstancesTracingConnection::AggregatedListInstances( request) { auto span = internal::MakeSpan( "compute_instances_v1::InstancesConnection::AggregatedListInstances"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->AggregatedListInstances(std::move(request)); return internal::MakeTracedStreamRange>( @@ -73,7 +73,7 @@ InstancesTracingConnection::AttachDisk( request) { auto span = internal::MakeSpan( "compute_instances_v1::InstancesConnection::AttachDisk"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->AttachDisk(request)); } @@ -83,7 +83,7 @@ InstancesTracingConnection::BulkInsert( request) { auto span = internal::MakeSpan( "compute_instances_v1::InstancesConnection::BulkInsert"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->BulkInsert(request)); } @@ -93,7 +93,7 @@ InstancesTracingConnection::DeleteInstance( request) { auto span = internal::MakeSpan( "compute_instances_v1::InstancesConnection::DeleteInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteInstance(request)); } @@ -103,7 +103,7 @@ InstancesTracingConnection::DeleteAccessConfig( request) { auto span = internal::MakeSpan( "compute_instances_v1::InstancesConnection::DeleteAccessConfig"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteAccessConfig(request)); } @@ -114,7 +114,7 @@ InstancesTracingConnection::DetachDisk( request) { auto span = internal::MakeSpan( "compute_instances_v1::InstancesConnection::DetachDisk"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DetachDisk(request)); } @@ -195,7 +195,7 @@ InstancesTracingConnection::InsertInstance( request) { auto span = internal::MakeSpan( "compute_instances_v1::InstancesConnection::InsertInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertInstance(request)); } @@ -204,7 +204,7 @@ InstancesTracingConnection::ListInstances( google::cloud::cpp::compute::instances::v1::ListInstancesRequest request) { auto span = internal::MakeSpan( "compute_instances_v1::InstancesConnection::ListInstances"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListInstances(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::Instance>(std::move(span), @@ -216,7 +216,7 @@ InstancesTracingConnection::ListReferrers( google::cloud::cpp::compute::instances::v1::ListReferrersRequest request) { auto span = internal::MakeSpan( "compute_instances_v1::InstancesConnection::ListReferrers"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListReferrers(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::Reference>(std::move(span), @@ -229,7 +229,7 @@ InstancesTracingConnection::RemoveResourcePolicies( RemoveResourcePoliciesRequest const& request) { auto span = internal::MakeSpan( "compute_instances_v1::InstancesConnection::RemoveResourcePolicies"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RemoveResourcePolicies(request)); } @@ -239,7 +239,7 @@ InstancesTracingConnection::Reset( google::cloud::cpp::compute::instances::v1::ResetRequest const& request) { auto span = internal::MakeSpan("compute_instances_v1::InstancesConnection::Reset"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->Reset(request)); } @@ -248,7 +248,7 @@ InstancesTracingConnection::Resume( google::cloud::cpp::compute::instances::v1::ResumeRequest const& request) { auto span = internal::MakeSpan("compute_instances_v1::InstancesConnection::Resume"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->Resume(request)); } @@ -267,7 +267,7 @@ InstancesTracingConnection::SetDeletionProtection( SetDeletionProtectionRequest const& request) { auto span = internal::MakeSpan( "compute_instances_v1::InstancesConnection::SetDeletionProtection"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetDeletionProtection(request)); } @@ -278,7 +278,7 @@ InstancesTracingConnection::SetDiskAutoDelete( request) { auto span = internal::MakeSpan( "compute_instances_v1::InstancesConnection::SetDiskAutoDelete"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetDiskAutoDelete(request)); } @@ -298,7 +298,7 @@ InstancesTracingConnection::SetLabels( request) { auto span = internal::MakeSpan( "compute_instances_v1::InstancesConnection::SetLabels"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetLabels(request)); } @@ -308,7 +308,7 @@ InstancesTracingConnection::SetMachineResources( SetMachineResourcesRequest const& request) { auto span = internal::MakeSpan( "compute_instances_v1::InstancesConnection::SetMachineResources"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetMachineResources(request)); } @@ -319,7 +319,7 @@ InstancesTracingConnection::SetMachineType( request) { auto span = internal::MakeSpan( "compute_instances_v1::InstancesConnection::SetMachineType"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetMachineType(request)); } @@ -329,7 +329,7 @@ InstancesTracingConnection::SetMetadata( request) { auto span = internal::MakeSpan( "compute_instances_v1::InstancesConnection::SetMetadata"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetMetadata(request)); } @@ -339,7 +339,7 @@ InstancesTracingConnection::SetMinCpuPlatform( request) { auto span = internal::MakeSpan( "compute_instances_v1::InstancesConnection::SetMinCpuPlatform"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetMinCpuPlatform(request)); } @@ -348,7 +348,7 @@ InstancesTracingConnection::SetName( google::cloud::cpp::compute::instances::v1::SetNameRequest const& request) { auto span = internal::MakeSpan("compute_instances_v1::InstancesConnection::SetName"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetName(request)); } @@ -358,7 +358,7 @@ InstancesTracingConnection::SetScheduling( request) { auto span = internal::MakeSpan( "compute_instances_v1::InstancesConnection::SetScheduling"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetScheduling(request)); } @@ -368,7 +368,7 @@ InstancesTracingConnection::SetSecurityPolicy( request) { auto span = internal::MakeSpan( "compute_instances_v1::InstancesConnection::SetSecurityPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetSecurityPolicy(request)); } @@ -378,7 +378,7 @@ InstancesTracingConnection::SetServiceAccount( request) { auto span = internal::MakeSpan( "compute_instances_v1::InstancesConnection::SetServiceAccount"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetServiceAccount(request)); } @@ -389,7 +389,7 @@ InstancesTracingConnection::SetShieldedInstanceIntegrityPolicy( auto span = internal::MakeSpan( "compute_instances_v1::InstancesConnection::" "SetShieldedInstanceIntegrityPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetShieldedInstanceIntegrityPolicy(request)); } @@ -399,7 +399,7 @@ InstancesTracingConnection::SetTags( google::cloud::cpp::compute::instances::v1::SetTagsRequest const& request) { auto span = internal::MakeSpan("compute_instances_v1::InstancesConnection::SetTags"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetTags(request)); } @@ -409,7 +409,7 @@ InstancesTracingConnection::SimulateMaintenanceEvent( SimulateMaintenanceEventRequest const& request) { auto span = internal::MakeSpan( "compute_instances_v1::InstancesConnection::SimulateMaintenanceEvent"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SimulateMaintenanceEvent(request)); } @@ -419,7 +419,7 @@ InstancesTracingConnection::Start( google::cloud::cpp::compute::instances::v1::StartRequest const& request) { auto span = internal::MakeSpan("compute_instances_v1::InstancesConnection::Start"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->Start(request)); } @@ -429,7 +429,7 @@ InstancesTracingConnection::StartWithEncryptionKey( StartWithEncryptionKeyRequest const& request) { auto span = internal::MakeSpan( "compute_instances_v1::InstancesConnection::StartWithEncryptionKey"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->StartWithEncryptionKey(request)); } @@ -439,7 +439,7 @@ InstancesTracingConnection::Stop( google::cloud::cpp::compute::instances::v1::StopRequest const& request) { auto span = internal::MakeSpan("compute_instances_v1::InstancesConnection::Stop"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->Stop(request)); } @@ -448,7 +448,7 @@ InstancesTracingConnection::Suspend( google::cloud::cpp::compute::instances::v1::SuspendRequest const& request) { auto span = internal::MakeSpan("compute_instances_v1::InstancesConnection::Suspend"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->Suspend(request)); } @@ -468,7 +468,7 @@ InstancesTracingConnection::UpdateInstance( request) { auto span = internal::MakeSpan( "compute_instances_v1::InstancesConnection::UpdateInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateInstance(request)); } @@ -478,7 +478,7 @@ InstancesTracingConnection::UpdateAccessConfig( request) { auto span = internal::MakeSpan( "compute_instances_v1::InstancesConnection::UpdateAccessConfig"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateAccessConfig(request)); } @@ -489,7 +489,7 @@ InstancesTracingConnection::UpdateDisplayDevice( UpdateDisplayDeviceRequest const& request) { auto span = internal::MakeSpan( "compute_instances_v1::InstancesConnection::UpdateDisplayDevice"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateDisplayDevice(request)); } @@ -500,7 +500,7 @@ InstancesTracingConnection::UpdateNetworkInterface( UpdateNetworkInterfaceRequest const& request) { auto span = internal::MakeSpan( "compute_instances_v1::InstancesConnection::UpdateNetworkInterface"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateNetworkInterface(request)); } @@ -512,7 +512,7 @@ InstancesTracingConnection::UpdateShieldedInstanceConfig( auto span = internal::MakeSpan( "compute_instances_v1::InstancesConnection::" "UpdateShieldedInstanceConfig"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateShieldedInstanceConfig(request)); } diff --git a/google/cloud/compute/interconnect_attachments/v1/internal/interconnect_attachments_tracing_connection.cc b/google/cloud/compute/interconnect_attachments/v1/internal/interconnect_attachments_tracing_connection.cc index e364a518ead8..111b58e3be51 100644 --- a/google/cloud/compute/interconnect_attachments/v1/internal/interconnect_attachments_tracing_connection.cc +++ b/google/cloud/compute/interconnect_attachments/v1/internal/interconnect_attachments_tracing_connection.cc @@ -44,7 +44,7 @@ InterconnectAttachmentsTracingConnection::AggregatedListInterconnectAttachments( auto span = internal::MakeSpan( "compute_interconnect_attachments_v1::InterconnectAttachmentsConnection::" "AggregatedListInterconnectAttachments"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->AggregatedListInterconnectAttachments(std::move(request)); return internal::MakeTracedStreamRangeDeleteInterconnectAttachment(request)); } @@ -82,7 +82,7 @@ InterconnectAttachmentsTracingConnection::InsertInterconnectAttachment( auto span = internal::MakeSpan( "compute_interconnect_attachments_v1::InterconnectAttachmentsConnection::" "InsertInterconnectAttachment"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertInterconnectAttachment(request)); } @@ -94,7 +94,7 @@ InterconnectAttachmentsTracingConnection::ListInterconnectAttachments( auto span = internal::MakeSpan( "compute_interconnect_attachments_v1::InterconnectAttachmentsConnection::" "ListInterconnectAttachments"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListInterconnectAttachments(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::InterconnectAttachment>(std::move(span), @@ -108,7 +108,7 @@ InterconnectAttachmentsTracingConnection::PatchInterconnectAttachment( auto span = internal::MakeSpan( "compute_interconnect_attachments_v1::InterconnectAttachmentsConnection::" "PatchInterconnectAttachment"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchInterconnectAttachment(request)); } @@ -120,7 +120,7 @@ InterconnectAttachmentsTracingConnection::SetLabels( auto span = internal::MakeSpan( "compute_interconnect_attachments_v1::InterconnectAttachmentsConnection::" "SetLabels"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetLabels(request)); } diff --git a/google/cloud/compute/interconnect_locations/v1/internal/interconnect_locations_tracing_connection.cc b/google/cloud/compute/interconnect_locations/v1/internal/interconnect_locations_tracing_connection.cc index 3495719d9eff..d3cef5acb0b3 100644 --- a/google/cloud/compute/interconnect_locations/v1/internal/interconnect_locations_tracing_connection.cc +++ b/google/cloud/compute/interconnect_locations/v1/internal/interconnect_locations_tracing_connection.cc @@ -53,7 +53,7 @@ InterconnectLocationsTracingConnection::ListInterconnectLocations( auto span = internal::MakeSpan( "compute_interconnect_locations_v1::InterconnectLocationsConnection::" "ListInterconnectLocations"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListInterconnectLocations(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::InterconnectLocation>(std::move(span), diff --git a/google/cloud/compute/interconnect_remote_locations/v1/internal/interconnect_remote_locations_tracing_connection.cc b/google/cloud/compute/interconnect_remote_locations/v1/internal/interconnect_remote_locations_tracing_connection.cc index 2b2455517250..90ad63cc5d77 100644 --- a/google/cloud/compute/interconnect_remote_locations/v1/internal/interconnect_remote_locations_tracing_connection.cc +++ b/google/cloud/compute/interconnect_remote_locations/v1/internal/interconnect_remote_locations_tracing_connection.cc @@ -55,7 +55,7 @@ InterconnectRemoteLocationsTracingConnection::ListInterconnectRemoteLocations( auto span = internal::MakeSpan( "compute_interconnect_remote_locations_v1::" "InterconnectRemoteLocationsConnection::ListInterconnectRemoteLocations"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListInterconnectRemoteLocations(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::InterconnectRemoteLocation>( diff --git a/google/cloud/compute/interconnects/v1/internal/interconnects_tracing_connection.cc b/google/cloud/compute/interconnects/v1/internal/interconnects_tracing_connection.cc index db22542c83b2..553ec06c57b6 100644 --- a/google/cloud/compute/interconnects/v1/internal/interconnects_tracing_connection.cc +++ b/google/cloud/compute/interconnects/v1/internal/interconnects_tracing_connection.cc @@ -38,7 +38,7 @@ InterconnectsTracingConnection::DeleteInterconnect( DeleteInterconnectRequest const& request) { auto span = internal::MakeSpan( "compute_interconnects_v1::InterconnectsConnection::DeleteInterconnect"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteInterconnect(request)); } @@ -79,7 +79,7 @@ InterconnectsTracingConnection::InsertInterconnect( InsertInterconnectRequest const& request) { auto span = internal::MakeSpan( "compute_interconnects_v1::InterconnectsConnection::InsertInterconnect"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertInterconnect(request)); } @@ -90,7 +90,7 @@ InterconnectsTracingConnection::ListInterconnects( request) { auto span = internal::MakeSpan( "compute_interconnects_v1::InterconnectsConnection::ListInterconnects"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListInterconnects(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::Interconnect>(std::move(span), @@ -103,7 +103,7 @@ InterconnectsTracingConnection::PatchInterconnect( PatchInterconnectRequest const& request) { auto span = internal::MakeSpan( "compute_interconnects_v1::InterconnectsConnection::PatchInterconnect"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchInterconnect(request)); } @@ -113,7 +113,7 @@ InterconnectsTracingConnection::SetLabels( request) { auto span = internal::MakeSpan( "compute_interconnects_v1::InterconnectsConnection::SetLabels"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetLabels(request)); } diff --git a/google/cloud/compute/licenses/v1/internal/licenses_tracing_connection.cc b/google/cloud/compute/licenses/v1/internal/licenses_tracing_connection.cc index 4dd60aac0824..5feb07b5c912 100644 --- a/google/cloud/compute/licenses/v1/internal/licenses_tracing_connection.cc +++ b/google/cloud/compute/licenses/v1/internal/licenses_tracing_connection.cc @@ -38,7 +38,7 @@ LicensesTracingConnection::DeleteLicense( request) { auto span = internal::MakeSpan( "compute_licenses_v1::LicensesConnection::DeleteLicense"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteLicense(request)); } @@ -68,7 +68,7 @@ LicensesTracingConnection::InsertLicense( request) { auto span = internal::MakeSpan( "compute_licenses_v1::LicensesConnection::InsertLicense"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertLicense(request)); } @@ -77,7 +77,7 @@ LicensesTracingConnection::ListLicenses( google::cloud::cpp::compute::licenses::v1::ListLicensesRequest request) { auto span = internal::MakeSpan( "compute_licenses_v1::LicensesConnection::ListLicenses"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListLicenses(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::License>(std::move(span), std::move(sr)); diff --git a/google/cloud/compute/machine_images/v1/internal/machine_images_tracing_connection.cc b/google/cloud/compute/machine_images/v1/internal/machine_images_tracing_connection.cc index 16f89239d926..047851635603 100644 --- a/google/cloud/compute/machine_images/v1/internal/machine_images_tracing_connection.cc +++ b/google/cloud/compute/machine_images/v1/internal/machine_images_tracing_connection.cc @@ -38,7 +38,7 @@ MachineImagesTracingConnection::DeleteMachineImage( DeleteMachineImageRequest const& request) { auto span = internal::MakeSpan( "compute_machine_images_v1::MachineImagesConnection::DeleteMachineImage"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteMachineImage(request)); } @@ -69,7 +69,7 @@ MachineImagesTracingConnection::InsertMachineImage( InsertMachineImageRequest const& request) { auto span = internal::MakeSpan( "compute_machine_images_v1::MachineImagesConnection::InsertMachineImage"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertMachineImage(request)); } @@ -80,7 +80,7 @@ MachineImagesTracingConnection::ListMachineImages( request) { auto span = internal::MakeSpan( "compute_machine_images_v1::MachineImagesConnection::ListMachineImages"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListMachineImages(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::MachineImage>(std::move(span), diff --git a/google/cloud/compute/machine_types/v1/internal/machine_types_tracing_connection.cc b/google/cloud/compute/machine_types/v1/internal/machine_types_tracing_connection.cc index 033bc0ca3885..23f75536cefe 100644 --- a/google/cloud/compute/machine_types/v1/internal/machine_types_tracing_connection.cc +++ b/google/cloud/compute/machine_types/v1/internal/machine_types_tracing_connection.cc @@ -40,7 +40,7 @@ MachineTypesTracingConnection::AggregatedListMachineTypes( auto span = internal::MakeSpan( "compute_machine_types_v1::MachineTypesConnection::" "AggregatedListMachineTypes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->AggregatedListMachineTypes(std::move(request)); return internal::MakeTracedStreamRange>( @@ -63,7 +63,7 @@ MachineTypesTracingConnection::ListMachineTypes( request) { auto span = internal::MakeSpan( "compute_machine_types_v1::MachineTypesConnection::ListMachineTypes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListMachineTypes(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::MachineType>(std::move(span), diff --git a/google/cloud/compute/network_attachments/v1/internal/network_attachments_tracing_connection.cc b/google/cloud/compute/network_attachments/v1/internal/network_attachments_tracing_connection.cc index 52e035b032da..aa99f45a962c 100644 --- a/google/cloud/compute/network_attachments/v1/internal/network_attachments_tracing_connection.cc +++ b/google/cloud/compute/network_attachments/v1/internal/network_attachments_tracing_connection.cc @@ -42,7 +42,7 @@ NetworkAttachmentsTracingConnection::AggregatedListNetworkAttachments( auto span = internal::MakeSpan( "compute_network_attachments_v1::NetworkAttachmentsConnection::" "AggregatedListNetworkAttachments"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->AggregatedListNetworkAttachments(std::move(request)); return internal::MakeTracedStreamRange< std::pairDeleteNetworkAttachment(request)); } @@ -91,7 +91,7 @@ NetworkAttachmentsTracingConnection::InsertNetworkAttachment( auto span = internal::MakeSpan( "compute_network_attachments_v1::NetworkAttachmentsConnection::" "InsertNetworkAttachment"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertNetworkAttachment(request)); } @@ -103,7 +103,7 @@ NetworkAttachmentsTracingConnection::ListNetworkAttachments( auto span = internal::MakeSpan( "compute_network_attachments_v1::NetworkAttachmentsConnection::" "ListNetworkAttachments"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListNetworkAttachments(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::NetworkAttachment>(std::move(span), @@ -117,7 +117,7 @@ NetworkAttachmentsTracingConnection::PatchNetworkAttachment( auto span = internal::MakeSpan( "compute_network_attachments_v1::NetworkAttachmentsConnection::" "PatchNetworkAttachment"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchNetworkAttachment(request)); } diff --git a/google/cloud/compute/network_edge_security_services/v1/internal/network_edge_security_services_tracing_connection.cc b/google/cloud/compute/network_edge_security_services/v1/internal/network_edge_security_services_tracing_connection.cc index 7b323dc88f4d..8ca3071eca75 100644 --- a/google/cloud/compute/network_edge_security_services/v1/internal/network_edge_security_services_tracing_connection.cc +++ b/google/cloud/compute/network_edge_security_services/v1/internal/network_edge_security_services_tracing_connection.cc @@ -46,7 +46,7 @@ NetworkEdgeSecurityServicesTracingConnection:: "compute_network_edge_security_services_v1::" "NetworkEdgeSecurityServicesConnection::" "AggregatedListNetworkEdgeSecurityServices"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->AggregatedListNetworkEdgeSecurityServices(std::move(request)); return internal::MakeTracedStreamRangeDeleteNetworkEdgeSecurityService(request)); } @@ -88,7 +88,7 @@ NetworkEdgeSecurityServicesTracingConnection::InsertNetworkEdgeSecurityService( "compute_network_edge_security_services_v1::" "NetworkEdgeSecurityServicesConnection::" "InsertNetworkEdgeSecurityService"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertNetworkEdgeSecurityService(request)); } @@ -100,7 +100,7 @@ NetworkEdgeSecurityServicesTracingConnection::PatchNetworkEdgeSecurityService( auto span = internal::MakeSpan( "compute_network_edge_security_services_v1::" "NetworkEdgeSecurityServicesConnection::PatchNetworkEdgeSecurityService"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchNetworkEdgeSecurityService(request)); } diff --git a/google/cloud/compute/network_endpoint_groups/v1/internal/network_endpoint_groups_tracing_connection.cc b/google/cloud/compute/network_endpoint_groups/v1/internal/network_endpoint_groups_tracing_connection.cc index d25b93e8f271..e65a7f58db49 100644 --- a/google/cloud/compute/network_endpoint_groups/v1/internal/network_endpoint_groups_tracing_connection.cc +++ b/google/cloud/compute/network_endpoint_groups/v1/internal/network_endpoint_groups_tracing_connection.cc @@ -44,7 +44,7 @@ NetworkEndpointGroupsTracingConnection::AggregatedListNetworkEndpointGroups( auto span = internal::MakeSpan( "compute_network_endpoint_groups_v1::NetworkEndpointGroupsConnection::" "AggregatedListNetworkEndpointGroups"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->AggregatedListNetworkEndpointGroups(std::move(request)); return internal::MakeTracedStreamRangeAttachNetworkEndpoints(request)); } @@ -71,7 +71,7 @@ NetworkEndpointGroupsTracingConnection::DeleteNetworkEndpointGroup( auto span = internal::MakeSpan( "compute_network_endpoint_groups_v1::NetworkEndpointGroupsConnection::" "DeleteNetworkEndpointGroup"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteNetworkEndpointGroup(request)); } @@ -83,7 +83,7 @@ NetworkEndpointGroupsTracingConnection::DetachNetworkEndpoints( auto span = internal::MakeSpan( "compute_network_endpoint_groups_v1::NetworkEndpointGroupsConnection::" "DetachNetworkEndpoints"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DetachNetworkEndpoints(request)); } @@ -106,7 +106,7 @@ NetworkEndpointGroupsTracingConnection::InsertNetworkEndpointGroup( auto span = internal::MakeSpan( "compute_network_endpoint_groups_v1::NetworkEndpointGroupsConnection::" "InsertNetworkEndpointGroup"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertNetworkEndpointGroup(request)); } @@ -118,7 +118,7 @@ NetworkEndpointGroupsTracingConnection::ListNetworkEndpointGroups( auto span = internal::MakeSpan( "compute_network_endpoint_groups_v1::NetworkEndpointGroupsConnection::" "ListNetworkEndpointGroups"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListNetworkEndpointGroups(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::NetworkEndpointGroup>(std::move(span), @@ -132,7 +132,7 @@ NetworkEndpointGroupsTracingConnection::ListNetworkEndpoints( auto span = internal::MakeSpan( "compute_network_endpoint_groups_v1::NetworkEndpointGroupsConnection::" "ListNetworkEndpoints"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListNetworkEndpoints(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::NetworkEndpointWithHealthStatus>( diff --git a/google/cloud/compute/network_firewall_policies/v1/internal/network_firewall_policies_tracing_connection.cc b/google/cloud/compute/network_firewall_policies/v1/internal/network_firewall_policies_tracing_connection.cc index dc59ad0758c6..38924c9987c5 100644 --- a/google/cloud/compute/network_firewall_policies/v1/internal/network_firewall_policies_tracing_connection.cc +++ b/google/cloud/compute/network_firewall_policies/v1/internal/network_firewall_policies_tracing_connection.cc @@ -43,7 +43,7 @@ NetworkFirewallPoliciesTracingConnection::AddAssociation( auto span = internal::MakeSpan( "compute_network_firewall_policies_v1::NetworkFirewallPoliciesConnection:" ":AddAssociation"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->AddAssociation(request)); } @@ -54,7 +54,7 @@ NetworkFirewallPoliciesTracingConnection::AddRule( auto span = internal::MakeSpan( "compute_network_firewall_policies_v1::NetworkFirewallPoliciesConnection:" ":AddRule"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->AddRule(request)); } @@ -65,7 +65,7 @@ NetworkFirewallPoliciesTracingConnection::CloneRules( auto span = internal::MakeSpan( "compute_network_firewall_policies_v1::NetworkFirewallPoliciesConnection:" ":CloneRules"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CloneRules(request)); } @@ -76,7 +76,7 @@ NetworkFirewallPoliciesTracingConnection::DeleteFirewallPolicy( auto span = internal::MakeSpan( "compute_network_firewall_policies_v1::NetworkFirewallPoliciesConnection:" ":DeleteFirewallPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteFirewallPolicy(request)); } @@ -132,7 +132,7 @@ NetworkFirewallPoliciesTracingConnection::InsertFirewallPolicy( auto span = internal::MakeSpan( "compute_network_firewall_policies_v1::NetworkFirewallPoliciesConnection:" ":InsertFirewallPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertFirewallPolicy(request)); } @@ -144,7 +144,7 @@ NetworkFirewallPoliciesTracingConnection::ListNetworkFirewallPolicies( auto span = internal::MakeSpan( "compute_network_firewall_policies_v1::NetworkFirewallPoliciesConnection:" ":ListNetworkFirewallPolicies"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListNetworkFirewallPolicies(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::FirewallPolicy>(std::move(span), @@ -158,7 +158,7 @@ NetworkFirewallPoliciesTracingConnection::PatchFirewallPolicy( auto span = internal::MakeSpan( "compute_network_firewall_policies_v1::NetworkFirewallPoliciesConnection:" ":PatchFirewallPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchFirewallPolicy(request)); } @@ -170,7 +170,7 @@ NetworkFirewallPoliciesTracingConnection::PatchRule( auto span = internal::MakeSpan( "compute_network_firewall_policies_v1::NetworkFirewallPoliciesConnection:" ":PatchRule"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchRule(request)); } @@ -181,7 +181,7 @@ NetworkFirewallPoliciesTracingConnection::RemoveAssociation( auto span = internal::MakeSpan( "compute_network_firewall_policies_v1::NetworkFirewallPoliciesConnection:" ":RemoveAssociation"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RemoveAssociation(request)); } @@ -192,7 +192,7 @@ NetworkFirewallPoliciesTracingConnection::RemoveRule( auto span = internal::MakeSpan( "compute_network_firewall_policies_v1::NetworkFirewallPoliciesConnection:" ":RemoveRule"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RemoveRule(request)); } diff --git a/google/cloud/compute/networks/v1/internal/networks_tracing_connection.cc b/google/cloud/compute/networks/v1/internal/networks_tracing_connection.cc index 7b9d572b7203..9092f1ad02ed 100644 --- a/google/cloud/compute/networks/v1/internal/networks_tracing_connection.cc +++ b/google/cloud/compute/networks/v1/internal/networks_tracing_connection.cc @@ -38,7 +38,7 @@ NetworksTracingConnection::AddPeering( request) { auto span = internal::MakeSpan("compute_networks_v1::NetworksConnection::AddPeering"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->AddPeering(request)); } @@ -48,7 +48,7 @@ NetworksTracingConnection::DeleteNetwork( request) { auto span = internal::MakeSpan( "compute_networks_v1::NetworksConnection::DeleteNetwork"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteNetwork(request)); } @@ -78,7 +78,7 @@ NetworksTracingConnection::InsertNetwork( request) { auto span = internal::MakeSpan( "compute_networks_v1::NetworksConnection::InsertNetwork"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertNetwork(request)); } @@ -87,7 +87,7 @@ NetworksTracingConnection::ListNetworks( google::cloud::cpp::compute::networks::v1::ListNetworksRequest request) { auto span = internal::MakeSpan( "compute_networks_v1::NetworksConnection::ListNetworks"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListNetworks(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::Network>(std::move(span), std::move(sr)); @@ -99,7 +99,7 @@ NetworksTracingConnection::ListPeeringRoutes( request) { auto span = internal::MakeSpan( "compute_networks_v1::NetworksConnection::ListPeeringRoutes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListPeeringRoutes(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::ExchangedPeeringRoute>(std::move(span), @@ -112,7 +112,7 @@ NetworksTracingConnection::PatchNetwork( request) { auto span = internal::MakeSpan( "compute_networks_v1::NetworksConnection::PatchNetwork"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchNetwork(request)); } @@ -122,7 +122,7 @@ NetworksTracingConnection::RemovePeering( request) { auto span = internal::MakeSpan( "compute_networks_v1::NetworksConnection::RemovePeering"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RemovePeering(request)); } @@ -132,7 +132,7 @@ NetworksTracingConnection::SwitchToCustomMode( request) { auto span = internal::MakeSpan( "compute_networks_v1::NetworksConnection::SwitchToCustomMode"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SwitchToCustomMode(request)); } @@ -143,7 +143,7 @@ NetworksTracingConnection::UpdatePeering( request) { auto span = internal::MakeSpan( "compute_networks_v1::NetworksConnection::UpdatePeering"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdatePeering(request)); } diff --git a/google/cloud/compute/node_groups/v1/internal/node_groups_tracing_connection.cc b/google/cloud/compute/node_groups/v1/internal/node_groups_tracing_connection.cc index 65bd7aef4d8d..6cb1a460dc61 100644 --- a/google/cloud/compute/node_groups/v1/internal/node_groups_tracing_connection.cc +++ b/google/cloud/compute/node_groups/v1/internal/node_groups_tracing_connection.cc @@ -38,7 +38,7 @@ NodeGroupsTracingConnection::AddNodes( request) { auto span = internal::MakeSpan( "compute_node_groups_v1::NodeGroupsConnection::AddNodes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->AddNodes(request)); } @@ -49,7 +49,7 @@ NodeGroupsTracingConnection::AggregatedListNodeGroups( AggregatedListNodeGroupsRequest request) { auto span = internal::MakeSpan( "compute_node_groups_v1::NodeGroupsConnection::AggregatedListNodeGroups"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->AggregatedListNodeGroups(std::move(request)); return internal::MakeTracedStreamRange>( @@ -62,7 +62,7 @@ NodeGroupsTracingConnection::DeleteNodeGroup( request) { auto span = internal::MakeSpan( "compute_node_groups_v1::NodeGroupsConnection::DeleteNodeGroup"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteNodeGroup(request)); } @@ -72,7 +72,7 @@ NodeGroupsTracingConnection::DeleteNodes( request) { auto span = internal::MakeSpan( "compute_node_groups_v1::NodeGroupsConnection::DeleteNodes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteNodes(request)); } @@ -102,7 +102,7 @@ NodeGroupsTracingConnection::InsertNodeGroup( request) { auto span = internal::MakeSpan( "compute_node_groups_v1::NodeGroupsConnection::InsertNodeGroup"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertNodeGroup(request)); } @@ -112,7 +112,7 @@ NodeGroupsTracingConnection::ListNodeGroups( request) { auto span = internal::MakeSpan( "compute_node_groups_v1::NodeGroupsConnection::ListNodeGroups"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListNodeGroups(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::NodeGroup>(std::move(span), @@ -124,7 +124,7 @@ NodeGroupsTracingConnection::ListNodes( google::cloud::cpp::compute::node_groups::v1::ListNodesRequest request) { auto span = internal::MakeSpan( "compute_node_groups_v1::NodeGroupsConnection::ListNodes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListNodes(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::NodeGroupNode>(std::move(span), @@ -137,7 +137,7 @@ NodeGroupsTracingConnection::PatchNodeGroup( request) { auto span = internal::MakeSpan( "compute_node_groups_v1::NodeGroupsConnection::PatchNodeGroup"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchNodeGroup(request)); } @@ -157,7 +157,7 @@ NodeGroupsTracingConnection::SetNodeTemplate( request) { auto span = internal::MakeSpan( "compute_node_groups_v1::NodeGroupsConnection::SetNodeTemplate"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetNodeTemplate(request)); } @@ -167,7 +167,7 @@ NodeGroupsTracingConnection::SimulateMaintenanceEvent( SimulateMaintenanceEventRequest const& request) { auto span = internal::MakeSpan( "compute_node_groups_v1::NodeGroupsConnection::SimulateMaintenanceEvent"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SimulateMaintenanceEvent(request)); } diff --git a/google/cloud/compute/node_templates/v1/internal/node_templates_tracing_connection.cc b/google/cloud/compute/node_templates/v1/internal/node_templates_tracing_connection.cc index 27b37349ec70..2f3b9153fc62 100644 --- a/google/cloud/compute/node_templates/v1/internal/node_templates_tracing_connection.cc +++ b/google/cloud/compute/node_templates/v1/internal/node_templates_tracing_connection.cc @@ -40,7 +40,7 @@ NodeTemplatesTracingConnection::AggregatedListNodeTemplates( auto span = internal::MakeSpan( "compute_node_templates_v1::NodeTemplatesConnection::" "AggregatedListNodeTemplates"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->AggregatedListNodeTemplates(std::move(request)); return internal::MakeTracedStreamRange>( @@ -53,7 +53,7 @@ NodeTemplatesTracingConnection::DeleteNodeTemplate( DeleteNodeTemplateRequest const& request) { auto span = internal::MakeSpan( "compute_node_templates_v1::NodeTemplatesConnection::DeleteNodeTemplate"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteNodeTemplate(request)); } @@ -84,7 +84,7 @@ NodeTemplatesTracingConnection::InsertNodeTemplate( InsertNodeTemplateRequest const& request) { auto span = internal::MakeSpan( "compute_node_templates_v1::NodeTemplatesConnection::InsertNodeTemplate"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertNodeTemplate(request)); } @@ -95,7 +95,7 @@ NodeTemplatesTracingConnection::ListNodeTemplates( request) { auto span = internal::MakeSpan( "compute_node_templates_v1::NodeTemplatesConnection::ListNodeTemplates"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListNodeTemplates(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::NodeTemplate>(std::move(span), diff --git a/google/cloud/compute/node_types/v1/internal/node_types_tracing_connection.cc b/google/cloud/compute/node_types/v1/internal/node_types_tracing_connection.cc index f7cef9517f97..83ba10769537 100644 --- a/google/cloud/compute/node_types/v1/internal/node_types_tracing_connection.cc +++ b/google/cloud/compute/node_types/v1/internal/node_types_tracing_connection.cc @@ -39,7 +39,7 @@ NodeTypesTracingConnection::AggregatedListNodeTypes( request) { auto span = internal::MakeSpan( "compute_node_types_v1::NodeTypesConnection::AggregatedListNodeTypes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->AggregatedListNodeTypes(std::move(request)); return internal::MakeTracedStreamRange>( @@ -61,7 +61,7 @@ NodeTypesTracingConnection::ListNodeTypes( google::cloud::cpp::compute::node_types::v1::ListNodeTypesRequest request) { auto span = internal::MakeSpan( "compute_node_types_v1::NodeTypesConnection::ListNodeTypes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListNodeTypes(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::NodeType>(std::move(span), diff --git a/google/cloud/compute/packet_mirrorings/v1/internal/packet_mirrorings_tracing_connection.cc b/google/cloud/compute/packet_mirrorings/v1/internal/packet_mirrorings_tracing_connection.cc index 95fe6fc0bc2e..248ff8509560 100644 --- a/google/cloud/compute/packet_mirrorings/v1/internal/packet_mirrorings_tracing_connection.cc +++ b/google/cloud/compute/packet_mirrorings/v1/internal/packet_mirrorings_tracing_connection.cc @@ -41,7 +41,7 @@ PacketMirroringsTracingConnection::AggregatedListPacketMirrorings( auto span = internal::MakeSpan( "compute_packet_mirrorings_v1::PacketMirroringsConnection::" "AggregatedListPacketMirrorings"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->AggregatedListPacketMirrorings(std::move(request)); return internal::MakeTracedStreamRange< std::pairDeletePacketMirroring(request)); } @@ -79,7 +79,7 @@ PacketMirroringsTracingConnection::InsertPacketMirroring( auto span = internal::MakeSpan( "compute_packet_mirrorings_v1::PacketMirroringsConnection::" "InsertPacketMirroring"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertPacketMirroring(request)); } @@ -91,7 +91,7 @@ PacketMirroringsTracingConnection::ListPacketMirrorings( auto span = internal::MakeSpan( "compute_packet_mirrorings_v1::PacketMirroringsConnection::" "ListPacketMirrorings"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListPacketMirrorings(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::PacketMirroring>(std::move(span), @@ -105,7 +105,7 @@ PacketMirroringsTracingConnection::PatchPacketMirroring( auto span = internal::MakeSpan( "compute_packet_mirrorings_v1::PacketMirroringsConnection::" "PatchPacketMirroring"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchPacketMirroring(request)); } diff --git a/google/cloud/compute/projects/v1/internal/projects_tracing_connection.cc b/google/cloud/compute/projects/v1/internal/projects_tracing_connection.cc index 5574ed095eba..7df2ac3aa113 100644 --- a/google/cloud/compute/projects/v1/internal/projects_tracing_connection.cc +++ b/google/cloud/compute/projects/v1/internal/projects_tracing_connection.cc @@ -38,7 +38,7 @@ ProjectsTracingConnection::DisableXpnHost( request) { auto span = internal::MakeSpan( "compute_projects_v1::ProjectsConnection::DisableXpnHost"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DisableXpnHost(request)); } @@ -48,7 +48,7 @@ ProjectsTracingConnection::DisableXpnResource( request) { auto span = internal::MakeSpan( "compute_projects_v1::ProjectsConnection::DisableXpnResource"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DisableXpnResource(request)); } @@ -59,7 +59,7 @@ ProjectsTracingConnection::EnableXpnHost( request) { auto span = internal::MakeSpan( "compute_projects_v1::ProjectsConnection::EnableXpnHost"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->EnableXpnHost(request)); } @@ -69,7 +69,7 @@ ProjectsTracingConnection::EnableXpnResource( request) { auto span = internal::MakeSpan( "compute_projects_v1::ProjectsConnection::EnableXpnResource"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->EnableXpnResource(request)); } @@ -108,7 +108,7 @@ ProjectsTracingConnection::ListXpnHosts( google::cloud::cpp::compute::projects::v1::ListXpnHostsRequest request) { auto span = internal::MakeSpan( "compute_projects_v1::ProjectsConnection::ListXpnHosts"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListXpnHosts(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::Project>(std::move(span), std::move(sr)); @@ -119,7 +119,7 @@ ProjectsTracingConnection::MoveDisk( google::cloud::cpp::compute::projects::v1::MoveDiskRequest const& request) { auto span = internal::MakeSpan("compute_projects_v1::ProjectsConnection::MoveDisk"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->MoveDisk(request)); } @@ -129,7 +129,7 @@ ProjectsTracingConnection::MoveInstance( request) { auto span = internal::MakeSpan( "compute_projects_v1::ProjectsConnection::MoveInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->MoveInstance(request)); } @@ -139,7 +139,7 @@ ProjectsTracingConnection::SetCommonInstanceMetadata( SetCommonInstanceMetadataRequest const& request) { auto span = internal::MakeSpan( "compute_projects_v1::ProjectsConnection::SetCommonInstanceMetadata"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetCommonInstanceMetadata(request)); } @@ -150,7 +150,7 @@ ProjectsTracingConnection::SetDefaultNetworkTier( SetDefaultNetworkTierRequest const& request) { auto span = internal::MakeSpan( "compute_projects_v1::ProjectsConnection::SetDefaultNetworkTier"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetDefaultNetworkTier(request)); } @@ -161,7 +161,7 @@ ProjectsTracingConnection::SetUsageExportBucket( SetUsageExportBucketRequest const& request) { auto span = internal::MakeSpan( "compute_projects_v1::ProjectsConnection::SetUsageExportBucket"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetUsageExportBucket(request)); } diff --git a/google/cloud/compute/public_advertised_prefixes/v1/internal/public_advertised_prefixes_tracing_connection.cc b/google/cloud/compute/public_advertised_prefixes/v1/internal/public_advertised_prefixes_tracing_connection.cc index 16c1080a4fda..8e7ea848598c 100644 --- a/google/cloud/compute/public_advertised_prefixes/v1/internal/public_advertised_prefixes_tracing_connection.cc +++ b/google/cloud/compute/public_advertised_prefixes/v1/internal/public_advertised_prefixes_tracing_connection.cc @@ -43,7 +43,7 @@ PublicAdvertisedPrefixesTracingConnection::DeletePublicAdvertisedPrefix( auto span = internal::MakeSpan( "compute_public_advertised_prefixes_v1::" "PublicAdvertisedPrefixesConnection::DeletePublicAdvertisedPrefix"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeletePublicAdvertisedPrefix(request)); } @@ -66,7 +66,7 @@ PublicAdvertisedPrefixesTracingConnection::InsertPublicAdvertisedPrefix( auto span = internal::MakeSpan( "compute_public_advertised_prefixes_v1::" "PublicAdvertisedPrefixesConnection::InsertPublicAdvertisedPrefix"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertPublicAdvertisedPrefix(request)); } @@ -78,7 +78,7 @@ PublicAdvertisedPrefixesTracingConnection::ListPublicAdvertisedPrefixes( auto span = internal::MakeSpan( "compute_public_advertised_prefixes_v1::" "PublicAdvertisedPrefixesConnection::ListPublicAdvertisedPrefixes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListPublicAdvertisedPrefixes(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::PublicAdvertisedPrefix>(std::move(span), @@ -92,7 +92,7 @@ PublicAdvertisedPrefixesTracingConnection::PatchPublicAdvertisedPrefix( auto span = internal::MakeSpan( "compute_public_advertised_prefixes_v1::" "PublicAdvertisedPrefixesConnection::PatchPublicAdvertisedPrefix"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchPublicAdvertisedPrefix(request)); } diff --git a/google/cloud/compute/public_delegated_prefixes/v1/internal/public_delegated_prefixes_tracing_connection.cc b/google/cloud/compute/public_delegated_prefixes/v1/internal/public_delegated_prefixes_tracing_connection.cc index 2d12f7bad653..3af14f5b14c8 100644 --- a/google/cloud/compute/public_delegated_prefixes/v1/internal/public_delegated_prefixes_tracing_connection.cc +++ b/google/cloud/compute/public_delegated_prefixes/v1/internal/public_delegated_prefixes_tracing_connection.cc @@ -44,7 +44,7 @@ PublicDelegatedPrefixesTracingConnection::AggregatedListPublicDelegatedPrefixes( auto span = internal::MakeSpan( "compute_public_delegated_prefixes_v1::PublicDelegatedPrefixesConnection:" ":AggregatedListPublicDelegatedPrefixes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->AggregatedListPublicDelegatedPrefixes(std::move(request)); return internal::MakeTracedStreamRangeDeletePublicDelegatedPrefix(request)); } @@ -82,7 +82,7 @@ PublicDelegatedPrefixesTracingConnection::InsertPublicDelegatedPrefix( auto span = internal::MakeSpan( "compute_public_delegated_prefixes_v1::PublicDelegatedPrefixesConnection:" ":InsertPublicDelegatedPrefix"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertPublicDelegatedPrefix(request)); } @@ -94,7 +94,7 @@ PublicDelegatedPrefixesTracingConnection::ListPublicDelegatedPrefixes( auto span = internal::MakeSpan( "compute_public_delegated_prefixes_v1::PublicDelegatedPrefixesConnection:" ":ListPublicDelegatedPrefixes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListPublicDelegatedPrefixes(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::PublicDelegatedPrefix>(std::move(span), @@ -108,7 +108,7 @@ PublicDelegatedPrefixesTracingConnection::PatchPublicDelegatedPrefix( auto span = internal::MakeSpan( "compute_public_delegated_prefixes_v1::PublicDelegatedPrefixesConnection:" ":PatchPublicDelegatedPrefix"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchPublicDelegatedPrefix(request)); } diff --git a/google/cloud/compute/region_autoscalers/v1/internal/region_autoscalers_tracing_connection.cc b/google/cloud/compute/region_autoscalers/v1/internal/region_autoscalers_tracing_connection.cc index 3c558295eb85..81e933eff8db 100644 --- a/google/cloud/compute/region_autoscalers/v1/internal/region_autoscalers_tracing_connection.cc +++ b/google/cloud/compute/region_autoscalers/v1/internal/region_autoscalers_tracing_connection.cc @@ -40,7 +40,7 @@ RegionAutoscalersTracingConnection::DeleteAutoscaler( auto span = internal::MakeSpan( "compute_region_autoscalers_v1::RegionAutoscalersConnection::" "DeleteAutoscaler"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteAutoscaler(request)); } @@ -62,7 +62,7 @@ RegionAutoscalersTracingConnection::InsertAutoscaler( auto span = internal::MakeSpan( "compute_region_autoscalers_v1::RegionAutoscalersConnection::" "InsertAutoscaler"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertAutoscaler(request)); } @@ -73,7 +73,7 @@ RegionAutoscalersTracingConnection::ListRegionAutoscalers( auto span = internal::MakeSpan( "compute_region_autoscalers_v1::RegionAutoscalersConnection::" "ListRegionAutoscalers"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListRegionAutoscalers(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::Autoscaler>(std::move(span), @@ -87,7 +87,7 @@ RegionAutoscalersTracingConnection::PatchAutoscaler( auto span = internal::MakeSpan( "compute_region_autoscalers_v1::RegionAutoscalersConnection::" "PatchAutoscaler"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchAutoscaler(request)); } @@ -98,7 +98,7 @@ RegionAutoscalersTracingConnection::UpdateAutoscaler( auto span = internal::MakeSpan( "compute_region_autoscalers_v1::RegionAutoscalersConnection::" "UpdateAutoscaler"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateAutoscaler(request)); } diff --git a/google/cloud/compute/region_backend_services/v1/internal/region_backend_services_tracing_connection.cc b/google/cloud/compute/region_backend_services/v1/internal/region_backend_services_tracing_connection.cc index ff39550dcaa0..0c7b80b6fd62 100644 --- a/google/cloud/compute/region_backend_services/v1/internal/region_backend_services_tracing_connection.cc +++ b/google/cloud/compute/region_backend_services/v1/internal/region_backend_services_tracing_connection.cc @@ -42,7 +42,7 @@ RegionBackendServicesTracingConnection::DeleteBackendService( auto span = internal::MakeSpan( "compute_region_backend_services_v1::RegionBackendServicesConnection::" "DeleteBackendService"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteBackendService(request)); } @@ -87,7 +87,7 @@ RegionBackendServicesTracingConnection::InsertBackendService( auto span = internal::MakeSpan( "compute_region_backend_services_v1::RegionBackendServicesConnection::" "InsertBackendService"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertBackendService(request)); } @@ -99,7 +99,7 @@ RegionBackendServicesTracingConnection::ListRegionBackendServices( auto span = internal::MakeSpan( "compute_region_backend_services_v1::RegionBackendServicesConnection::" "ListRegionBackendServices"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListRegionBackendServices(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::BackendService>(std::move(span), @@ -113,7 +113,7 @@ RegionBackendServicesTracingConnection::ListUsable( auto span = internal::MakeSpan( "compute_region_backend_services_v1::RegionBackendServicesConnection::" "ListUsable"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListUsable(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::BackendService>(std::move(span), @@ -127,7 +127,7 @@ RegionBackendServicesTracingConnection::PatchBackendService( auto span = internal::MakeSpan( "compute_region_backend_services_v1::RegionBackendServicesConnection::" "PatchBackendService"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchBackendService(request)); } @@ -150,7 +150,7 @@ RegionBackendServicesTracingConnection::SetSecurityPolicy( auto span = internal::MakeSpan( "compute_region_backend_services_v1::RegionBackendServicesConnection::" "SetSecurityPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetSecurityPolicy(request)); } @@ -161,7 +161,7 @@ RegionBackendServicesTracingConnection::UpdateBackendService( auto span = internal::MakeSpan( "compute_region_backend_services_v1::RegionBackendServicesConnection::" "UpdateBackendService"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateBackendService(request)); } diff --git a/google/cloud/compute/region_commitments/v1/internal/region_commitments_tracing_connection.cc b/google/cloud/compute/region_commitments/v1/internal/region_commitments_tracing_connection.cc index 38047d3a26ad..11bfea077a92 100644 --- a/google/cloud/compute/region_commitments/v1/internal/region_commitments_tracing_connection.cc +++ b/google/cloud/compute/region_commitments/v1/internal/region_commitments_tracing_connection.cc @@ -41,7 +41,7 @@ RegionCommitmentsTracingConnection::AggregatedListRegionCommitments( auto span = internal::MakeSpan( "compute_region_commitments_v1::RegionCommitmentsConnection::" "AggregatedListRegionCommitments"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->AggregatedListRegionCommitments(std::move(request)); return internal::MakeTracedStreamRange>( @@ -66,7 +66,7 @@ RegionCommitmentsTracingConnection::InsertCommitment( auto span = internal::MakeSpan( "compute_region_commitments_v1::RegionCommitmentsConnection::" "InsertCommitment"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertCommitment(request)); } @@ -77,7 +77,7 @@ RegionCommitmentsTracingConnection::ListRegionCommitments( auto span = internal::MakeSpan( "compute_region_commitments_v1::RegionCommitmentsConnection::" "ListRegionCommitments"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListRegionCommitments(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::Commitment>(std::move(span), @@ -91,7 +91,7 @@ RegionCommitmentsTracingConnection::UpdateCommitment( auto span = internal::MakeSpan( "compute_region_commitments_v1::RegionCommitmentsConnection::" "UpdateCommitment"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateCommitment(request)); } diff --git a/google/cloud/compute/region_disk_types/v1/internal/region_disk_types_tracing_connection.cc b/google/cloud/compute/region_disk_types/v1/internal/region_disk_types_tracing_connection.cc index 2f7b3134a8da..02069f9aa809 100644 --- a/google/cloud/compute/region_disk_types/v1/internal/region_disk_types_tracing_connection.cc +++ b/google/cloud/compute/region_disk_types/v1/internal/region_disk_types_tracing_connection.cc @@ -50,7 +50,7 @@ RegionDiskTypesTracingConnection::ListRegionDiskTypes( auto span = internal::MakeSpan( "compute_region_disk_types_v1::RegionDiskTypesConnection::" "ListRegionDiskTypes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListRegionDiskTypes(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::DiskType>(std::move(span), diff --git a/google/cloud/compute/region_disks/v1/internal/region_disks_tracing_connection.cc b/google/cloud/compute/region_disks/v1/internal/region_disks_tracing_connection.cc index bf81e9ae38ec..1075c3d58696 100644 --- a/google/cloud/compute/region_disks/v1/internal/region_disks_tracing_connection.cc +++ b/google/cloud/compute/region_disks/v1/internal/region_disks_tracing_connection.cc @@ -38,7 +38,7 @@ RegionDisksTracingConnection::AddResourcePolicies( AddResourcePoliciesRequest const& request) { auto span = internal::MakeSpan( "compute_region_disks_v1::RegionDisksConnection::AddResourcePolicies"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->AddResourcePolicies(request)); } @@ -49,7 +49,7 @@ RegionDisksTracingConnection::BulkInsert( request) { auto span = internal::MakeSpan( "compute_region_disks_v1::RegionDisksConnection::BulkInsert"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->BulkInsert(request)); } @@ -59,7 +59,7 @@ RegionDisksTracingConnection::CreateSnapshot( request) { auto span = internal::MakeSpan( "compute_region_disks_v1::RegionDisksConnection::CreateSnapshot"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateSnapshot(request)); } @@ -69,7 +69,7 @@ RegionDisksTracingConnection::DeleteDisk( request) { auto span = internal::MakeSpan( "compute_region_disks_v1::RegionDisksConnection::DeleteDisk"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteDisk(request)); } @@ -99,7 +99,7 @@ RegionDisksTracingConnection::InsertDisk( request) { auto span = internal::MakeSpan( "compute_region_disks_v1::RegionDisksConnection::InsertDisk"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertDisk(request)); } @@ -109,7 +109,7 @@ RegionDisksTracingConnection::ListRegionDisks( request) { auto span = internal::MakeSpan( "compute_region_disks_v1::RegionDisksConnection::ListRegionDisks"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListRegionDisks(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -121,7 +121,7 @@ RegionDisksTracingConnection::RemoveResourcePolicies( RemoveResourcePoliciesRequest const& request) { auto span = internal::MakeSpan( "compute_region_disks_v1::RegionDisksConnection::RemoveResourcePolicies"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RemoveResourcePolicies(request)); } @@ -132,7 +132,7 @@ RegionDisksTracingConnection::Resize( request) { auto span = internal::MakeSpan( "compute_region_disks_v1::RegionDisksConnection::Resize"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->Resize(request)); } @@ -152,7 +152,7 @@ RegionDisksTracingConnection::SetLabels( request) { auto span = internal::MakeSpan( "compute_region_disks_v1::RegionDisksConnection::SetLabels"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetLabels(request)); } @@ -162,7 +162,7 @@ RegionDisksTracingConnection::StartAsyncReplication( StartAsyncReplicationRequest const& request) { auto span = internal::MakeSpan( "compute_region_disks_v1::RegionDisksConnection::StartAsyncReplication"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->StartAsyncReplication(request)); } @@ -173,7 +173,7 @@ RegionDisksTracingConnection::StopAsyncReplication( StopAsyncReplicationRequest const& request) { auto span = internal::MakeSpan( "compute_region_disks_v1::RegionDisksConnection::StopAsyncReplication"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->StopAsyncReplication(request)); } @@ -185,7 +185,7 @@ RegionDisksTracingConnection::StopGroupAsyncReplication( auto span = internal::MakeSpan( "compute_region_disks_v1::RegionDisksConnection::" "StopGroupAsyncReplication"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->StopGroupAsyncReplication(request)); } @@ -206,7 +206,7 @@ RegionDisksTracingConnection::UpdateDisk( request) { auto span = internal::MakeSpan( "compute_region_disks_v1::RegionDisksConnection::UpdateDisk"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateDisk(request)); } diff --git a/google/cloud/compute/region_health_check_services/v1/internal/region_health_check_services_tracing_connection.cc b/google/cloud/compute/region_health_check_services/v1/internal/region_health_check_services_tracing_connection.cc index 7f0993f30ffe..173b8f2646ff 100644 --- a/google/cloud/compute/region_health_check_services/v1/internal/region_health_check_services_tracing_connection.cc +++ b/google/cloud/compute/region_health_check_services/v1/internal/region_health_check_services_tracing_connection.cc @@ -43,7 +43,7 @@ RegionHealthCheckServicesTracingConnection::DeleteHealthCheckService( auto span = internal::MakeSpan( "compute_region_health_check_services_v1::" "RegionHealthCheckServicesConnection::DeleteHealthCheckService"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteHealthCheckService(request)); } @@ -66,7 +66,7 @@ RegionHealthCheckServicesTracingConnection::InsertHealthCheckService( auto span = internal::MakeSpan( "compute_region_health_check_services_v1::" "RegionHealthCheckServicesConnection::InsertHealthCheckService"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertHealthCheckService(request)); } @@ -78,7 +78,7 @@ RegionHealthCheckServicesTracingConnection::ListRegionHealthCheckServices( auto span = internal::MakeSpan( "compute_region_health_check_services_v1::" "RegionHealthCheckServicesConnection::ListRegionHealthCheckServices"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListRegionHealthCheckServices(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::HealthCheckService>(std::move(span), @@ -92,7 +92,7 @@ RegionHealthCheckServicesTracingConnection::PatchHealthCheckService( auto span = internal::MakeSpan( "compute_region_health_check_services_v1::" "RegionHealthCheckServicesConnection::PatchHealthCheckService"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchHealthCheckService(request)); } diff --git a/google/cloud/compute/region_health_checks/v1/internal/region_health_checks_tracing_connection.cc b/google/cloud/compute/region_health_checks/v1/internal/region_health_checks_tracing_connection.cc index 2d7071e74669..d95d38386e73 100644 --- a/google/cloud/compute/region_health_checks/v1/internal/region_health_checks_tracing_connection.cc +++ b/google/cloud/compute/region_health_checks/v1/internal/region_health_checks_tracing_connection.cc @@ -42,7 +42,7 @@ RegionHealthChecksTracingConnection::DeleteHealthCheck( auto span = internal::MakeSpan( "compute_region_health_checks_v1::RegionHealthChecksConnection::" "DeleteHealthCheck"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteHealthCheck(request)); } @@ -64,7 +64,7 @@ RegionHealthChecksTracingConnection::InsertHealthCheck( auto span = internal::MakeSpan( "compute_region_health_checks_v1::RegionHealthChecksConnection::" "InsertHealthCheck"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertHealthCheck(request)); } @@ -75,7 +75,7 @@ RegionHealthChecksTracingConnection::ListRegionHealthChecks( auto span = internal::MakeSpan( "compute_region_health_checks_v1::RegionHealthChecksConnection::" "ListRegionHealthChecks"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListRegionHealthChecks(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::HealthCheck>(std::move(span), @@ -89,7 +89,7 @@ RegionHealthChecksTracingConnection::PatchHealthCheck( auto span = internal::MakeSpan( "compute_region_health_checks_v1::RegionHealthChecksConnection::" "PatchHealthCheck"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchHealthCheck(request)); } @@ -100,7 +100,7 @@ RegionHealthChecksTracingConnection::UpdateHealthCheck( auto span = internal::MakeSpan( "compute_region_health_checks_v1::RegionHealthChecksConnection::" "UpdateHealthCheck"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateHealthCheck(request)); } diff --git a/google/cloud/compute/region_instance_group_managers/v1/internal/region_instance_group_managers_tracing_connection.cc b/google/cloud/compute/region_instance_group_managers/v1/internal/region_instance_group_managers_tracing_connection.cc index 56e009fa1954..a5baf98daa7b 100644 --- a/google/cloud/compute/region_instance_group_managers/v1/internal/region_instance_group_managers_tracing_connection.cc +++ b/google/cloud/compute/region_instance_group_managers/v1/internal/region_instance_group_managers_tracing_connection.cc @@ -43,7 +43,7 @@ RegionInstanceGroupManagersTracingConnection::AbandonInstances( auto span = internal::MakeSpan( "compute_region_instance_group_managers_v1::" "RegionInstanceGroupManagersConnection::AbandonInstances"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->AbandonInstances(request)); } @@ -54,7 +54,7 @@ RegionInstanceGroupManagersTracingConnection::ApplyUpdatesToInstances( auto span = internal::MakeSpan( "compute_region_instance_group_managers_v1::" "RegionInstanceGroupManagersConnection::ApplyUpdatesToInstances"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ApplyUpdatesToInstances(request)); } @@ -66,7 +66,7 @@ RegionInstanceGroupManagersTracingConnection::CreateInstances( auto span = internal::MakeSpan( "compute_region_instance_group_managers_v1::" "RegionInstanceGroupManagersConnection::CreateInstances"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateInstances(request)); } @@ -77,7 +77,7 @@ RegionInstanceGroupManagersTracingConnection::DeleteInstanceGroupManager( auto span = internal::MakeSpan( "compute_region_instance_group_managers_v1::" "RegionInstanceGroupManagersConnection::DeleteInstanceGroupManager"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteInstanceGroupManager(request)); } @@ -89,7 +89,7 @@ RegionInstanceGroupManagersTracingConnection::DeleteInstances( auto span = internal::MakeSpan( "compute_region_instance_group_managers_v1::" "RegionInstanceGroupManagersConnection::DeleteInstances"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteInstances(request)); } @@ -100,7 +100,7 @@ RegionInstanceGroupManagersTracingConnection::DeletePerInstanceConfigs( auto span = internal::MakeSpan( "compute_region_instance_group_managers_v1::" "RegionInstanceGroupManagersConnection::DeletePerInstanceConfigs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeletePerInstanceConfigs(request)); } @@ -123,7 +123,7 @@ RegionInstanceGroupManagersTracingConnection::InsertInstanceGroupManager( auto span = internal::MakeSpan( "compute_region_instance_group_managers_v1::" "RegionInstanceGroupManagersConnection::InsertInstanceGroupManager"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertInstanceGroupManager(request)); } @@ -135,7 +135,7 @@ RegionInstanceGroupManagersTracingConnection::ListRegionInstanceGroupManagers( auto span = internal::MakeSpan( "compute_region_instance_group_managers_v1::" "RegionInstanceGroupManagersConnection::ListRegionInstanceGroupManagers"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListRegionInstanceGroupManagers(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::InstanceGroupManager>(std::move(span), @@ -149,7 +149,7 @@ RegionInstanceGroupManagersTracingConnection::ListErrors( auto span = internal::MakeSpan( "compute_region_instance_group_managers_v1::" "RegionInstanceGroupManagersConnection::ListErrors"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListErrors(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::InstanceManagedByIgmError>( @@ -175,7 +175,7 @@ RegionInstanceGroupManagersTracingConnection::ListPerInstanceConfigs( auto span = internal::MakeSpan( "compute_region_instance_group_managers_v1::" "RegionInstanceGroupManagersConnection::ListPerInstanceConfigs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListPerInstanceConfigs(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::PerInstanceConfig>(std::move(span), @@ -189,7 +189,7 @@ RegionInstanceGroupManagersTracingConnection::PatchInstanceGroupManager( auto span = internal::MakeSpan( "compute_region_instance_group_managers_v1::" "RegionInstanceGroupManagersConnection::PatchInstanceGroupManager"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchInstanceGroupManager(request)); } @@ -201,7 +201,7 @@ RegionInstanceGroupManagersTracingConnection::PatchPerInstanceConfigs( auto span = internal::MakeSpan( "compute_region_instance_group_managers_v1::" "RegionInstanceGroupManagersConnection::PatchPerInstanceConfigs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchPerInstanceConfigs(request)); } @@ -213,7 +213,7 @@ RegionInstanceGroupManagersTracingConnection::RecreateInstances( auto span = internal::MakeSpan( "compute_region_instance_group_managers_v1::" "RegionInstanceGroupManagersConnection::RecreateInstances"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RecreateInstances(request)); } @@ -224,7 +224,7 @@ RegionInstanceGroupManagersTracingConnection::Resize( auto span = internal::MakeSpan( "compute_region_instance_group_managers_v1::" "RegionInstanceGroupManagersConnection::Resize"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->Resize(request)); } @@ -235,7 +235,7 @@ RegionInstanceGroupManagersTracingConnection::SetInstanceTemplate( auto span = internal::MakeSpan( "compute_region_instance_group_managers_v1::" "RegionInstanceGroupManagersConnection::SetInstanceTemplate"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetInstanceTemplate(request)); } @@ -247,7 +247,7 @@ RegionInstanceGroupManagersTracingConnection::SetTargetPools( auto span = internal::MakeSpan( "compute_region_instance_group_managers_v1::" "RegionInstanceGroupManagersConnection::SetTargetPools"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetTargetPools(request)); } @@ -258,7 +258,7 @@ RegionInstanceGroupManagersTracingConnection::UpdatePerInstanceConfigs( auto span = internal::MakeSpan( "compute_region_instance_group_managers_v1::" "RegionInstanceGroupManagersConnection::UpdatePerInstanceConfigs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdatePerInstanceConfigs(request)); } diff --git a/google/cloud/compute/region_instance_groups/v1/internal/region_instance_groups_tracing_connection.cc b/google/cloud/compute/region_instance_groups/v1/internal/region_instance_groups_tracing_connection.cc index 3a1289d28db5..c57dfe8212a2 100644 --- a/google/cloud/compute/region_instance_groups/v1/internal/region_instance_groups_tracing_connection.cc +++ b/google/cloud/compute/region_instance_groups/v1/internal/region_instance_groups_tracing_connection.cc @@ -53,7 +53,7 @@ RegionInstanceGroupsTracingConnection::ListRegionInstanceGroups( auto span = internal::MakeSpan( "compute_region_instance_groups_v1::RegionInstanceGroupsConnection::" "ListRegionInstanceGroups"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListRegionInstanceGroups(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::InstanceGroup>(std::move(span), @@ -67,7 +67,7 @@ RegionInstanceGroupsTracingConnection::ListInstances( auto span = internal::MakeSpan( "compute_region_instance_groups_v1::RegionInstanceGroupsConnection::" "ListInstances"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListInstances(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::InstanceWithNamedPorts>(std::move(span), @@ -81,7 +81,7 @@ RegionInstanceGroupsTracingConnection::SetNamedPorts( auto span = internal::MakeSpan( "compute_region_instance_groups_v1::RegionInstanceGroupsConnection::" "SetNamedPorts"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetNamedPorts(request)); } diff --git a/google/cloud/compute/region_instance_templates/v1/internal/region_instance_templates_tracing_connection.cc b/google/cloud/compute/region_instance_templates/v1/internal/region_instance_templates_tracing_connection.cc index 8952c350d4d5..dac247aa8653 100644 --- a/google/cloud/compute/region_instance_templates/v1/internal/region_instance_templates_tracing_connection.cc +++ b/google/cloud/compute/region_instance_templates/v1/internal/region_instance_templates_tracing_connection.cc @@ -43,7 +43,7 @@ RegionInstanceTemplatesTracingConnection::DeleteInstanceTemplate( auto span = internal::MakeSpan( "compute_region_instance_templates_v1::RegionInstanceTemplatesConnection:" ":DeleteInstanceTemplate"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteInstanceTemplate(request)); } @@ -66,7 +66,7 @@ RegionInstanceTemplatesTracingConnection::InsertInstanceTemplate( auto span = internal::MakeSpan( "compute_region_instance_templates_v1::RegionInstanceTemplatesConnection:" ":InsertInstanceTemplate"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertInstanceTemplate(request)); } @@ -78,7 +78,7 @@ RegionInstanceTemplatesTracingConnection::ListRegionInstanceTemplates( auto span = internal::MakeSpan( "compute_region_instance_templates_v1::RegionInstanceTemplatesConnection:" ":ListRegionInstanceTemplates"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListRegionInstanceTemplates(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::InstanceTemplate>(std::move(span), diff --git a/google/cloud/compute/region_instances/v1/internal/region_instances_tracing_connection.cc b/google/cloud/compute/region_instances/v1/internal/region_instances_tracing_connection.cc index e5fa150cc3ed..d07bc671fc32 100644 --- a/google/cloud/compute/region_instances/v1/internal/region_instances_tracing_connection.cc +++ b/google/cloud/compute/region_instances/v1/internal/region_instances_tracing_connection.cc @@ -38,7 +38,7 @@ RegionInstancesTracingConnection::BulkInsert( request) { auto span = internal::MakeSpan( "compute_region_instances_v1::RegionInstancesConnection::BulkInsert"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->BulkInsert(request)); } diff --git a/google/cloud/compute/region_network_endpoint_groups/v1/internal/region_network_endpoint_groups_tracing_connection.cc b/google/cloud/compute/region_network_endpoint_groups/v1/internal/region_network_endpoint_groups_tracing_connection.cc index 724e5778e09f..f8a717582dd7 100644 --- a/google/cloud/compute/region_network_endpoint_groups/v1/internal/region_network_endpoint_groups_tracing_connection.cc +++ b/google/cloud/compute/region_network_endpoint_groups/v1/internal/region_network_endpoint_groups_tracing_connection.cc @@ -43,7 +43,7 @@ RegionNetworkEndpointGroupsTracingConnection::AttachNetworkEndpoints( auto span = internal::MakeSpan( "compute_region_network_endpoint_groups_v1::" "RegionNetworkEndpointGroupsConnection::AttachNetworkEndpoints"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->AttachNetworkEndpoints(request)); } @@ -55,7 +55,7 @@ RegionNetworkEndpointGroupsTracingConnection::DeleteNetworkEndpointGroup( auto span = internal::MakeSpan( "compute_region_network_endpoint_groups_v1::" "RegionNetworkEndpointGroupsConnection::DeleteNetworkEndpointGroup"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteNetworkEndpointGroup(request)); } @@ -67,7 +67,7 @@ RegionNetworkEndpointGroupsTracingConnection::DetachNetworkEndpoints( auto span = internal::MakeSpan( "compute_region_network_endpoint_groups_v1::" "RegionNetworkEndpointGroupsConnection::DetachNetworkEndpoints"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DetachNetworkEndpoints(request)); } @@ -90,7 +90,7 @@ RegionNetworkEndpointGroupsTracingConnection::InsertNetworkEndpointGroup( auto span = internal::MakeSpan( "compute_region_network_endpoint_groups_v1::" "RegionNetworkEndpointGroupsConnection::InsertNetworkEndpointGroup"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertNetworkEndpointGroup(request)); } @@ -102,7 +102,7 @@ RegionNetworkEndpointGroupsTracingConnection::ListRegionNetworkEndpointGroups( auto span = internal::MakeSpan( "compute_region_network_endpoint_groups_v1::" "RegionNetworkEndpointGroupsConnection::ListRegionNetworkEndpointGroups"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListRegionNetworkEndpointGroups(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::NetworkEndpointGroup>(std::move(span), @@ -116,7 +116,7 @@ RegionNetworkEndpointGroupsTracingConnection::ListNetworkEndpoints( auto span = internal::MakeSpan( "compute_region_network_endpoint_groups_v1::" "RegionNetworkEndpointGroupsConnection::ListNetworkEndpoints"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListNetworkEndpoints(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::NetworkEndpointWithHealthStatus>( diff --git a/google/cloud/compute/region_network_firewall_policies/v1/internal/region_network_firewall_policies_tracing_connection.cc b/google/cloud/compute/region_network_firewall_policies/v1/internal/region_network_firewall_policies_tracing_connection.cc index 46b34e447737..58196354a486 100644 --- a/google/cloud/compute/region_network_firewall_policies/v1/internal/region_network_firewall_policies_tracing_connection.cc +++ b/google/cloud/compute/region_network_firewall_policies/v1/internal/region_network_firewall_policies_tracing_connection.cc @@ -43,7 +43,7 @@ RegionNetworkFirewallPoliciesTracingConnection::AddAssociation( auto span = internal::MakeSpan( "compute_region_network_firewall_policies_v1::" "RegionNetworkFirewallPoliciesConnection::AddAssociation"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->AddAssociation(request)); } @@ -54,7 +54,7 @@ RegionNetworkFirewallPoliciesTracingConnection::AddRule( auto span = internal::MakeSpan( "compute_region_network_firewall_policies_v1::" "RegionNetworkFirewallPoliciesConnection::AddRule"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->AddRule(request)); } @@ -65,7 +65,7 @@ RegionNetworkFirewallPoliciesTracingConnection::CloneRules( auto span = internal::MakeSpan( "compute_region_network_firewall_policies_v1::" "RegionNetworkFirewallPoliciesConnection::CloneRules"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CloneRules(request)); } @@ -76,7 +76,7 @@ RegionNetworkFirewallPoliciesTracingConnection::DeleteFirewallPolicy( auto span = internal::MakeSpan( "compute_region_network_firewall_policies_v1::" "RegionNetworkFirewallPoliciesConnection::DeleteFirewallPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteFirewallPolicy(request)); } @@ -144,7 +144,7 @@ RegionNetworkFirewallPoliciesTracingConnection::InsertFirewallPolicy( auto span = internal::MakeSpan( "compute_region_network_firewall_policies_v1::" "RegionNetworkFirewallPoliciesConnection::InsertFirewallPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertFirewallPolicy(request)); } @@ -158,7 +158,7 @@ RegionNetworkFirewallPoliciesTracingConnection:: "compute_region_network_firewall_policies_v1::" "RegionNetworkFirewallPoliciesConnection::" "ListRegionNetworkFirewallPolicies"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListRegionNetworkFirewallPolicies(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::FirewallPolicy>(std::move(span), @@ -172,7 +172,7 @@ RegionNetworkFirewallPoliciesTracingConnection::PatchFirewallPolicy( auto span = internal::MakeSpan( "compute_region_network_firewall_policies_v1::" "RegionNetworkFirewallPoliciesConnection::PatchFirewallPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchFirewallPolicy(request)); } @@ -184,7 +184,7 @@ RegionNetworkFirewallPoliciesTracingConnection::PatchRule( auto span = internal::MakeSpan( "compute_region_network_firewall_policies_v1::" "RegionNetworkFirewallPoliciesConnection::PatchRule"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchRule(request)); } @@ -195,7 +195,7 @@ RegionNetworkFirewallPoliciesTracingConnection::RemoveAssociation( auto span = internal::MakeSpan( "compute_region_network_firewall_policies_v1::" "RegionNetworkFirewallPoliciesConnection::RemoveAssociation"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RemoveAssociation(request)); } @@ -206,7 +206,7 @@ RegionNetworkFirewallPoliciesTracingConnection::RemoveRule( auto span = internal::MakeSpan( "compute_region_network_firewall_policies_v1::" "RegionNetworkFirewallPoliciesConnection::RemoveRule"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RemoveRule(request)); } diff --git a/google/cloud/compute/region_notification_endpoints/v1/internal/region_notification_endpoints_tracing_connection.cc b/google/cloud/compute/region_notification_endpoints/v1/internal/region_notification_endpoints_tracing_connection.cc index a824ee4b118a..57078546fa79 100644 --- a/google/cloud/compute/region_notification_endpoints/v1/internal/region_notification_endpoints_tracing_connection.cc +++ b/google/cloud/compute/region_notification_endpoints/v1/internal/region_notification_endpoints_tracing_connection.cc @@ -43,7 +43,7 @@ RegionNotificationEndpointsTracingConnection::DeleteNotificationEndpoint( auto span = internal::MakeSpan( "compute_region_notification_endpoints_v1::" "RegionNotificationEndpointsConnection::DeleteNotificationEndpoint"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteNotificationEndpoint(request)); } @@ -66,7 +66,7 @@ RegionNotificationEndpointsTracingConnection::InsertNotificationEndpoint( auto span = internal::MakeSpan( "compute_region_notification_endpoints_v1::" "RegionNotificationEndpointsConnection::InsertNotificationEndpoint"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertNotificationEndpoint(request)); } @@ -78,7 +78,7 @@ RegionNotificationEndpointsTracingConnection::ListRegionNotificationEndpoints( auto span = internal::MakeSpan( "compute_region_notification_endpoints_v1::" "RegionNotificationEndpointsConnection::ListRegionNotificationEndpoints"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListRegionNotificationEndpoints(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::NotificationEndpoint>(std::move(span), diff --git a/google/cloud/compute/region_operations/v1/internal/region_operations_tracing_connection.cc b/google/cloud/compute/region_operations/v1/internal/region_operations_tracing_connection.cc index 51f830d175aa..1b4b471bac18 100644 --- a/google/cloud/compute/region_operations/v1/internal/region_operations_tracing_connection.cc +++ b/google/cloud/compute/region_operations/v1/internal/region_operations_tracing_connection.cc @@ -60,7 +60,7 @@ RegionOperationsTracingConnection::ListRegionOperations( auto span = internal::MakeSpan( "compute_region_operations_v1::RegionOperationsConnection::" "ListRegionOperations"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListRegionOperations(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::Operation>(std::move(span), diff --git a/google/cloud/compute/region_security_policies/v1/internal/region_security_policies_tracing_connection.cc b/google/cloud/compute/region_security_policies/v1/internal/region_security_policies_tracing_connection.cc index 0adeb5b09239..fb5506ff256b 100644 --- a/google/cloud/compute/region_security_policies/v1/internal/region_security_policies_tracing_connection.cc +++ b/google/cloud/compute/region_security_policies/v1/internal/region_security_policies_tracing_connection.cc @@ -43,7 +43,7 @@ RegionSecurityPoliciesTracingConnection::AddRule( auto span = internal::MakeSpan( "compute_region_security_policies_v1::RegionSecurityPoliciesConnection::" "AddRule"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->AddRule(request)); } @@ -54,7 +54,7 @@ RegionSecurityPoliciesTracingConnection::DeleteSecurityPolicy( auto span = internal::MakeSpan( "compute_region_security_policies_v1::RegionSecurityPoliciesConnection::" "DeleteSecurityPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteSecurityPolicy(request)); } @@ -88,7 +88,7 @@ RegionSecurityPoliciesTracingConnection::InsertSecurityPolicy( auto span = internal::MakeSpan( "compute_region_security_policies_v1::RegionSecurityPoliciesConnection::" "InsertSecurityPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertSecurityPolicy(request)); } @@ -100,7 +100,7 @@ RegionSecurityPoliciesTracingConnection::ListRegionSecurityPolicies( auto span = internal::MakeSpan( "compute_region_security_policies_v1::RegionSecurityPoliciesConnection::" "ListRegionSecurityPolicies"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListRegionSecurityPolicies(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::SecurityPolicy>(std::move(span), @@ -114,7 +114,7 @@ RegionSecurityPoliciesTracingConnection::PatchSecurityPolicy( auto span = internal::MakeSpan( "compute_region_security_policies_v1::RegionSecurityPoliciesConnection::" "PatchSecurityPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchSecurityPolicy(request)); } @@ -126,7 +126,7 @@ RegionSecurityPoliciesTracingConnection::PatchRule( auto span = internal::MakeSpan( "compute_region_security_policies_v1::RegionSecurityPoliciesConnection::" "PatchRule"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchRule(request)); } @@ -137,7 +137,7 @@ RegionSecurityPoliciesTracingConnection::RemoveRule( auto span = internal::MakeSpan( "compute_region_security_policies_v1::RegionSecurityPoliciesConnection::" "RemoveRule"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RemoveRule(request)); } diff --git a/google/cloud/compute/region_ssl_certificates/v1/internal/region_ssl_certificates_tracing_connection.cc b/google/cloud/compute/region_ssl_certificates/v1/internal/region_ssl_certificates_tracing_connection.cc index bfa4a263cc9c..41ffab53373b 100644 --- a/google/cloud/compute/region_ssl_certificates/v1/internal/region_ssl_certificates_tracing_connection.cc +++ b/google/cloud/compute/region_ssl_certificates/v1/internal/region_ssl_certificates_tracing_connection.cc @@ -42,7 +42,7 @@ RegionSslCertificatesTracingConnection::DeleteSslCertificate( auto span = internal::MakeSpan( "compute_region_ssl_certificates_v1::RegionSslCertificatesConnection::" "DeleteSslCertificate"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteSslCertificate(request)); } @@ -65,7 +65,7 @@ RegionSslCertificatesTracingConnection::InsertSslCertificate( auto span = internal::MakeSpan( "compute_region_ssl_certificates_v1::RegionSslCertificatesConnection::" "InsertSslCertificate"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertSslCertificate(request)); } @@ -77,7 +77,7 @@ RegionSslCertificatesTracingConnection::ListRegionSslCertificates( auto span = internal::MakeSpan( "compute_region_ssl_certificates_v1::RegionSslCertificatesConnection::" "ListRegionSslCertificates"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListRegionSslCertificates(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::SslCertificate>(std::move(span), diff --git a/google/cloud/compute/region_ssl_policies/v1/internal/region_ssl_policies_tracing_connection.cc b/google/cloud/compute/region_ssl_policies/v1/internal/region_ssl_policies_tracing_connection.cc index 0858743381ac..4b59cd81effd 100644 --- a/google/cloud/compute/region_ssl_policies/v1/internal/region_ssl_policies_tracing_connection.cc +++ b/google/cloud/compute/region_ssl_policies/v1/internal/region_ssl_policies_tracing_connection.cc @@ -40,7 +40,7 @@ RegionSslPoliciesTracingConnection::DeleteSslPolicy( auto span = internal::MakeSpan( "compute_region_ssl_policies_v1::RegionSslPoliciesConnection::" "DeleteSslPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteSslPolicy(request)); } @@ -62,7 +62,7 @@ RegionSslPoliciesTracingConnection::InsertSslPolicy( auto span = internal::MakeSpan( "compute_region_ssl_policies_v1::RegionSslPoliciesConnection::" "InsertSslPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertSslPolicy(request)); } @@ -73,7 +73,7 @@ RegionSslPoliciesTracingConnection::ListRegionSslPolicies( auto span = internal::MakeSpan( "compute_region_ssl_policies_v1::RegionSslPoliciesConnection::" "ListRegionSslPolicies"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListRegionSslPolicies(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::SslPolicy>(std::move(span), @@ -99,7 +99,7 @@ RegionSslPoliciesTracingConnection::PatchSslPolicy( auto span = internal::MakeSpan( "compute_region_ssl_policies_v1::RegionSslPoliciesConnection::" "PatchSslPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchSslPolicy(request)); } diff --git a/google/cloud/compute/region_target_http_proxies/v1/internal/region_target_http_proxies_tracing_connection.cc b/google/cloud/compute/region_target_http_proxies/v1/internal/region_target_http_proxies_tracing_connection.cc index 5a12ab40ca54..c774b1185243 100644 --- a/google/cloud/compute/region_target_http_proxies/v1/internal/region_target_http_proxies_tracing_connection.cc +++ b/google/cloud/compute/region_target_http_proxies/v1/internal/region_target_http_proxies_tracing_connection.cc @@ -43,7 +43,7 @@ RegionTargetHttpProxiesTracingConnection::DeleteTargetHttpProxy( auto span = internal::MakeSpan( "compute_region_target_http_proxies_v1::" "RegionTargetHttpProxiesConnection::DeleteTargetHttpProxy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteTargetHttpProxy(request)); } @@ -66,7 +66,7 @@ RegionTargetHttpProxiesTracingConnection::InsertTargetHttpProxy( auto span = internal::MakeSpan( "compute_region_target_http_proxies_v1::" "RegionTargetHttpProxiesConnection::InsertTargetHttpProxy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertTargetHttpProxy(request)); } @@ -78,7 +78,7 @@ RegionTargetHttpProxiesTracingConnection::ListRegionTargetHttpProxies( auto span = internal::MakeSpan( "compute_region_target_http_proxies_v1::" "RegionTargetHttpProxiesConnection::ListRegionTargetHttpProxies"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListRegionTargetHttpProxies(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::TargetHttpProxy>(std::move(span), @@ -92,7 +92,7 @@ RegionTargetHttpProxiesTracingConnection::SetUrlMap( auto span = internal::MakeSpan( "compute_region_target_http_proxies_v1::" "RegionTargetHttpProxiesConnection::SetUrlMap"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetUrlMap(request)); } diff --git a/google/cloud/compute/region_target_https_proxies/v1/internal/region_target_https_proxies_tracing_connection.cc b/google/cloud/compute/region_target_https_proxies/v1/internal/region_target_https_proxies_tracing_connection.cc index d9bb79180686..01ed09ebff35 100644 --- a/google/cloud/compute/region_target_https_proxies/v1/internal/region_target_https_proxies_tracing_connection.cc +++ b/google/cloud/compute/region_target_https_proxies/v1/internal/region_target_https_proxies_tracing_connection.cc @@ -43,7 +43,7 @@ RegionTargetHttpsProxiesTracingConnection::DeleteTargetHttpsProxy( auto span = internal::MakeSpan( "compute_region_target_https_proxies_v1::" "RegionTargetHttpsProxiesConnection::DeleteTargetHttpsProxy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteTargetHttpsProxy(request)); } @@ -66,7 +66,7 @@ RegionTargetHttpsProxiesTracingConnection::InsertTargetHttpsProxy( auto span = internal::MakeSpan( "compute_region_target_https_proxies_v1::" "RegionTargetHttpsProxiesConnection::InsertTargetHttpsProxy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertTargetHttpsProxy(request)); } @@ -78,7 +78,7 @@ RegionTargetHttpsProxiesTracingConnection::ListRegionTargetHttpsProxies( auto span = internal::MakeSpan( "compute_region_target_https_proxies_v1::" "RegionTargetHttpsProxiesConnection::ListRegionTargetHttpsProxies"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListRegionTargetHttpsProxies(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::TargetHttpsProxy>(std::move(span), @@ -92,7 +92,7 @@ RegionTargetHttpsProxiesTracingConnection::PatchTargetHttpsProxy( auto span = internal::MakeSpan( "compute_region_target_https_proxies_v1::" "RegionTargetHttpsProxiesConnection::PatchTargetHttpsProxy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchTargetHttpsProxy(request)); } @@ -104,7 +104,7 @@ RegionTargetHttpsProxiesTracingConnection::SetSslCertificates( auto span = internal::MakeSpan( "compute_region_target_https_proxies_v1::" "RegionTargetHttpsProxiesConnection::SetSslCertificates"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetSslCertificates(request)); } @@ -116,7 +116,7 @@ RegionTargetHttpsProxiesTracingConnection::SetUrlMap( auto span = internal::MakeSpan( "compute_region_target_https_proxies_v1::" "RegionTargetHttpsProxiesConnection::SetUrlMap"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetUrlMap(request)); } diff --git a/google/cloud/compute/region_target_tcp_proxies/v1/internal/region_target_tcp_proxies_tracing_connection.cc b/google/cloud/compute/region_target_tcp_proxies/v1/internal/region_target_tcp_proxies_tracing_connection.cc index 3cdbf57f9670..8c65967d2cff 100644 --- a/google/cloud/compute/region_target_tcp_proxies/v1/internal/region_target_tcp_proxies_tracing_connection.cc +++ b/google/cloud/compute/region_target_tcp_proxies/v1/internal/region_target_tcp_proxies_tracing_connection.cc @@ -43,7 +43,7 @@ RegionTargetTcpProxiesTracingConnection::DeleteTargetTcpProxy( auto span = internal::MakeSpan( "compute_region_target_tcp_proxies_v1::RegionTargetTcpProxiesConnection::" "DeleteTargetTcpProxy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteTargetTcpProxy(request)); } @@ -66,7 +66,7 @@ RegionTargetTcpProxiesTracingConnection::InsertTargetTcpProxy( auto span = internal::MakeSpan( "compute_region_target_tcp_proxies_v1::RegionTargetTcpProxiesConnection::" "InsertTargetTcpProxy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertTargetTcpProxy(request)); } @@ -78,7 +78,7 @@ RegionTargetTcpProxiesTracingConnection::ListRegionTargetTcpProxies( auto span = internal::MakeSpan( "compute_region_target_tcp_proxies_v1::RegionTargetTcpProxiesConnection::" "ListRegionTargetTcpProxies"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListRegionTargetTcpProxies(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::TargetTcpProxy>(std::move(span), diff --git a/google/cloud/compute/region_url_maps/v1/internal/region_url_maps_tracing_connection.cc b/google/cloud/compute/region_url_maps/v1/internal/region_url_maps_tracing_connection.cc index 4ff8dc07f597..5fcf311e352e 100644 --- a/google/cloud/compute/region_url_maps/v1/internal/region_url_maps_tracing_connection.cc +++ b/google/cloud/compute/region_url_maps/v1/internal/region_url_maps_tracing_connection.cc @@ -38,7 +38,7 @@ RegionUrlMapsTracingConnection::DeleteUrlMap( request) { auto span = internal::MakeSpan( "compute_region_url_maps_v1::RegionUrlMapsConnection::DeleteUrlMap"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteUrlMap(request)); } @@ -58,7 +58,7 @@ RegionUrlMapsTracingConnection::InsertUrlMap( request) { auto span = internal::MakeSpan( "compute_region_url_maps_v1::RegionUrlMapsConnection::InsertUrlMap"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertUrlMap(request)); } @@ -68,7 +68,7 @@ RegionUrlMapsTracingConnection::ListRegionUrlMaps( request) { auto span = internal::MakeSpan( "compute_region_url_maps_v1::RegionUrlMapsConnection::ListRegionUrlMaps"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListRegionUrlMaps(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::UrlMap>(std::move(span), std::move(sr)); @@ -80,7 +80,7 @@ RegionUrlMapsTracingConnection::PatchUrlMap( request) { auto span = internal::MakeSpan( "compute_region_url_maps_v1::RegionUrlMapsConnection::PatchUrlMap"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchUrlMap(request)); } @@ -90,7 +90,7 @@ RegionUrlMapsTracingConnection::UpdateUrlMap( request) { auto span = internal::MakeSpan( "compute_region_url_maps_v1::RegionUrlMapsConnection::UpdateUrlMap"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateUrlMap(request)); } diff --git a/google/cloud/compute/regions/v1/internal/regions_tracing_connection.cc b/google/cloud/compute/regions/v1/internal/regions_tracing_connection.cc index fa4cd4ae28f2..91f6dd19eb1c 100644 --- a/google/cloud/compute/regions/v1/internal/regions_tracing_connection.cc +++ b/google/cloud/compute/regions/v1/internal/regions_tracing_connection.cc @@ -46,7 +46,7 @@ RegionsTracingConnection::ListRegions( google::cloud::cpp::compute::regions::v1::ListRegionsRequest request) { auto span = internal::MakeSpan("compute_regions_v1::RegionsConnection::ListRegions"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListRegions(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::Region>(std::move(span), std::move(sr)); diff --git a/google/cloud/compute/reservations/v1/internal/reservations_tracing_connection.cc b/google/cloud/compute/reservations/v1/internal/reservations_tracing_connection.cc index e28a57489bf0..81c469883733 100644 --- a/google/cloud/compute/reservations/v1/internal/reservations_tracing_connection.cc +++ b/google/cloud/compute/reservations/v1/internal/reservations_tracing_connection.cc @@ -40,7 +40,7 @@ ReservationsTracingConnection::AggregatedListReservations( auto span = internal::MakeSpan( "compute_reservations_v1::ReservationsConnection::" "AggregatedListReservations"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->AggregatedListReservations(std::move(request)); return internal::MakeTracedStreamRange>( @@ -53,7 +53,7 @@ ReservationsTracingConnection::DeleteReservation( DeleteReservationRequest const& request) { auto span = internal::MakeSpan( "compute_reservations_v1::ReservationsConnection::DeleteReservation"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteReservation(request)); } @@ -83,7 +83,7 @@ ReservationsTracingConnection::InsertReservation( InsertReservationRequest const& request) { auto span = internal::MakeSpan( "compute_reservations_v1::ReservationsConnection::InsertReservation"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertReservation(request)); } @@ -93,7 +93,7 @@ ReservationsTracingConnection::ListReservations( request) { auto span = internal::MakeSpan( "compute_reservations_v1::ReservationsConnection::ListReservations"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListReservations(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::Reservation>(std::move(span), @@ -106,7 +106,7 @@ ReservationsTracingConnection::Resize( request) { auto span = internal::MakeSpan( "compute_reservations_v1::ReservationsConnection::Resize"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->Resize(request)); } @@ -136,7 +136,7 @@ ReservationsTracingConnection::UpdateReservation( UpdateReservationRequest const& request) { auto span = internal::MakeSpan( "compute_reservations_v1::ReservationsConnection::UpdateReservation"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateReservation(request)); } diff --git a/google/cloud/compute/resource_policies/v1/internal/resource_policies_tracing_connection.cc b/google/cloud/compute/resource_policies/v1/internal/resource_policies_tracing_connection.cc index 3ee80f37d86c..808eb140bf40 100644 --- a/google/cloud/compute/resource_policies/v1/internal/resource_policies_tracing_connection.cc +++ b/google/cloud/compute/resource_policies/v1/internal/resource_policies_tracing_connection.cc @@ -41,7 +41,7 @@ ResourcePoliciesTracingConnection::AggregatedListResourcePolicies( auto span = internal::MakeSpan( "compute_resource_policies_v1::ResourcePoliciesConnection::" "AggregatedListResourcePolicies"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->AggregatedListResourcePolicies(std::move(request)); return internal::MakeTracedStreamRange< std::pairDeleteResourcePolicy(request)); } @@ -89,7 +89,7 @@ ResourcePoliciesTracingConnection::InsertResourcePolicy( auto span = internal::MakeSpan( "compute_resource_policies_v1::ResourcePoliciesConnection::" "InsertResourcePolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertResourcePolicy(request)); } @@ -101,7 +101,7 @@ ResourcePoliciesTracingConnection::ListResourcePolicies( auto span = internal::MakeSpan( "compute_resource_policies_v1::ResourcePoliciesConnection::" "ListResourcePolicies"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListResourcePolicies(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::ResourcePolicy>(std::move(span), @@ -115,7 +115,7 @@ ResourcePoliciesTracingConnection::PatchResourcePolicy( auto span = internal::MakeSpan( "compute_resource_policies_v1::ResourcePoliciesConnection::" "PatchResourcePolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchResourcePolicy(request)); } diff --git a/google/cloud/compute/routers/v1/internal/routers_tracing_connection.cc b/google/cloud/compute/routers/v1/internal/routers_tracing_connection.cc index f40a8301ca7d..6c25227a0e17 100644 --- a/google/cloud/compute/routers/v1/internal/routers_tracing_connection.cc +++ b/google/cloud/compute/routers/v1/internal/routers_tracing_connection.cc @@ -39,7 +39,7 @@ RoutersTracingConnection::AggregatedListRouters( request) { auto span = internal::MakeSpan( "compute_routers_v1::RoutersConnection::AggregatedListRouters"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->AggregatedListRouters(std::move(request)); return internal::MakeTracedStreamRange>( @@ -52,7 +52,7 @@ RoutersTracingConnection::DeleteRouter( request) { auto span = internal::MakeSpan("compute_routers_v1::RoutersConnection::DeleteRouter"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteRouter(request)); } @@ -101,7 +101,7 @@ RoutersTracingConnection::InsertRouter( request) { auto span = internal::MakeSpan("compute_routers_v1::RoutersConnection::InsertRouter"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertRouter(request)); } @@ -110,7 +110,7 @@ RoutersTracingConnection::ListRouters( google::cloud::cpp::compute::routers::v1::ListRoutersRequest request) { auto span = internal::MakeSpan("compute_routers_v1::RoutersConnection::ListRouters"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListRouters(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::Router>(std::move(span), std::move(sr)); @@ -122,7 +122,7 @@ RoutersTracingConnection::PatchRouter( request) { auto span = internal::MakeSpan("compute_routers_v1::RoutersConnection::PatchRouter"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchRouter(request)); } @@ -141,7 +141,7 @@ RoutersTracingConnection::UpdateRouter( request) { auto span = internal::MakeSpan("compute_routers_v1::RoutersConnection::UpdateRouter"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateRouter(request)); } diff --git a/google/cloud/compute/routes/v1/internal/routes_tracing_connection.cc b/google/cloud/compute/routes/v1/internal/routes_tracing_connection.cc index 207cdd257343..711de698d7f6 100644 --- a/google/cloud/compute/routes/v1/internal/routes_tracing_connection.cc +++ b/google/cloud/compute/routes/v1/internal/routes_tracing_connection.cc @@ -38,7 +38,7 @@ RoutesTracingConnection::DeleteRoute( request) { auto span = internal::MakeSpan("compute_routes_v1::RoutesConnection::DeleteRoute"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteRoute(request)); } @@ -57,7 +57,7 @@ RoutesTracingConnection::InsertRoute( request) { auto span = internal::MakeSpan("compute_routes_v1::RoutesConnection::InsertRoute"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertRoute(request)); } @@ -66,7 +66,7 @@ RoutesTracingConnection::ListRoutes( google::cloud::cpp::compute::routes::v1::ListRoutesRequest request) { auto span = internal::MakeSpan("compute_routes_v1::RoutesConnection::ListRoutes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListRoutes(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::Route>(std::move(span), std::move(sr)); diff --git a/google/cloud/compute/security_policies/v1/internal/security_policies_tracing_connection.cc b/google/cloud/compute/security_policies/v1/internal/security_policies_tracing_connection.cc index d434c554f428..c57330dcfbca 100644 --- a/google/cloud/compute/security_policies/v1/internal/security_policies_tracing_connection.cc +++ b/google/cloud/compute/security_policies/v1/internal/security_policies_tracing_connection.cc @@ -39,7 +39,7 @@ SecurityPoliciesTracingConnection::AddRule( request) { auto span = internal::MakeSpan( "compute_security_policies_v1::SecurityPoliciesConnection::AddRule"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->AddRule(request)); } @@ -51,7 +51,7 @@ SecurityPoliciesTracingConnection::AggregatedListSecurityPolicies( auto span = internal::MakeSpan( "compute_security_policies_v1::SecurityPoliciesConnection::" "AggregatedListSecurityPolicies"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->AggregatedListSecurityPolicies(std::move(request)); return internal::MakeTracedStreamRange< std::pairDeleteSecurityPolicy(request)); } @@ -99,7 +99,7 @@ SecurityPoliciesTracingConnection::InsertSecurityPolicy( auto span = internal::MakeSpan( "compute_security_policies_v1::SecurityPoliciesConnection::" "InsertSecurityPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertSecurityPolicy(request)); } @@ -111,7 +111,7 @@ SecurityPoliciesTracingConnection::ListSecurityPolicies( auto span = internal::MakeSpan( "compute_security_policies_v1::SecurityPoliciesConnection::" "ListSecurityPolicies"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListSecurityPolicies(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::SecurityPolicy>(std::move(span), @@ -138,7 +138,7 @@ SecurityPoliciesTracingConnection::PatchSecurityPolicy( auto span = internal::MakeSpan( "compute_security_policies_v1::SecurityPoliciesConnection::" "PatchSecurityPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchSecurityPolicy(request)); } @@ -149,7 +149,7 @@ SecurityPoliciesTracingConnection::PatchRule( request) { auto span = internal::MakeSpan( "compute_security_policies_v1::SecurityPoliciesConnection::PatchRule"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchRule(request)); } @@ -159,7 +159,7 @@ SecurityPoliciesTracingConnection::RemoveRule( request) { auto span = internal::MakeSpan( "compute_security_policies_v1::SecurityPoliciesConnection::RemoveRule"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RemoveRule(request)); } @@ -169,7 +169,7 @@ SecurityPoliciesTracingConnection::SetLabels( request) { auto span = internal::MakeSpan( "compute_security_policies_v1::SecurityPoliciesConnection::SetLabels"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetLabels(request)); } diff --git a/google/cloud/compute/service_attachments/v1/internal/service_attachments_tracing_connection.cc b/google/cloud/compute/service_attachments/v1/internal/service_attachments_tracing_connection.cc index 46ca31216e65..605fd64346f2 100644 --- a/google/cloud/compute/service_attachments/v1/internal/service_attachments_tracing_connection.cc +++ b/google/cloud/compute/service_attachments/v1/internal/service_attachments_tracing_connection.cc @@ -42,7 +42,7 @@ ServiceAttachmentsTracingConnection::AggregatedListServiceAttachments( auto span = internal::MakeSpan( "compute_service_attachments_v1::ServiceAttachmentsConnection::" "AggregatedListServiceAttachments"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->AggregatedListServiceAttachments(std::move(request)); return internal::MakeTracedStreamRange< std::pairDeleteServiceAttachment(request)); } @@ -91,7 +91,7 @@ ServiceAttachmentsTracingConnection::InsertServiceAttachment( auto span = internal::MakeSpan( "compute_service_attachments_v1::ServiceAttachmentsConnection::" "InsertServiceAttachment"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertServiceAttachment(request)); } @@ -103,7 +103,7 @@ ServiceAttachmentsTracingConnection::ListServiceAttachments( auto span = internal::MakeSpan( "compute_service_attachments_v1::ServiceAttachmentsConnection::" "ListServiceAttachments"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListServiceAttachments(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::ServiceAttachment>(std::move(span), @@ -117,7 +117,7 @@ ServiceAttachmentsTracingConnection::PatchServiceAttachment( auto span = internal::MakeSpan( "compute_service_attachments_v1::ServiceAttachmentsConnection::" "PatchServiceAttachment"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchServiceAttachment(request)); } diff --git a/google/cloud/compute/snapshots/v1/internal/snapshots_tracing_connection.cc b/google/cloud/compute/snapshots/v1/internal/snapshots_tracing_connection.cc index a2f70110a650..942a5fa69751 100644 --- a/google/cloud/compute/snapshots/v1/internal/snapshots_tracing_connection.cc +++ b/google/cloud/compute/snapshots/v1/internal/snapshots_tracing_connection.cc @@ -38,7 +38,7 @@ SnapshotsTracingConnection::DeleteSnapshot( request) { auto span = internal::MakeSpan( "compute_snapshots_v1::SnapshotsConnection::DeleteSnapshot"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteSnapshot(request)); } @@ -68,7 +68,7 @@ SnapshotsTracingConnection::InsertSnapshot( request) { auto span = internal::MakeSpan( "compute_snapshots_v1::SnapshotsConnection::InsertSnapshot"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertSnapshot(request)); } @@ -77,7 +77,7 @@ SnapshotsTracingConnection::ListSnapshots( google::cloud::cpp::compute::snapshots::v1::ListSnapshotsRequest request) { auto span = internal::MakeSpan( "compute_snapshots_v1::SnapshotsConnection::ListSnapshots"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListSnapshots(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::Snapshot>(std::move(span), @@ -100,7 +100,7 @@ SnapshotsTracingConnection::SetLabels( request) { auto span = internal::MakeSpan( "compute_snapshots_v1::SnapshotsConnection::SetLabels"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetLabels(request)); } diff --git a/google/cloud/compute/ssl_certificates/v1/internal/ssl_certificates_tracing_connection.cc b/google/cloud/compute/ssl_certificates/v1/internal/ssl_certificates_tracing_connection.cc index 2ad1a201f2a1..813dbeca708b 100644 --- a/google/cloud/compute/ssl_certificates/v1/internal/ssl_certificates_tracing_connection.cc +++ b/google/cloud/compute/ssl_certificates/v1/internal/ssl_certificates_tracing_connection.cc @@ -41,7 +41,7 @@ SslCertificatesTracingConnection::AggregatedListSslCertificates( auto span = internal::MakeSpan( "compute_ssl_certificates_v1::SslCertificatesConnection::" "AggregatedListSslCertificates"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->AggregatedListSslCertificates(std::move(request)); return internal::MakeTracedStreamRange>( @@ -55,7 +55,7 @@ SslCertificatesTracingConnection::DeleteSslCertificate( auto span = internal::MakeSpan( "compute_ssl_certificates_v1::SslCertificatesConnection::" "DeleteSslCertificate"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteSslCertificate(request)); } @@ -78,7 +78,7 @@ SslCertificatesTracingConnection::InsertSslCertificate( auto span = internal::MakeSpan( "compute_ssl_certificates_v1::SslCertificatesConnection::" "InsertSslCertificate"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertSslCertificate(request)); } @@ -90,7 +90,7 @@ SslCertificatesTracingConnection::ListSslCertificates( auto span = internal::MakeSpan( "compute_ssl_certificates_v1::SslCertificatesConnection::" "ListSslCertificates"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListSslCertificates(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::SslCertificate>(std::move(span), diff --git a/google/cloud/compute/ssl_policies/v1/internal/ssl_policies_tracing_connection.cc b/google/cloud/compute/ssl_policies/v1/internal/ssl_policies_tracing_connection.cc index f0fe6f7223b9..f894679902a3 100644 --- a/google/cloud/compute/ssl_policies/v1/internal/ssl_policies_tracing_connection.cc +++ b/google/cloud/compute/ssl_policies/v1/internal/ssl_policies_tracing_connection.cc @@ -40,7 +40,7 @@ SslPoliciesTracingConnection::AggregatedListSslPolicies( auto span = internal::MakeSpan( "compute_ssl_policies_v1::SslPoliciesConnection::" "AggregatedListSslPolicies"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->AggregatedListSslPolicies(std::move(request)); return internal::MakeTracedStreamRange>( @@ -53,7 +53,7 @@ SslPoliciesTracingConnection::DeleteSslPolicy( request) { auto span = internal::MakeSpan( "compute_ssl_policies_v1::SslPoliciesConnection::DeleteSslPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteSslPolicy(request)); } @@ -73,7 +73,7 @@ SslPoliciesTracingConnection::InsertSslPolicy( request) { auto span = internal::MakeSpan( "compute_ssl_policies_v1::SslPoliciesConnection::InsertSslPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertSslPolicy(request)); } @@ -83,7 +83,7 @@ SslPoliciesTracingConnection::ListSslPolicies( request) { auto span = internal::MakeSpan( "compute_ssl_policies_v1::SslPoliciesConnection::ListSslPolicies"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListSslPolicies(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::SslPolicy>(std::move(span), @@ -107,7 +107,7 @@ SslPoliciesTracingConnection::PatchSslPolicy( request) { auto span = internal::MakeSpan( "compute_ssl_policies_v1::SslPoliciesConnection::PatchSslPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchSslPolicy(request)); } diff --git a/google/cloud/compute/subnetworks/v1/internal/subnetworks_tracing_connection.cc b/google/cloud/compute/subnetworks/v1/internal/subnetworks_tracing_connection.cc index b6666000efcd..25b6f9bdb44d 100644 --- a/google/cloud/compute/subnetworks/v1/internal/subnetworks_tracing_connection.cc +++ b/google/cloud/compute/subnetworks/v1/internal/subnetworks_tracing_connection.cc @@ -40,7 +40,7 @@ SubnetworksTracingConnection::AggregatedListSubnetworks( auto span = internal::MakeSpan( "compute_subnetworks_v1::SubnetworksConnection::" "AggregatedListSubnetworks"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->AggregatedListSubnetworks(std::move(request)); return internal::MakeTracedStreamRange>( @@ -53,7 +53,7 @@ SubnetworksTracingConnection::DeleteSubnetwork( request) { auto span = internal::MakeSpan( "compute_subnetworks_v1::SubnetworksConnection::DeleteSubnetwork"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteSubnetwork(request)); } @@ -63,7 +63,7 @@ SubnetworksTracingConnection::ExpandIpCidrRange( ExpandIpCidrRangeRequest const& request) { auto span = internal::MakeSpan( "compute_subnetworks_v1::SubnetworksConnection::ExpandIpCidrRange"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ExpandIpCidrRange(request)); } @@ -93,7 +93,7 @@ SubnetworksTracingConnection::InsertSubnetwork( request) { auto span = internal::MakeSpan( "compute_subnetworks_v1::SubnetworksConnection::InsertSubnetwork"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertSubnetwork(request)); } @@ -103,7 +103,7 @@ SubnetworksTracingConnection::ListSubnetworks( request) { auto span = internal::MakeSpan( "compute_subnetworks_v1::SubnetworksConnection::ListSubnetworks"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListSubnetworks(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::Subnetwork>(std::move(span), @@ -115,7 +115,7 @@ SubnetworksTracingConnection::ListUsable( google::cloud::cpp::compute::subnetworks::v1::ListUsableRequest request) { auto span = internal::MakeSpan( "compute_subnetworks_v1::SubnetworksConnection::ListUsable"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListUsable(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::UsableSubnetwork>(std::move(span), @@ -128,7 +128,7 @@ SubnetworksTracingConnection::PatchSubnetwork( request) { auto span = internal::MakeSpan( "compute_subnetworks_v1::SubnetworksConnection::PatchSubnetwork"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchSubnetwork(request)); } @@ -149,7 +149,7 @@ SubnetworksTracingConnection::SetPrivateIpGoogleAccess( auto span = internal::MakeSpan( "compute_subnetworks_v1::SubnetworksConnection::" "SetPrivateIpGoogleAccess"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetPrivateIpGoogleAccess(request)); } diff --git a/google/cloud/compute/target_grpc_proxies/v1/internal/target_grpc_proxies_tracing_connection.cc b/google/cloud/compute/target_grpc_proxies/v1/internal/target_grpc_proxies_tracing_connection.cc index d6d78c735dd2..56af5c85ba6f 100644 --- a/google/cloud/compute/target_grpc_proxies/v1/internal/target_grpc_proxies_tracing_connection.cc +++ b/google/cloud/compute/target_grpc_proxies/v1/internal/target_grpc_proxies_tracing_connection.cc @@ -40,7 +40,7 @@ TargetGrpcProxiesTracingConnection::DeleteTargetGrpcProxy( auto span = internal::MakeSpan( "compute_target_grpc_proxies_v1::TargetGrpcProxiesConnection::" "DeleteTargetGrpcProxy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteTargetGrpcProxy(request)); } @@ -63,7 +63,7 @@ TargetGrpcProxiesTracingConnection::InsertTargetGrpcProxy( auto span = internal::MakeSpan( "compute_target_grpc_proxies_v1::TargetGrpcProxiesConnection::" "InsertTargetGrpcProxy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertTargetGrpcProxy(request)); } @@ -75,7 +75,7 @@ TargetGrpcProxiesTracingConnection::ListTargetGrpcProxies( auto span = internal::MakeSpan( "compute_target_grpc_proxies_v1::TargetGrpcProxiesConnection::" "ListTargetGrpcProxies"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListTargetGrpcProxies(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::TargetGrpcProxy>(std::move(span), @@ -89,7 +89,7 @@ TargetGrpcProxiesTracingConnection::PatchTargetGrpcProxy( auto span = internal::MakeSpan( "compute_target_grpc_proxies_v1::TargetGrpcProxiesConnection::" "PatchTargetGrpcProxy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchTargetGrpcProxy(request)); } diff --git a/google/cloud/compute/target_http_proxies/v1/internal/target_http_proxies_tracing_connection.cc b/google/cloud/compute/target_http_proxies/v1/internal/target_http_proxies_tracing_connection.cc index a352e7e8335d..b0ee66ad59b1 100644 --- a/google/cloud/compute/target_http_proxies/v1/internal/target_http_proxies_tracing_connection.cc +++ b/google/cloud/compute/target_http_proxies/v1/internal/target_http_proxies_tracing_connection.cc @@ -41,7 +41,7 @@ TargetHttpProxiesTracingConnection::AggregatedListTargetHttpProxies( auto span = internal::MakeSpan( "compute_target_http_proxies_v1::TargetHttpProxiesConnection::" "AggregatedListTargetHttpProxies"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->AggregatedListTargetHttpProxies(std::move(request)); return internal::MakeTracedStreamRange< std::pairDeleteTargetHttpProxy(request)); } @@ -79,7 +79,7 @@ TargetHttpProxiesTracingConnection::InsertTargetHttpProxy( auto span = internal::MakeSpan( "compute_target_http_proxies_v1::TargetHttpProxiesConnection::" "InsertTargetHttpProxy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertTargetHttpProxy(request)); } @@ -91,7 +91,7 @@ TargetHttpProxiesTracingConnection::ListTargetHttpProxies( auto span = internal::MakeSpan( "compute_target_http_proxies_v1::TargetHttpProxiesConnection::" "ListTargetHttpProxies"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListTargetHttpProxies(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::TargetHttpProxy>(std::move(span), @@ -105,7 +105,7 @@ TargetHttpProxiesTracingConnection::PatchTargetHttpProxy( auto span = internal::MakeSpan( "compute_target_http_proxies_v1::TargetHttpProxiesConnection::" "PatchTargetHttpProxy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchTargetHttpProxy(request)); } @@ -116,7 +116,7 @@ TargetHttpProxiesTracingConnection::SetUrlMap( SetUrlMapRequest const& request) { auto span = internal::MakeSpan( "compute_target_http_proxies_v1::TargetHttpProxiesConnection::SetUrlMap"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetUrlMap(request)); } diff --git a/google/cloud/compute/target_https_proxies/v1/internal/target_https_proxies_tracing_connection.cc b/google/cloud/compute/target_https_proxies/v1/internal/target_https_proxies_tracing_connection.cc index aa7959e5cab3..d9627d0ce336 100644 --- a/google/cloud/compute/target_https_proxies/v1/internal/target_https_proxies_tracing_connection.cc +++ b/google/cloud/compute/target_https_proxies/v1/internal/target_https_proxies_tracing_connection.cc @@ -43,7 +43,7 @@ TargetHttpsProxiesTracingConnection::AggregatedListTargetHttpsProxies( auto span = internal::MakeSpan( "compute_target_https_proxies_v1::TargetHttpsProxiesConnection::" "AggregatedListTargetHttpsProxies"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->AggregatedListTargetHttpsProxies(std::move(request)); return internal::MakeTracedStreamRange< std::pairDeleteTargetHttpsProxy(request)); } @@ -81,7 +81,7 @@ TargetHttpsProxiesTracingConnection::InsertTargetHttpsProxy( auto span = internal::MakeSpan( "compute_target_https_proxies_v1::TargetHttpsProxiesConnection::" "InsertTargetHttpsProxy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertTargetHttpsProxy(request)); } @@ -93,7 +93,7 @@ TargetHttpsProxiesTracingConnection::ListTargetHttpsProxies( auto span = internal::MakeSpan( "compute_target_https_proxies_v1::TargetHttpsProxiesConnection::" "ListTargetHttpsProxies"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListTargetHttpsProxies(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::TargetHttpsProxy>(std::move(span), @@ -107,7 +107,7 @@ TargetHttpsProxiesTracingConnection::PatchTargetHttpsProxy( auto span = internal::MakeSpan( "compute_target_https_proxies_v1::TargetHttpsProxiesConnection::" "PatchTargetHttpsProxy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchTargetHttpsProxy(request)); } @@ -119,7 +119,7 @@ TargetHttpsProxiesTracingConnection::SetCertificateMap( auto span = internal::MakeSpan( "compute_target_https_proxies_v1::TargetHttpsProxiesConnection::" "SetCertificateMap"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetCertificateMap(request)); } @@ -130,7 +130,7 @@ TargetHttpsProxiesTracingConnection::SetQuicOverride( auto span = internal::MakeSpan( "compute_target_https_proxies_v1::TargetHttpsProxiesConnection::" "SetQuicOverride"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetQuicOverride(request)); } @@ -141,7 +141,7 @@ TargetHttpsProxiesTracingConnection::SetSslCertificates( auto span = internal::MakeSpan( "compute_target_https_proxies_v1::TargetHttpsProxiesConnection::" "SetSslCertificates"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetSslCertificates(request)); } @@ -153,7 +153,7 @@ TargetHttpsProxiesTracingConnection::SetSslPolicy( auto span = internal::MakeSpan( "compute_target_https_proxies_v1::TargetHttpsProxiesConnection::" "SetSslPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetSslPolicy(request)); } @@ -164,7 +164,7 @@ TargetHttpsProxiesTracingConnection::SetUrlMap( auto span = internal::MakeSpan( "compute_target_https_proxies_v1::TargetHttpsProxiesConnection::" "SetUrlMap"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetUrlMap(request)); } diff --git a/google/cloud/compute/target_instances/v1/internal/target_instances_tracing_connection.cc b/google/cloud/compute/target_instances/v1/internal/target_instances_tracing_connection.cc index 483c05154a9b..106cf40297cb 100644 --- a/google/cloud/compute/target_instances/v1/internal/target_instances_tracing_connection.cc +++ b/google/cloud/compute/target_instances/v1/internal/target_instances_tracing_connection.cc @@ -41,7 +41,7 @@ TargetInstancesTracingConnection::AggregatedListTargetInstances( auto span = internal::MakeSpan( "compute_target_instances_v1::TargetInstancesConnection::" "AggregatedListTargetInstances"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->AggregatedListTargetInstances(std::move(request)); return internal::MakeTracedStreamRange>( @@ -55,7 +55,7 @@ TargetInstancesTracingConnection::DeleteTargetInstance( auto span = internal::MakeSpan( "compute_target_instances_v1::TargetInstancesConnection::" "DeleteTargetInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteTargetInstance(request)); } @@ -78,7 +78,7 @@ TargetInstancesTracingConnection::InsertTargetInstance( auto span = internal::MakeSpan( "compute_target_instances_v1::TargetInstancesConnection::" "InsertTargetInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertTargetInstance(request)); } @@ -90,7 +90,7 @@ TargetInstancesTracingConnection::ListTargetInstances( auto span = internal::MakeSpan( "compute_target_instances_v1::TargetInstancesConnection::" "ListTargetInstances"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListTargetInstances(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::TargetInstance>(std::move(span), @@ -104,7 +104,7 @@ TargetInstancesTracingConnection::SetSecurityPolicy( auto span = internal::MakeSpan( "compute_target_instances_v1::TargetInstancesConnection::" "SetSecurityPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetSecurityPolicy(request)); } diff --git a/google/cloud/compute/target_pools/v1/internal/target_pools_tracing_connection.cc b/google/cloud/compute/target_pools/v1/internal/target_pools_tracing_connection.cc index b2313d49f9ce..597c4c04cd83 100644 --- a/google/cloud/compute/target_pools/v1/internal/target_pools_tracing_connection.cc +++ b/google/cloud/compute/target_pools/v1/internal/target_pools_tracing_connection.cc @@ -38,7 +38,7 @@ TargetPoolsTracingConnection::AddHealthCheck( request) { auto span = internal::MakeSpan( "compute_target_pools_v1::TargetPoolsConnection::AddHealthCheck"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->AddHealthCheck(request)); } @@ -48,7 +48,7 @@ TargetPoolsTracingConnection::AddInstance( request) { auto span = internal::MakeSpan( "compute_target_pools_v1::TargetPoolsConnection::AddInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->AddInstance(request)); } @@ -60,7 +60,7 @@ TargetPoolsTracingConnection::AggregatedListTargetPools( auto span = internal::MakeSpan( "compute_target_pools_v1::TargetPoolsConnection::" "AggregatedListTargetPools"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->AggregatedListTargetPools(std::move(request)); return internal::MakeTracedStreamRange>( @@ -73,7 +73,7 @@ TargetPoolsTracingConnection::DeleteTargetPool( DeleteTargetPoolRequest const& request) { auto span = internal::MakeSpan( "compute_target_pools_v1::TargetPoolsConnection::DeleteTargetPool"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteTargetPool(request)); } @@ -103,7 +103,7 @@ TargetPoolsTracingConnection::InsertTargetPool( InsertTargetPoolRequest const& request) { auto span = internal::MakeSpan( "compute_target_pools_v1::TargetPoolsConnection::InsertTargetPool"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertTargetPool(request)); } @@ -113,7 +113,7 @@ TargetPoolsTracingConnection::ListTargetPools( request) { auto span = internal::MakeSpan( "compute_target_pools_v1::TargetPoolsConnection::ListTargetPools"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListTargetPools(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::TargetPool>(std::move(span), @@ -126,7 +126,7 @@ TargetPoolsTracingConnection::RemoveHealthCheck( RemoveHealthCheckRequest const& request) { auto span = internal::MakeSpan( "compute_target_pools_v1::TargetPoolsConnection::RemoveHealthCheck"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RemoveHealthCheck(request)); } @@ -136,7 +136,7 @@ TargetPoolsTracingConnection::RemoveInstance( request) { auto span = internal::MakeSpan( "compute_target_pools_v1::TargetPoolsConnection::RemoveInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RemoveInstance(request)); } @@ -146,7 +146,7 @@ TargetPoolsTracingConnection::SetBackup( request) { auto span = internal::MakeSpan( "compute_target_pools_v1::TargetPoolsConnection::SetBackup"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetBackup(request)); } @@ -156,7 +156,7 @@ TargetPoolsTracingConnection::SetSecurityPolicy( SetSecurityPolicyRequest const& request) { auto span = internal::MakeSpan( "compute_target_pools_v1::TargetPoolsConnection::SetSecurityPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetSecurityPolicy(request)); } diff --git a/google/cloud/compute/target_ssl_proxies/v1/internal/target_ssl_proxies_tracing_connection.cc b/google/cloud/compute/target_ssl_proxies/v1/internal/target_ssl_proxies_tracing_connection.cc index 915aec718d93..d827f3c529b1 100644 --- a/google/cloud/compute/target_ssl_proxies/v1/internal/target_ssl_proxies_tracing_connection.cc +++ b/google/cloud/compute/target_ssl_proxies/v1/internal/target_ssl_proxies_tracing_connection.cc @@ -40,7 +40,7 @@ TargetSslProxiesTracingConnection::DeleteTargetSslProxy( auto span = internal::MakeSpan( "compute_target_ssl_proxies_v1::TargetSslProxiesConnection::" "DeleteTargetSslProxy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteTargetSslProxy(request)); } @@ -63,7 +63,7 @@ TargetSslProxiesTracingConnection::InsertTargetSslProxy( auto span = internal::MakeSpan( "compute_target_ssl_proxies_v1::TargetSslProxiesConnection::" "InsertTargetSslProxy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertTargetSslProxy(request)); } @@ -75,7 +75,7 @@ TargetSslProxiesTracingConnection::ListTargetSslProxies( auto span = internal::MakeSpan( "compute_target_ssl_proxies_v1::TargetSslProxiesConnection::" "ListTargetSslProxies"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListTargetSslProxies(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::TargetSslProxy>(std::move(span), @@ -89,7 +89,7 @@ TargetSslProxiesTracingConnection::SetBackendService( auto span = internal::MakeSpan( "compute_target_ssl_proxies_v1::TargetSslProxiesConnection::" "SetBackendService"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetBackendService(request)); } @@ -100,7 +100,7 @@ TargetSslProxiesTracingConnection::SetCertificateMap( auto span = internal::MakeSpan( "compute_target_ssl_proxies_v1::TargetSslProxiesConnection::" "SetCertificateMap"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetCertificateMap(request)); } @@ -111,7 +111,7 @@ TargetSslProxiesTracingConnection::SetProxyHeader( auto span = internal::MakeSpan( "compute_target_ssl_proxies_v1::TargetSslProxiesConnection::" "SetProxyHeader"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetProxyHeader(request)); } @@ -122,7 +122,7 @@ TargetSslProxiesTracingConnection::SetSslCertificates( auto span = internal::MakeSpan( "compute_target_ssl_proxies_v1::TargetSslProxiesConnection::" "SetSslCertificates"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetSslCertificates(request)); } @@ -134,7 +134,7 @@ TargetSslProxiesTracingConnection::SetSslPolicy( auto span = internal::MakeSpan( "compute_target_ssl_proxies_v1::TargetSslProxiesConnection::" "SetSslPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetSslPolicy(request)); } diff --git a/google/cloud/compute/target_tcp_proxies/v1/internal/target_tcp_proxies_tracing_connection.cc b/google/cloud/compute/target_tcp_proxies/v1/internal/target_tcp_proxies_tracing_connection.cc index 4d6cf959f7e9..30fb65ae5de2 100644 --- a/google/cloud/compute/target_tcp_proxies/v1/internal/target_tcp_proxies_tracing_connection.cc +++ b/google/cloud/compute/target_tcp_proxies/v1/internal/target_tcp_proxies_tracing_connection.cc @@ -41,7 +41,7 @@ TargetTcpProxiesTracingConnection::AggregatedListTargetTcpProxies( auto span = internal::MakeSpan( "compute_target_tcp_proxies_v1::TargetTcpProxiesConnection::" "AggregatedListTargetTcpProxies"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->AggregatedListTargetTcpProxies(std::move(request)); return internal::MakeTracedStreamRange< std::pairDeleteTargetTcpProxy(request)); } @@ -79,7 +79,7 @@ TargetTcpProxiesTracingConnection::InsertTargetTcpProxy( auto span = internal::MakeSpan( "compute_target_tcp_proxies_v1::TargetTcpProxiesConnection::" "InsertTargetTcpProxy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertTargetTcpProxy(request)); } @@ -91,7 +91,7 @@ TargetTcpProxiesTracingConnection::ListTargetTcpProxies( auto span = internal::MakeSpan( "compute_target_tcp_proxies_v1::TargetTcpProxiesConnection::" "ListTargetTcpProxies"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListTargetTcpProxies(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::TargetTcpProxy>(std::move(span), @@ -105,7 +105,7 @@ TargetTcpProxiesTracingConnection::SetBackendService( auto span = internal::MakeSpan( "compute_target_tcp_proxies_v1::TargetTcpProxiesConnection::" "SetBackendService"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetBackendService(request)); } @@ -116,7 +116,7 @@ TargetTcpProxiesTracingConnection::SetProxyHeader( auto span = internal::MakeSpan( "compute_target_tcp_proxies_v1::TargetTcpProxiesConnection::" "SetProxyHeader"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetProxyHeader(request)); } diff --git a/google/cloud/compute/target_vpn_gateways/v1/internal/target_vpn_gateways_tracing_connection.cc b/google/cloud/compute/target_vpn_gateways/v1/internal/target_vpn_gateways_tracing_connection.cc index 199c554d87a6..22a0897a21d6 100644 --- a/google/cloud/compute/target_vpn_gateways/v1/internal/target_vpn_gateways_tracing_connection.cc +++ b/google/cloud/compute/target_vpn_gateways/v1/internal/target_vpn_gateways_tracing_connection.cc @@ -41,7 +41,7 @@ TargetVpnGatewaysTracingConnection::AggregatedListTargetVpnGateways( auto span = internal::MakeSpan( "compute_target_vpn_gateways_v1::TargetVpnGatewaysConnection::" "AggregatedListTargetVpnGateways"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->AggregatedListTargetVpnGateways(std::move(request)); return internal::MakeTracedStreamRange< std::pairDeleteTargetVpnGateway(request)); } @@ -79,7 +79,7 @@ TargetVpnGatewaysTracingConnection::InsertTargetVpnGateway( auto span = internal::MakeSpan( "compute_target_vpn_gateways_v1::TargetVpnGatewaysConnection::" "InsertTargetVpnGateway"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertTargetVpnGateway(request)); } @@ -91,7 +91,7 @@ TargetVpnGatewaysTracingConnection::ListTargetVpnGateways( auto span = internal::MakeSpan( "compute_target_vpn_gateways_v1::TargetVpnGatewaysConnection::" "ListTargetVpnGateways"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListTargetVpnGateways(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::TargetVpnGateway>(std::move(span), @@ -104,7 +104,7 @@ TargetVpnGatewaysTracingConnection::SetLabels( SetLabelsRequest const& request) { auto span = internal::MakeSpan( "compute_target_vpn_gateways_v1::TargetVpnGatewaysConnection::SetLabels"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetLabels(request)); } diff --git a/google/cloud/compute/url_maps/v1/internal/url_maps_tracing_connection.cc b/google/cloud/compute/url_maps/v1/internal/url_maps_tracing_connection.cc index 3de8292fe07b..5d5523bb6d58 100644 --- a/google/cloud/compute/url_maps/v1/internal/url_maps_tracing_connection.cc +++ b/google/cloud/compute/url_maps/v1/internal/url_maps_tracing_connection.cc @@ -39,7 +39,7 @@ UrlMapsTracingConnection::AggregatedListUrlMaps( request) { auto span = internal::MakeSpan( "compute_url_maps_v1::UrlMapsConnection::AggregatedListUrlMaps"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->AggregatedListUrlMaps(std::move(request)); return internal::MakeTracedStreamRange>( @@ -52,7 +52,7 @@ UrlMapsTracingConnection::DeleteUrlMap( request) { auto span = internal::MakeSpan( "compute_url_maps_v1::UrlMapsConnection::DeleteUrlMap"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteUrlMap(request)); } @@ -72,7 +72,7 @@ UrlMapsTracingConnection::InsertUrlMap( request) { auto span = internal::MakeSpan( "compute_url_maps_v1::UrlMapsConnection::InsertUrlMap"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertUrlMap(request)); } @@ -82,7 +82,7 @@ UrlMapsTracingConnection::InvalidateCache( request) { auto span = internal::MakeSpan( "compute_url_maps_v1::UrlMapsConnection::InvalidateCache"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InvalidateCache(request)); } @@ -91,7 +91,7 @@ UrlMapsTracingConnection::ListUrlMaps( google::cloud::cpp::compute::url_maps::v1::ListUrlMapsRequest request) { auto span = internal::MakeSpan("compute_url_maps_v1::UrlMapsConnection::ListUrlMaps"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListUrlMaps(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::UrlMap>(std::move(span), std::move(sr)); @@ -103,7 +103,7 @@ UrlMapsTracingConnection::PatchUrlMap( request) { auto span = internal::MakeSpan("compute_url_maps_v1::UrlMapsConnection::PatchUrlMap"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PatchUrlMap(request)); } @@ -113,7 +113,7 @@ UrlMapsTracingConnection::UpdateUrlMap( request) { auto span = internal::MakeSpan( "compute_url_maps_v1::UrlMapsConnection::UpdateUrlMap"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateUrlMap(request)); } diff --git a/google/cloud/compute/vpn_gateways/v1/internal/vpn_gateways_tracing_connection.cc b/google/cloud/compute/vpn_gateways/v1/internal/vpn_gateways_tracing_connection.cc index 82308bbbb6b1..588dc2d02f14 100644 --- a/google/cloud/compute/vpn_gateways/v1/internal/vpn_gateways_tracing_connection.cc +++ b/google/cloud/compute/vpn_gateways/v1/internal/vpn_gateways_tracing_connection.cc @@ -40,7 +40,7 @@ VpnGatewaysTracingConnection::AggregatedListVpnGateways( auto span = internal::MakeSpan( "compute_vpn_gateways_v1::VpnGatewaysConnection::" "AggregatedListVpnGateways"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->AggregatedListVpnGateways(std::move(request)); return internal::MakeTracedStreamRange>( @@ -53,7 +53,7 @@ VpnGatewaysTracingConnection::DeleteVpnGateway( DeleteVpnGatewayRequest const& request) { auto span = internal::MakeSpan( "compute_vpn_gateways_v1::VpnGatewaysConnection::DeleteVpnGateway"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteVpnGateway(request)); } @@ -83,7 +83,7 @@ VpnGatewaysTracingConnection::InsertVpnGateway( InsertVpnGatewayRequest const& request) { auto span = internal::MakeSpan( "compute_vpn_gateways_v1::VpnGatewaysConnection::InsertVpnGateway"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertVpnGateway(request)); } @@ -93,7 +93,7 @@ VpnGatewaysTracingConnection::ListVpnGateways( request) { auto span = internal::MakeSpan( "compute_vpn_gateways_v1::VpnGatewaysConnection::ListVpnGateways"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListVpnGateways(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::VpnGateway>(std::move(span), @@ -106,7 +106,7 @@ VpnGatewaysTracingConnection::SetLabels( request) { auto span = internal::MakeSpan( "compute_vpn_gateways_v1::VpnGatewaysConnection::SetLabels"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetLabels(request)); } diff --git a/google/cloud/compute/vpn_tunnels/v1/internal/vpn_tunnels_tracing_connection.cc b/google/cloud/compute/vpn_tunnels/v1/internal/vpn_tunnels_tracing_connection.cc index a3acd5db11b6..872aa912e5e3 100644 --- a/google/cloud/compute/vpn_tunnels/v1/internal/vpn_tunnels_tracing_connection.cc +++ b/google/cloud/compute/vpn_tunnels/v1/internal/vpn_tunnels_tracing_connection.cc @@ -39,7 +39,7 @@ VpnTunnelsTracingConnection::AggregatedListVpnTunnels( AggregatedListVpnTunnelsRequest request) { auto span = internal::MakeSpan( "compute_vpn_tunnels_v1::VpnTunnelsConnection::AggregatedListVpnTunnels"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->AggregatedListVpnTunnels(std::move(request)); return internal::MakeTracedStreamRange>( @@ -52,7 +52,7 @@ VpnTunnelsTracingConnection::DeleteVpnTunnel( request) { auto span = internal::MakeSpan( "compute_vpn_tunnels_v1::VpnTunnelsConnection::DeleteVpnTunnel"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteVpnTunnel(request)); } @@ -72,7 +72,7 @@ VpnTunnelsTracingConnection::InsertVpnTunnel( request) { auto span = internal::MakeSpan( "compute_vpn_tunnels_v1::VpnTunnelsConnection::InsertVpnTunnel"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InsertVpnTunnel(request)); } @@ -82,7 +82,7 @@ VpnTunnelsTracingConnection::ListVpnTunnels( request) { auto span = internal::MakeSpan( "compute_vpn_tunnels_v1::VpnTunnelsConnection::ListVpnTunnels"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListVpnTunnels(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::VpnTunnel>(std::move(span), @@ -95,7 +95,7 @@ VpnTunnelsTracingConnection::SetLabels( request) { auto span = internal::MakeSpan( "compute_vpn_tunnels_v1::VpnTunnelsConnection::SetLabels"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetLabels(request)); } diff --git a/google/cloud/compute/zone_operations/v1/internal/zone_operations_tracing_connection.cc b/google/cloud/compute/zone_operations/v1/internal/zone_operations_tracing_connection.cc index 9b1456b6e59b..092b06e8ccfb 100644 --- a/google/cloud/compute/zone_operations/v1/internal/zone_operations_tracing_connection.cc +++ b/google/cloud/compute/zone_operations/v1/internal/zone_operations_tracing_connection.cc @@ -58,7 +58,7 @@ ZoneOperationsTracingConnection::ListZoneOperations( auto span = internal::MakeSpan( "compute_zone_operations_v1::ZoneOperationsConnection::" "ListZoneOperations"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListZoneOperations(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::cpp::compute::v1::Operation>(std::move(span), diff --git a/google/cloud/compute/zones/v1/internal/zones_tracing_connection.cc b/google/cloud/compute/zones/v1/internal/zones_tracing_connection.cc index 08ae172b2752..116ed7925245 100644 --- a/google/cloud/compute/zones/v1/internal/zones_tracing_connection.cc +++ b/google/cloud/compute/zones/v1/internal/zones_tracing_connection.cc @@ -44,7 +44,7 @@ ZonesTracingConnection::ListZones( google::cloud::cpp::compute::zones::v1::ListZonesRequest request) { auto span = internal::MakeSpan("compute_zones_v1::ZonesConnection::ListZones"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListZones(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); diff --git a/google/cloud/config/v1/internal/config_tracing_connection.cc b/google/cloud/config/v1/internal/config_tracing_connection.cc index ea1b4d54856f..2f60f2516083 100644 --- a/google/cloud/config/v1/internal/config_tracing_connection.cc +++ b/google/cloud/config/v1/internal/config_tracing_connection.cc @@ -37,7 +37,7 @@ ConfigTracingConnection::ListDeployments( google::cloud::config::v1::ListDeploymentsRequest request) { auto span = internal::MakeSpan("config_v1::ConfigConnection::ListDeployments"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListDeployments(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -56,7 +56,7 @@ ConfigTracingConnection::CreateDeployment( google::cloud::config::v1::CreateDeploymentRequest const& request) { auto span = internal::MakeSpan("config_v1::ConfigConnection::CreateDeployment"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateDeployment(request)); } @@ -65,7 +65,7 @@ ConfigTracingConnection::UpdateDeployment( google::cloud::config::v1::UpdateDeploymentRequest const& request) { auto span = internal::MakeSpan("config_v1::ConfigConnection::UpdateDeployment"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateDeployment(request)); } @@ -74,7 +74,7 @@ ConfigTracingConnection::DeleteDeployment( google::cloud::config::v1::DeleteDeploymentRequest const& request) { auto span = internal::MakeSpan("config_v1::ConfigConnection::DeleteDeployment"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteDeployment(request)); } @@ -82,7 +82,7 @@ StreamRange ConfigTracingConnection::ListRevisions( google::cloud::config::v1::ListRevisionsRequest request) { auto span = internal::MakeSpan("config_v1::ConfigConnection::ListRevisions"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListRevisions(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -108,7 +108,7 @@ StreamRange ConfigTracingConnection::ListResources( google::cloud::config::v1::ListResourcesRequest request) { auto span = internal::MakeSpan("config_v1::ConfigConnection::ListResources"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListResources(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -154,7 +154,7 @@ future> ConfigTracingConnection::LockDeployment( google::cloud::config::v1::LockDeploymentRequest const& request) { auto span = internal::MakeSpan("config_v1::ConfigConnection::LockDeployment"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->LockDeployment(request)); } @@ -163,7 +163,7 @@ ConfigTracingConnection::UnlockDeployment( google::cloud::config::v1::UnlockDeploymentRequest const& request) { auto span = internal::MakeSpan("config_v1::ConfigConnection::UnlockDeployment"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UnlockDeployment(request)); } diff --git a/google/cloud/config/v1/internal/config_tracing_stub.cc b/google/cloud/config/v1/internal/config_tracing_stub.cc index 6ff149d03b42..aa2f0d0eec01 100644 --- a/google/cloud/config/v1/internal/config_tracing_stub.cc +++ b/google/cloud/config/v1/internal/config_tracing_stub.cc @@ -60,10 +60,8 @@ ConfigTracingStub::AsyncCreateDeployment( google::cloud::config::v1::CreateDeploymentRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.config.v1.Config", "CreateDeployment"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateDeployment(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -75,10 +73,8 @@ ConfigTracingStub::AsyncUpdateDeployment( google::cloud::config::v1::UpdateDeploymentRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.config.v1.Config", "UpdateDeployment"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateDeployment(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -90,10 +86,8 @@ ConfigTracingStub::AsyncDeleteDeployment( google::cloud::config::v1::DeleteDeploymentRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.config.v1.Config", "DeleteDeployment"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteDeployment(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -199,10 +193,8 @@ ConfigTracingStub::AsyncLockDeployment( google::cloud::config::v1::LockDeploymentRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.config.v1.Config", "LockDeployment"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncLockDeployment(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -214,10 +206,8 @@ ConfigTracingStub::AsyncUnlockDeployment( google::cloud::config::v1::UnlockDeploymentRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.config.v1.Config", "UnlockDeployment"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUnlockDeployment(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -240,10 +230,8 @@ ConfigTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -254,10 +242,8 @@ future ConfigTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/connectors/v1/internal/connectors_tracing_connection.cc b/google/cloud/connectors/v1/internal/connectors_tracing_connection.cc index d2af45a3ac6e..60f821788b59 100644 --- a/google/cloud/connectors/v1/internal/connectors_tracing_connection.cc +++ b/google/cloud/connectors/v1/internal/connectors_tracing_connection.cc @@ -37,7 +37,7 @@ ConnectorsTracingConnection::ListConnections( google::cloud::connectors::v1::ListConnectionsRequest request) { auto span = internal::MakeSpan( "connectors_v1::ConnectorsConnection::ListConnections"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListConnections(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::connectors::v1::Connection>(std::move(span), @@ -58,7 +58,7 @@ ConnectorsTracingConnection::CreateConnection( google::cloud::connectors::v1::CreateConnectionRequest const& request) { auto span = internal::MakeSpan( "connectors_v1::ConnectorsConnection::CreateConnection"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateConnection(request)); } @@ -67,7 +67,7 @@ ConnectorsTracingConnection::UpdateConnection( google::cloud::connectors::v1::UpdateConnectionRequest const& request) { auto span = internal::MakeSpan( "connectors_v1::ConnectorsConnection::UpdateConnection"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateConnection(request)); } @@ -76,7 +76,7 @@ ConnectorsTracingConnection::DeleteConnection( google::cloud::connectors::v1::DeleteConnectionRequest const& request) { auto span = internal::MakeSpan( "connectors_v1::ConnectorsConnection::DeleteConnection"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteConnection(request)); } @@ -85,7 +85,7 @@ ConnectorsTracingConnection::ListProviders( google::cloud::connectors::v1::ListProvidersRequest request) { auto span = internal::MakeSpan("connectors_v1::ConnectorsConnection::ListProviders"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListProviders(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::connectors::v1::Provider>(std::move(span), std::move(sr)); @@ -105,7 +105,7 @@ ConnectorsTracingConnection::ListConnectors( google::cloud::connectors::v1::ListConnectorsRequest request) { auto span = internal::MakeSpan("connectors_v1::ConnectorsConnection::ListConnectors"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListConnectors(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::connectors::v1::Connector>(std::move(span), std::move(sr)); @@ -125,7 +125,7 @@ ConnectorsTracingConnection::ListConnectorVersions( google::cloud::connectors::v1::ListConnectorVersionsRequest request) { auto span = internal::MakeSpan( "connectors_v1::ConnectorsConnection::ListConnectorVersions"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListConnectorVersions(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::connectors::v1::ConnectorVersion>(std::move(span), @@ -157,7 +157,7 @@ ConnectorsTracingConnection::RefreshConnectionSchemaMetadata( request) { auto span = internal::MakeSpan( "connectors_v1::ConnectorsConnection::RefreshConnectionSchemaMetadata"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RefreshConnectionSchemaMetadata(request)); } @@ -167,7 +167,7 @@ ConnectorsTracingConnection::ListRuntimeEntitySchemas( google::cloud::connectors::v1::ListRuntimeEntitySchemasRequest request) { auto span = internal::MakeSpan( "connectors_v1::ConnectorsConnection::ListRuntimeEntitySchemas"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListRuntimeEntitySchemas(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::connectors::v1::RuntimeEntitySchema>(std::move(span), @@ -179,7 +179,7 @@ ConnectorsTracingConnection::ListRuntimeActionSchemas( google::cloud::connectors::v1::ListRuntimeActionSchemasRequest request) { auto span = internal::MakeSpan( "connectors_v1::ConnectorsConnection::ListRuntimeActionSchemas"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListRuntimeActionSchemas(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::connectors::v1::RuntimeActionSchema>(std::move(span), diff --git a/google/cloud/connectors/v1/internal/connectors_tracing_stub.cc b/google/cloud/connectors/v1/internal/connectors_tracing_stub.cc index 4094a0d212b4..b71e6ebaf599 100644 --- a/google/cloud/connectors/v1/internal/connectors_tracing_stub.cc +++ b/google/cloud/connectors/v1/internal/connectors_tracing_stub.cc @@ -61,10 +61,8 @@ ConnectorsTracingStub::AsyncCreateConnection( google::cloud::connectors::v1::CreateConnectionRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.connectors.v1.Connectors", "CreateConnection"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateConnection(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -76,10 +74,8 @@ ConnectorsTracingStub::AsyncUpdateConnection( google::cloud::connectors::v1::UpdateConnectionRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.connectors.v1.Connectors", "UpdateConnection"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateConnection(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -91,10 +87,8 @@ ConnectorsTracingStub::AsyncDeleteConnection( google::cloud::connectors::v1::DeleteConnectionRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.connectors.v1.Connectors", "DeleteConnection"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteConnection(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -193,10 +187,8 @@ ConnectorsTracingStub::AsyncRefreshConnectionSchemaMetadata( request) { auto span = internal::MakeSpanGrpc("google.cloud.connectors.v1.Connectors", "RefreshConnectionSchemaMetadata"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncRefreshConnectionSchemaMetadata(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -258,10 +250,8 @@ ConnectorsTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -272,10 +262,8 @@ future ConnectorsTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_tracing_connection.cc b/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_tracing_connection.cc index d0638e2f9de9..e6404045d33d 100644 --- a/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_tracing_connection.cc +++ b/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_tracing_connection.cc @@ -51,7 +51,7 @@ ContactCenterInsightsTracingConnection::UploadConversation( auto span = internal::MakeSpan( "contactcenterinsights_v1::ContactCenterInsightsConnection::" "UploadConversation"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UploadConversation(request)); } @@ -85,7 +85,7 @@ ContactCenterInsightsTracingConnection::ListConversations( auto span = internal::MakeSpan( "contactcenterinsights_v1::ContactCenterInsightsConnection::" "ListConversations"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListConversations(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::contactcenterinsights::v1::Conversation>(std::move(span), @@ -109,7 +109,7 @@ ContactCenterInsightsTracingConnection::CreateAnalysis( auto span = internal::MakeSpan( "contactcenterinsights_v1::ContactCenterInsightsConnection::" "CreateAnalysis"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateAnalysis(request)); } @@ -129,7 +129,7 @@ ContactCenterInsightsTracingConnection::ListAnalyses( auto span = internal::MakeSpan( "contactcenterinsights_v1::ContactCenterInsightsConnection::" "ListAnalyses"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListAnalyses(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::contactcenterinsights::v1::Analysis>(std::move(span), @@ -154,7 +154,7 @@ ContactCenterInsightsTracingConnection::BulkAnalyzeConversations( auto span = internal::MakeSpan( "contactcenterinsights_v1::ContactCenterInsightsConnection::" "BulkAnalyzeConversations"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->BulkAnalyzeConversations(request)); } @@ -167,7 +167,7 @@ ContactCenterInsightsTracingConnection::IngestConversations( auto span = internal::MakeSpan( "contactcenterinsights_v1::ContactCenterInsightsConnection::" "IngestConversations"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->IngestConversations(request)); } @@ -180,7 +180,7 @@ ContactCenterInsightsTracingConnection::ExportInsightsData( auto span = internal::MakeSpan( "contactcenterinsights_v1::ContactCenterInsightsConnection::" "ExportInsightsData"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ExportInsightsData(request)); } @@ -192,7 +192,7 @@ ContactCenterInsightsTracingConnection::CreateIssueModel( auto span = internal::MakeSpan( "contactcenterinsights_v1::ContactCenterInsightsConnection::" "CreateIssueModel"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateIssueModel(request)); } @@ -237,7 +237,7 @@ ContactCenterInsightsTracingConnection::DeleteIssueModel( auto span = internal::MakeSpan( "contactcenterinsights_v1::ContactCenterInsightsConnection::" "DeleteIssueModel"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteIssueModel(request)); } @@ -249,7 +249,7 @@ ContactCenterInsightsTracingConnection::DeployIssueModel( auto span = internal::MakeSpan( "contactcenterinsights_v1::ContactCenterInsightsConnection::" "DeployIssueModel"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeployIssueModel(request)); } @@ -261,7 +261,7 @@ ContactCenterInsightsTracingConnection::UndeployIssueModel( auto span = internal::MakeSpan( "contactcenterinsights_v1::ContactCenterInsightsConnection::" "UndeployIssueModel"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UndeployIssueModel(request)); } @@ -345,7 +345,7 @@ ContactCenterInsightsTracingConnection::ListPhraseMatchers( auto span = internal::MakeSpan( "contactcenterinsights_v1::ContactCenterInsightsConnection::" "ListPhraseMatchers"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListPhraseMatchers(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::contactcenterinsights::v1::PhraseMatcher>(std::move(span), @@ -429,7 +429,7 @@ ContactCenterInsightsTracingConnection::ListViews( google::cloud::contactcenterinsights::v1::ListViewsRequest request) { auto span = internal::MakeSpan( "contactcenterinsights_v1::ContactCenterInsightsConnection::ListViews"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListViews(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::contactcenterinsights::v1::View>(std::move(span), diff --git a/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_tracing_stub.cc b/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_tracing_stub.cc index b7323cee2a29..c672d7f331e3 100644 --- a/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_tracing_stub.cc +++ b/google/cloud/contactcenterinsights/v1/internal/contact_center_insights_tracing_stub.cc @@ -53,10 +53,8 @@ ContactCenterInsightsTracingStub::AsyncUploadConversation( auto span = internal::MakeSpanGrpc( "google.cloud.contactcenterinsights.v1.ContactCenterInsights", "UploadConversation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUploadConversation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -125,10 +123,8 @@ ContactCenterInsightsTracingStub::AsyncCreateAnalysis( auto span = internal::MakeSpanGrpc( "google.cloud.contactcenterinsights.v1.ContactCenterInsights", "CreateAnalysis"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateAnalysis(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -183,10 +179,8 @@ ContactCenterInsightsTracingStub::AsyncBulkAnalyzeConversations( auto span = internal::MakeSpanGrpc( "google.cloud.contactcenterinsights.v1.ContactCenterInsights", "BulkAnalyzeConversations"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncBulkAnalyzeConversations(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -200,10 +194,8 @@ ContactCenterInsightsTracingStub::AsyncIngestConversations( auto span = internal::MakeSpanGrpc( "google.cloud.contactcenterinsights.v1.ContactCenterInsights", "IngestConversations"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncIngestConversations(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -217,10 +209,8 @@ ContactCenterInsightsTracingStub::AsyncExportInsightsData( auto span = internal::MakeSpanGrpc( "google.cloud.contactcenterinsights.v1.ContactCenterInsights", "ExportInsightsData"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncExportInsightsData(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -234,10 +224,8 @@ ContactCenterInsightsTracingStub::AsyncCreateIssueModel( auto span = internal::MakeSpanGrpc( "google.cloud.contactcenterinsights.v1.ContactCenterInsights", "CreateIssueModel"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateIssueModel(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -293,10 +281,8 @@ ContactCenterInsightsTracingStub::AsyncDeleteIssueModel( auto span = internal::MakeSpanGrpc( "google.cloud.contactcenterinsights.v1.ContactCenterInsights", "DeleteIssueModel"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteIssueModel(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -310,10 +296,8 @@ ContactCenterInsightsTracingStub::AsyncDeployIssueModel( auto span = internal::MakeSpanGrpc( "google.cloud.contactcenterinsights.v1.ContactCenterInsights", "DeployIssueModel"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeployIssueModel(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -327,10 +311,8 @@ ContactCenterInsightsTracingStub::AsyncUndeployIssueModel( auto span = internal::MakeSpanGrpc( "google.cloud.contactcenterinsights.v1.ContactCenterInsights", "UndeployIssueModel"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUndeployIssueModel(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -585,10 +567,8 @@ ContactCenterInsightsTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -599,10 +579,8 @@ future ContactCenterInsightsTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/container/v1/internal/cluster_manager_tracing_connection.cc b/google/cloud/container/v1/internal/cluster_manager_tracing_connection.cc index 7d96f9e51761..67fb3372f412 100644 --- a/google/cloud/container/v1/internal/cluster_manager_tracing_connection.cc +++ b/google/cloud/container/v1/internal/cluster_manager_tracing_connection.cc @@ -323,7 +323,7 @@ ClusterManagerTracingConnection::ListUsableSubnetworks( google::container::v1::ListUsableSubnetworksRequest request) { auto span = internal::MakeSpan( "container_v1::ClusterManagerConnection::ListUsableSubnetworks"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListUsableSubnetworks(std::move(request)); return internal::MakeTracedStreamRange< google::container::v1::UsableSubnetwork>(std::move(span), std::move(sr)); diff --git a/google/cloud/containeranalysis/v1/internal/grafeas_tracing_connection.cc b/google/cloud/containeranalysis/v1/internal/grafeas_tracing_connection.cc index d1f0d9624094..2b80f7d01897 100644 --- a/google/cloud/containeranalysis/v1/internal/grafeas_tracing_connection.cc +++ b/google/cloud/containeranalysis/v1/internal/grafeas_tracing_connection.cc @@ -44,7 +44,7 @@ StreamRange GrafeasTracingConnection::ListOccurrences( grafeas::v1::ListOccurrencesRequest request) { auto span = internal::MakeSpan( "containeranalysis_v1::GrafeasConnection::ListOccurrences"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListOccurrences(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -103,7 +103,7 @@ StreamRange GrafeasTracingConnection::ListNotes( grafeas::v1::ListNotesRequest request) { auto span = internal::MakeSpan("containeranalysis_v1::GrafeasConnection::ListNotes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListNotes(std::move(request)); return internal::MakeTracedStreamRange(std::move(span), std::move(sr)); @@ -147,7 +147,7 @@ GrafeasTracingConnection::ListNoteOccurrences( grafeas::v1::ListNoteOccurrencesRequest request) { auto span = internal::MakeSpan( "containeranalysis_v1::GrafeasConnection::ListNoteOccurrences"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListNoteOccurrences(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); diff --git a/google/cloud/contentwarehouse/v1/internal/document_link_tracing_connection.cc b/google/cloud/contentwarehouse/v1/internal/document_link_tracing_connection.cc index c91a574082b8..510aeb1c156c 100644 --- a/google/cloud/contentwarehouse/v1/internal/document_link_tracing_connection.cc +++ b/google/cloud/contentwarehouse/v1/internal/document_link_tracing_connection.cc @@ -47,7 +47,7 @@ DocumentLinkServiceTracingConnection::ListLinkedSources( google::cloud::contentwarehouse::v1::ListLinkedSourcesRequest request) { auto span = internal::MakeSpan( "contentwarehouse_v1::DocumentLinkServiceConnection::ListLinkedSources"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListLinkedSources(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::contentwarehouse::v1::DocumentLink>(std::move(span), diff --git a/google/cloud/contentwarehouse/v1/internal/document_schema_tracing_connection.cc b/google/cloud/contentwarehouse/v1/internal/document_schema_tracing_connection.cc index a66e09da874e..a6579edb859d 100644 --- a/google/cloud/contentwarehouse/v1/internal/document_schema_tracing_connection.cc +++ b/google/cloud/contentwarehouse/v1/internal/document_schema_tracing_connection.cc @@ -81,7 +81,7 @@ DocumentSchemaServiceTracingConnection::ListDocumentSchemas( auto span = internal::MakeSpan( "contentwarehouse_v1::DocumentSchemaServiceConnection::" "ListDocumentSchemas"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListDocumentSchemas(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::contentwarehouse::v1::DocumentSchema>(std::move(span), diff --git a/google/cloud/contentwarehouse/v1/internal/document_tracing_connection.cc b/google/cloud/contentwarehouse/v1/internal/document_tracing_connection.cc index 86e7686e54b8..240197f44663 100644 --- a/google/cloud/contentwarehouse/v1/internal/document_tracing_connection.cc +++ b/google/cloud/contentwarehouse/v1/internal/document_tracing_connection.cc @@ -73,7 +73,7 @@ DocumentServiceTracingConnection::SearchDocuments( google::cloud::contentwarehouse::v1::SearchDocumentsRequest request) { auto span = internal::MakeSpan( "contentwarehouse_v1::DocumentServiceConnection::SearchDocuments"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->SearchDocuments(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::contentwarehouse::v1::SearchDocumentsResponse:: diff --git a/google/cloud/contentwarehouse/v1/internal/rule_set_tracing_connection.cc b/google/cloud/contentwarehouse/v1/internal/rule_set_tracing_connection.cc index 0807babcafb2..deab2a0fbd9a 100644 --- a/google/cloud/contentwarehouse/v1/internal/rule_set_tracing_connection.cc +++ b/google/cloud/contentwarehouse/v1/internal/rule_set_tracing_connection.cc @@ -72,7 +72,7 @@ RuleSetServiceTracingConnection::ListRuleSets( google::cloud::contentwarehouse::v1::ListRuleSetsRequest request) { auto span = internal::MakeSpan( "contentwarehouse_v1::RuleSetServiceConnection::ListRuleSets"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListRuleSets(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::contentwarehouse::v1::RuleSet>(std::move(span), diff --git a/google/cloud/contentwarehouse/v1/internal/synonym_set_tracing_connection.cc b/google/cloud/contentwarehouse/v1/internal/synonym_set_tracing_connection.cc index 83f3db1bc27b..7e9a44a630a9 100644 --- a/google/cloud/contentwarehouse/v1/internal/synonym_set_tracing_connection.cc +++ b/google/cloud/contentwarehouse/v1/internal/synonym_set_tracing_connection.cc @@ -75,7 +75,7 @@ SynonymSetServiceTracingConnection::ListSynonymSets( google::cloud::contentwarehouse::v1::ListSynonymSetsRequest request) { auto span = internal::MakeSpan( "contentwarehouse_v1::SynonymSetServiceConnection::ListSynonymSets"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListSynonymSets(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::contentwarehouse::v1::SynonymSet>(std::move(span), diff --git a/google/cloud/datacatalog/lineage/v1/internal/lineage_tracing_connection.cc b/google/cloud/datacatalog/lineage/v1/internal/lineage_tracing_connection.cc index 8717ae8b6fd8..e3625a3953da 100644 --- a/google/cloud/datacatalog/lineage/v1/internal/lineage_tracing_connection.cc +++ b/google/cloud/datacatalog/lineage/v1/internal/lineage_tracing_connection.cc @@ -66,7 +66,7 @@ LineageTracingConnection::ListProcesses( google::cloud::datacatalog::lineage::v1::ListProcessesRequest request) { auto span = internal::MakeSpan( "datacatalog_lineage_v1::LineageConnection::ListProcesses"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListProcesses(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::datacatalog::lineage::v1::Process>(std::move(span), @@ -79,7 +79,7 @@ LineageTracingConnection::DeleteProcess( request) { auto span = internal::MakeSpan( "datacatalog_lineage_v1::LineageConnection::DeleteProcess"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteProcess(request)); } @@ -115,7 +115,7 @@ LineageTracingConnection::ListRuns( google::cloud::datacatalog::lineage::v1::ListRunsRequest request) { auto span = internal::MakeSpan("datacatalog_lineage_v1::LineageConnection::ListRuns"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListRuns(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::datacatalog::lineage::v1::Run>(std::move(span), @@ -127,7 +127,7 @@ LineageTracingConnection::DeleteRun( google::cloud::datacatalog::lineage::v1::DeleteRunRequest const& request) { auto span = internal::MakeSpan( "datacatalog_lineage_v1::LineageConnection::DeleteRun"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteRun(request)); } @@ -156,7 +156,7 @@ LineageTracingConnection::ListLineageEvents( google::cloud::datacatalog::lineage::v1::ListLineageEventsRequest request) { auto span = internal::MakeSpan( "datacatalog_lineage_v1::LineageConnection::ListLineageEvents"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListLineageEvents(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::datacatalog::lineage::v1::LineageEvent>(std::move(span), @@ -177,7 +177,7 @@ LineageTracingConnection::SearchLinks( google::cloud::datacatalog::lineage::v1::SearchLinksRequest request) { auto span = internal::MakeSpan( "datacatalog_lineage_v1::LineageConnection::SearchLinks"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->SearchLinks(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::datacatalog::lineage::v1::Link>(std::move(span), @@ -190,7 +190,7 @@ LineageTracingConnection::BatchSearchLinkProcesses( request) { auto span = internal::MakeSpan( "datacatalog_lineage_v1::LineageConnection::BatchSearchLinkProcesses"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->BatchSearchLinkProcesses(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::datacatalog::lineage::v1::ProcessLinks>(std::move(span), diff --git a/google/cloud/datacatalog/lineage/v1/internal/lineage_tracing_stub.cc b/google/cloud/datacatalog/lineage/v1/internal/lineage_tracing_stub.cc index 9f3c48cc91a5..b88d3f0f035a 100644 --- a/google/cloud/datacatalog/lineage/v1/internal/lineage_tracing_stub.cc +++ b/google/cloud/datacatalog/lineage/v1/internal/lineage_tracing_stub.cc @@ -88,10 +88,8 @@ LineageTracingStub::AsyncDeleteProcess( request) { auto span = internal::MakeSpanGrpc( "google.cloud.datacatalog.lineage.v1.Lineage", "DeleteProcess"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteProcess(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -147,10 +145,8 @@ LineageTracingStub::AsyncDeleteRun( google::cloud::datacatalog::lineage::v1::DeleteRunRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.datacatalog.lineage.v1.Lineage", "DeleteRun"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteRun(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -241,10 +237,8 @@ LineageTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -255,10 +249,8 @@ future LineageTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/datacatalog/v1/internal/data_catalog_tracing_connection.cc b/google/cloud/datacatalog/v1/internal/data_catalog_tracing_connection.cc index bf92eedacf1e..7f365f1427f3 100644 --- a/google/cloud/datacatalog/v1/internal/data_catalog_tracing_connection.cc +++ b/google/cloud/datacatalog/v1/internal/data_catalog_tracing_connection.cc @@ -37,7 +37,7 @@ DataCatalogTracingConnection::SearchCatalog( google::cloud::datacatalog::v1::SearchCatalogRequest request) { auto span = internal::MakeSpan( "datacatalog_v1::DataCatalogConnection::SearchCatalog"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->SearchCatalog(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::datacatalog::v1::SearchCatalogResult>(std::move(span), @@ -84,7 +84,7 @@ DataCatalogTracingConnection::ListEntryGroups( google::cloud::datacatalog::v1::ListEntryGroupsRequest request) { auto span = internal::MakeSpan( "datacatalog_v1::DataCatalogConnection::ListEntryGroups"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListEntryGroups(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::datacatalog::v1::EntryGroup>(std::move(span), @@ -140,7 +140,7 @@ DataCatalogTracingConnection::ListEntries( google::cloud::datacatalog::v1::ListEntriesRequest request) { auto span = internal::MakeSpan("datacatalog_v1::DataCatalogConnection::ListEntries"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListEntries(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -280,7 +280,7 @@ DataCatalogTracingConnection::ListTags( google::cloud::datacatalog::v1::ListTagsRequest request) { auto span = internal::MakeSpan("datacatalog_v1::DataCatalogConnection::ListTags"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListTags(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -291,7 +291,7 @@ DataCatalogTracingConnection::ReconcileTags( google::cloud::datacatalog::v1::ReconcileTagsRequest const& request) { auto span = internal::MakeSpan( "datacatalog_v1::DataCatalogConnection::ReconcileTags"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ReconcileTags(request)); } @@ -343,7 +343,7 @@ DataCatalogTracingConnection::ImportEntries( google::cloud::datacatalog::v1::ImportEntriesRequest const& request) { auto span = internal::MakeSpan( "datacatalog_v1::DataCatalogConnection::ImportEntries"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ImportEntries(request)); } diff --git a/google/cloud/datacatalog/v1/internal/data_catalog_tracing_stub.cc b/google/cloud/datacatalog/v1/internal/data_catalog_tracing_stub.cc index 3b4296d92a20..225e5d35f11d 100644 --- a/google/cloud/datacatalog/v1/internal/data_catalog_tracing_stub.cc +++ b/google/cloud/datacatalog/v1/internal/data_catalog_tracing_stub.cc @@ -355,10 +355,8 @@ DataCatalogTracingStub::AsyncReconcileTags( google::cloud::datacatalog::v1::ReconcileTagsRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.datacatalog.v1.DataCatalog", "ReconcileTags"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncReconcileTags(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -427,10 +425,8 @@ DataCatalogTracingStub::AsyncImportEntries( google::cloud::datacatalog::v1::ImportEntriesRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.datacatalog.v1.DataCatalog", "ImportEntries"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncImportEntries(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -442,10 +438,8 @@ DataCatalogTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -456,10 +450,8 @@ future DataCatalogTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/datacatalog/v1/internal/policy_tag_manager_tracing_connection.cc b/google/cloud/datacatalog/v1/internal/policy_tag_manager_tracing_connection.cc index 8356e7673e5e..594a48b45d24 100644 --- a/google/cloud/datacatalog/v1/internal/policy_tag_manager_tracing_connection.cc +++ b/google/cloud/datacatalog/v1/internal/policy_tag_manager_tracing_connection.cc @@ -63,7 +63,7 @@ PolicyTagManagerTracingConnection::ListTaxonomies( google::cloud::datacatalog::v1::ListTaxonomiesRequest request) { auto span = internal::MakeSpan( "datacatalog_v1::PolicyTagManagerConnection::ListTaxonomies"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListTaxonomies(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::datacatalog::v1::Taxonomy>(std::move(span), std::move(sr)); @@ -109,7 +109,7 @@ PolicyTagManagerTracingConnection::ListPolicyTags( google::cloud::datacatalog::v1::ListPolicyTagsRequest request) { auto span = internal::MakeSpan( "datacatalog_v1::PolicyTagManagerConnection::ListPolicyTags"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListPolicyTags(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::datacatalog::v1::PolicyTag>(std::move(span), diff --git a/google/cloud/datafusion/v1/internal/data_fusion_tracing_connection.cc b/google/cloud/datafusion/v1/internal/data_fusion_tracing_connection.cc index a5e0a09b8820..6d4178010bc9 100644 --- a/google/cloud/datafusion/v1/internal/data_fusion_tracing_connection.cc +++ b/google/cloud/datafusion/v1/internal/data_fusion_tracing_connection.cc @@ -37,7 +37,7 @@ DataFusionTracingConnection::ListAvailableVersions( google::cloud::datafusion::v1::ListAvailableVersionsRequest request) { auto span = internal::MakeSpan( "datafusion_v1::DataFusionConnection::ListAvailableVersions"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListAvailableVersions(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::datafusion::v1::Version>(std::move(span), std::move(sr)); @@ -48,7 +48,7 @@ DataFusionTracingConnection::ListInstances( google::cloud::datafusion::v1::ListInstancesRequest request) { auto span = internal::MakeSpan("datafusion_v1::DataFusionConnection::ListInstances"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListInstances(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::datafusion::v1::Instance>(std::move(span), std::move(sr)); @@ -68,7 +68,7 @@ DataFusionTracingConnection::CreateInstance( google::cloud::datafusion::v1::CreateInstanceRequest const& request) { auto span = internal::MakeSpan("datafusion_v1::DataFusionConnection::CreateInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateInstance(request)); } @@ -77,7 +77,7 @@ DataFusionTracingConnection::DeleteInstance( google::cloud::datafusion::v1::DeleteInstanceRequest const& request) { auto span = internal::MakeSpan("datafusion_v1::DataFusionConnection::DeleteInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteInstance(request)); } @@ -86,7 +86,7 @@ DataFusionTracingConnection::UpdateInstance( google::cloud::datafusion::v1::UpdateInstanceRequest const& request) { auto span = internal::MakeSpan("datafusion_v1::DataFusionConnection::UpdateInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateInstance(request)); } @@ -95,7 +95,7 @@ DataFusionTracingConnection::RestartInstance( google::cloud::datafusion::v1::RestartInstanceRequest const& request) { auto span = internal::MakeSpan( "datafusion_v1::DataFusionConnection::RestartInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RestartInstance(request)); } diff --git a/google/cloud/datafusion/v1/internal/data_fusion_tracing_stub.cc b/google/cloud/datafusion/v1/internal/data_fusion_tracing_stub.cc index e8964da56541..b11b1e3faffb 100644 --- a/google/cloud/datafusion/v1/internal/data_fusion_tracing_stub.cc +++ b/google/cloud/datafusion/v1/internal/data_fusion_tracing_stub.cc @@ -74,10 +74,8 @@ DataFusionTracingStub::AsyncCreateInstance( google::cloud::datafusion::v1::CreateInstanceRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.datafusion.v1.DataFusion", "CreateInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -89,10 +87,8 @@ DataFusionTracingStub::AsyncDeleteInstance( google::cloud::datafusion::v1::DeleteInstanceRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.datafusion.v1.DataFusion", "DeleteInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -104,10 +100,8 @@ DataFusionTracingStub::AsyncUpdateInstance( google::cloud::datafusion::v1::UpdateInstanceRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.datafusion.v1.DataFusion", "UpdateInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -119,10 +113,8 @@ DataFusionTracingStub::AsyncRestartInstance( google::cloud::datafusion::v1::RestartInstanceRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.datafusion.v1.DataFusion", "RestartInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncRestartInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -134,10 +126,8 @@ DataFusionTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -148,10 +138,8 @@ future DataFusionTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/datamigration/v1/internal/data_migration_tracing_connection.cc b/google/cloud/datamigration/v1/internal/data_migration_tracing_connection.cc index e468c9f71b4a..3514692552e3 100644 --- a/google/cloud/datamigration/v1/internal/data_migration_tracing_connection.cc +++ b/google/cloud/datamigration/v1/internal/data_migration_tracing_connection.cc @@ -37,7 +37,7 @@ DataMigrationServiceTracingConnection::ListMigrationJobs( google::cloud::clouddms::v1::ListMigrationJobsRequest request) { auto span = internal::MakeSpan( "datamigration_v1::DataMigrationServiceConnection::ListMigrationJobs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListMigrationJobs(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::clouddms::v1::MigrationJob>(std::move(span), @@ -58,7 +58,7 @@ DataMigrationServiceTracingConnection::CreateMigrationJob( google::cloud::clouddms::v1::CreateMigrationJobRequest const& request) { auto span = internal::MakeSpan( "datamigration_v1::DataMigrationServiceConnection::CreateMigrationJob"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateMigrationJob(request)); } @@ -68,7 +68,7 @@ DataMigrationServiceTracingConnection::UpdateMigrationJob( google::cloud::clouddms::v1::UpdateMigrationJobRequest const& request) { auto span = internal::MakeSpan( "datamigration_v1::DataMigrationServiceConnection::UpdateMigrationJob"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateMigrationJob(request)); } @@ -78,7 +78,7 @@ DataMigrationServiceTracingConnection::DeleteMigrationJob( google::cloud::clouddms::v1::DeleteMigrationJobRequest const& request) { auto span = internal::MakeSpan( "datamigration_v1::DataMigrationServiceConnection::DeleteMigrationJob"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteMigrationJob(request)); } @@ -88,7 +88,7 @@ DataMigrationServiceTracingConnection::StartMigrationJob( google::cloud::clouddms::v1::StartMigrationJobRequest const& request) { auto span = internal::MakeSpan( "datamigration_v1::DataMigrationServiceConnection::StartMigrationJob"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->StartMigrationJob(request)); } @@ -97,7 +97,7 @@ DataMigrationServiceTracingConnection::StopMigrationJob( google::cloud::clouddms::v1::StopMigrationJobRequest const& request) { auto span = internal::MakeSpan( "datamigration_v1::DataMigrationServiceConnection::StopMigrationJob"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->StopMigrationJob(request)); } @@ -106,7 +106,7 @@ DataMigrationServiceTracingConnection::ResumeMigrationJob( google::cloud::clouddms::v1::ResumeMigrationJobRequest const& request) { auto span = internal::MakeSpan( "datamigration_v1::DataMigrationServiceConnection::ResumeMigrationJob"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ResumeMigrationJob(request)); } @@ -116,7 +116,7 @@ DataMigrationServiceTracingConnection::PromoteMigrationJob( google::cloud::clouddms::v1::PromoteMigrationJobRequest const& request) { auto span = internal::MakeSpan( "datamigration_v1::DataMigrationServiceConnection::PromoteMigrationJob"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PromoteMigrationJob(request)); } @@ -126,7 +126,7 @@ DataMigrationServiceTracingConnection::VerifyMigrationJob( google::cloud::clouddms::v1::VerifyMigrationJobRequest const& request) { auto span = internal::MakeSpan( "datamigration_v1::DataMigrationServiceConnection::VerifyMigrationJob"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->VerifyMigrationJob(request)); } @@ -136,7 +136,7 @@ DataMigrationServiceTracingConnection::RestartMigrationJob( google::cloud::clouddms::v1::RestartMigrationJobRequest const& request) { auto span = internal::MakeSpan( "datamigration_v1::DataMigrationServiceConnection::RestartMigrationJob"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RestartMigrationJob(request)); } @@ -166,7 +166,7 @@ DataMigrationServiceTracingConnection::ListConnectionProfiles( auto span = internal::MakeSpan( "datamigration_v1::DataMigrationServiceConnection::" "ListConnectionProfiles"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListConnectionProfiles(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::clouddms::v1::ConnectionProfile>(std::move(span), @@ -189,7 +189,7 @@ DataMigrationServiceTracingConnection::CreateConnectionProfile( auto span = internal::MakeSpan( "datamigration_v1::DataMigrationServiceConnection::" "CreateConnectionProfile"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateConnectionProfile(request)); } @@ -201,7 +201,7 @@ DataMigrationServiceTracingConnection::UpdateConnectionProfile( auto span = internal::MakeSpan( "datamigration_v1::DataMigrationServiceConnection::" "UpdateConnectionProfile"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateConnectionProfile(request)); } @@ -213,7 +213,7 @@ DataMigrationServiceTracingConnection::DeleteConnectionProfile( auto span = internal::MakeSpan( "datamigration_v1::DataMigrationServiceConnection::" "DeleteConnectionProfile"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteConnectionProfile(request)); } @@ -225,7 +225,7 @@ DataMigrationServiceTracingConnection::CreatePrivateConnection( auto span = internal::MakeSpan( "datamigration_v1::DataMigrationServiceConnection::" "CreatePrivateConnection"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreatePrivateConnection(request)); } @@ -245,7 +245,7 @@ DataMigrationServiceTracingConnection::ListPrivateConnections( auto span = internal::MakeSpan( "datamigration_v1::DataMigrationServiceConnection::" "ListPrivateConnections"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListPrivateConnections(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::clouddms::v1::PrivateConnection>(std::move(span), @@ -259,7 +259,7 @@ DataMigrationServiceTracingConnection::DeletePrivateConnection( auto span = internal::MakeSpan( "datamigration_v1::DataMigrationServiceConnection::" "DeletePrivateConnection"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeletePrivateConnection(request)); } @@ -280,7 +280,7 @@ DataMigrationServiceTracingConnection::ListConversionWorkspaces( auto span = internal::MakeSpan( "datamigration_v1::DataMigrationServiceConnection::" "ListConversionWorkspaces"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListConversionWorkspaces(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::clouddms::v1::ConversionWorkspace>(std::move(span), @@ -294,7 +294,7 @@ DataMigrationServiceTracingConnection::CreateConversionWorkspace( auto span = internal::MakeSpan( "datamigration_v1::DataMigrationServiceConnection::" "CreateConversionWorkspace"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateConversionWorkspace(request)); } @@ -306,7 +306,7 @@ DataMigrationServiceTracingConnection::UpdateConversionWorkspace( auto span = internal::MakeSpan( "datamigration_v1::DataMigrationServiceConnection::" "UpdateConversionWorkspace"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateConversionWorkspace(request)); } @@ -318,7 +318,7 @@ DataMigrationServiceTracingConnection::DeleteConversionWorkspace( auto span = internal::MakeSpan( "datamigration_v1::DataMigrationServiceConnection::" "DeleteConversionWorkspace"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteConversionWorkspace(request)); } @@ -345,7 +345,7 @@ DataMigrationServiceTracingConnection::ListMappingRules( google::cloud::clouddms::v1::ListMappingRulesRequest request) { auto span = internal::MakeSpan( "datamigration_v1::DataMigrationServiceConnection::ListMappingRules"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListMappingRules(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::clouddms::v1::MappingRule>(std::move(span), std::move(sr)); @@ -367,7 +367,7 @@ DataMigrationServiceTracingConnection::SeedConversionWorkspace( auto span = internal::MakeSpan( "datamigration_v1::DataMigrationServiceConnection::" "SeedConversionWorkspace"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SeedConversionWorkspace(request)); } @@ -377,7 +377,7 @@ DataMigrationServiceTracingConnection::ImportMappingRules( google::cloud::clouddms::v1::ImportMappingRulesRequest const& request) { auto span = internal::MakeSpan( "datamigration_v1::DataMigrationServiceConnection::ImportMappingRules"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ImportMappingRules(request)); } @@ -389,7 +389,7 @@ DataMigrationServiceTracingConnection::ConvertConversionWorkspace( auto span = internal::MakeSpan( "datamigration_v1::DataMigrationServiceConnection::" "ConvertConversionWorkspace"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ConvertConversionWorkspace(request)); } @@ -401,7 +401,7 @@ DataMigrationServiceTracingConnection::CommitConversionWorkspace( auto span = internal::MakeSpan( "datamigration_v1::DataMigrationServiceConnection::" "CommitConversionWorkspace"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CommitConversionWorkspace(request)); } @@ -413,7 +413,7 @@ DataMigrationServiceTracingConnection::RollbackConversionWorkspace( auto span = internal::MakeSpan( "datamigration_v1::DataMigrationServiceConnection::" "RollbackConversionWorkspace"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RollbackConversionWorkspace(request)); } @@ -425,7 +425,7 @@ DataMigrationServiceTracingConnection::ApplyConversionWorkspace( auto span = internal::MakeSpan( "datamigration_v1::DataMigrationServiceConnection::" "ApplyConversionWorkspace"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ApplyConversionWorkspace(request)); } @@ -436,7 +436,7 @@ DataMigrationServiceTracingConnection::DescribeDatabaseEntities( auto span = internal::MakeSpan( "datamigration_v1::DataMigrationServiceConnection::" "DescribeDatabaseEntities"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->DescribeDatabaseEntities(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::clouddms::v1::DatabaseEntity>(std::move(span), @@ -469,7 +469,7 @@ StreamRange DataMigrationServiceTracingConnection::FetchStaticIps( google::cloud::clouddms::v1::FetchStaticIpsRequest request) { auto span = internal::MakeSpan( "datamigration_v1::DataMigrationServiceConnection::FetchStaticIps"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->FetchStaticIps(std::move(request)); return internal::MakeTracedStreamRange(std::move(span), std::move(sr)); diff --git a/google/cloud/datamigration/v1/internal/data_migration_tracing_stub.cc b/google/cloud/datamigration/v1/internal/data_migration_tracing_stub.cc index 6879150b0aeb..64257d7ec2e5 100644 --- a/google/cloud/datamigration/v1/internal/data_migration_tracing_stub.cc +++ b/google/cloud/datamigration/v1/internal/data_migration_tracing_stub.cc @@ -61,10 +61,8 @@ DataMigrationServiceTracingStub::AsyncCreateMigrationJob( google::cloud::clouddms::v1::CreateMigrationJobRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.clouddms.v1.DataMigrationService", "CreateMigrationJob"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateMigrationJob(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -76,10 +74,8 @@ DataMigrationServiceTracingStub::AsyncUpdateMigrationJob( google::cloud::clouddms::v1::UpdateMigrationJobRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.clouddms.v1.DataMigrationService", "UpdateMigrationJob"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateMigrationJob(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -91,10 +87,8 @@ DataMigrationServiceTracingStub::AsyncDeleteMigrationJob( google::cloud::clouddms::v1::DeleteMigrationJobRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.clouddms.v1.DataMigrationService", "DeleteMigrationJob"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteMigrationJob(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -106,10 +100,8 @@ DataMigrationServiceTracingStub::AsyncStartMigrationJob( google::cloud::clouddms::v1::StartMigrationJobRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.clouddms.v1.DataMigrationService", "StartMigrationJob"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncStartMigrationJob(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -121,10 +113,8 @@ DataMigrationServiceTracingStub::AsyncStopMigrationJob( google::cloud::clouddms::v1::StopMigrationJobRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.clouddms.v1.DataMigrationService", "StopMigrationJob"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncStopMigrationJob(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -136,10 +126,8 @@ DataMigrationServiceTracingStub::AsyncResumeMigrationJob( google::cloud::clouddms::v1::ResumeMigrationJobRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.clouddms.v1.DataMigrationService", "ResumeMigrationJob"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncResumeMigrationJob(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -151,10 +139,8 @@ DataMigrationServiceTracingStub::AsyncPromoteMigrationJob( google::cloud::clouddms::v1::PromoteMigrationJobRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.clouddms.v1.DataMigrationService", "PromoteMigrationJob"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncPromoteMigrationJob(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -166,10 +152,8 @@ DataMigrationServiceTracingStub::AsyncVerifyMigrationJob( google::cloud::clouddms::v1::VerifyMigrationJobRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.clouddms.v1.DataMigrationService", "VerifyMigrationJob"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncVerifyMigrationJob(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -181,10 +165,8 @@ DataMigrationServiceTracingStub::AsyncRestartMigrationJob( google::cloud::clouddms::v1::RestartMigrationJobRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.clouddms.v1.DataMigrationService", "RestartMigrationJob"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncRestartMigrationJob(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -248,10 +230,8 @@ DataMigrationServiceTracingStub::AsyncCreateConnectionProfile( auto span = internal::MakeSpanGrpc("google.cloud.clouddms.v1.DataMigrationService", "CreateConnectionProfile"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateConnectionProfile(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -265,10 +245,8 @@ DataMigrationServiceTracingStub::AsyncUpdateConnectionProfile( auto span = internal::MakeSpanGrpc("google.cloud.clouddms.v1.DataMigrationService", "UpdateConnectionProfile"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateConnectionProfile(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -282,10 +260,8 @@ DataMigrationServiceTracingStub::AsyncDeleteConnectionProfile( auto span = internal::MakeSpanGrpc("google.cloud.clouddms.v1.DataMigrationService", "DeleteConnectionProfile"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteConnectionProfile(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -299,10 +275,8 @@ DataMigrationServiceTracingStub::AsyncCreatePrivateConnection( auto span = internal::MakeSpanGrpc("google.cloud.clouddms.v1.DataMigrationService", "CreatePrivateConnection"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreatePrivateConnection(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -341,10 +315,8 @@ DataMigrationServiceTracingStub::AsyncDeletePrivateConnection( auto span = internal::MakeSpanGrpc("google.cloud.clouddms.v1.DataMigrationService", "DeletePrivateConnection"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeletePrivateConnection(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -385,10 +357,8 @@ DataMigrationServiceTracingStub::AsyncCreateConversionWorkspace( auto span = internal::MakeSpanGrpc("google.cloud.clouddms.v1.DataMigrationService", "CreateConversionWorkspace"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateConversionWorkspace(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -402,10 +372,8 @@ DataMigrationServiceTracingStub::AsyncUpdateConversionWorkspace( auto span = internal::MakeSpanGrpc("google.cloud.clouddms.v1.DataMigrationService", "UpdateConversionWorkspace"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateConversionWorkspace(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -419,10 +387,8 @@ DataMigrationServiceTracingStub::AsyncDeleteConversionWorkspace( auto span = internal::MakeSpanGrpc("google.cloud.clouddms.v1.DataMigrationService", "DeleteConversionWorkspace"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteConversionWorkspace(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -483,10 +449,8 @@ DataMigrationServiceTracingStub::AsyncSeedConversionWorkspace( auto span = internal::MakeSpanGrpc("google.cloud.clouddms.v1.DataMigrationService", "SeedConversionWorkspace"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncSeedConversionWorkspace(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -498,10 +462,8 @@ DataMigrationServiceTracingStub::AsyncImportMappingRules( google::cloud::clouddms::v1::ImportMappingRulesRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.clouddms.v1.DataMigrationService", "ImportMappingRules"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncImportMappingRules(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -515,10 +477,8 @@ DataMigrationServiceTracingStub::AsyncConvertConversionWorkspace( auto span = internal::MakeSpanGrpc("google.cloud.clouddms.v1.DataMigrationService", "ConvertConversionWorkspace"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncConvertConversionWorkspace(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -532,10 +492,8 @@ DataMigrationServiceTracingStub::AsyncCommitConversionWorkspace( auto span = internal::MakeSpanGrpc("google.cloud.clouddms.v1.DataMigrationService", "CommitConversionWorkspace"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCommitConversionWorkspace(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -549,10 +507,8 @@ DataMigrationServiceTracingStub::AsyncRollbackConversionWorkspace( auto span = internal::MakeSpanGrpc("google.cloud.clouddms.v1.DataMigrationService", "RollbackConversionWorkspace"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncRollbackConversionWorkspace(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -566,10 +522,8 @@ DataMigrationServiceTracingStub::AsyncApplyConversionWorkspace( auto span = internal::MakeSpanGrpc("google.cloud.clouddms.v1.DataMigrationService", "ApplyConversionWorkspace"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncApplyConversionWorkspace(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -635,10 +589,8 @@ DataMigrationServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -649,10 +601,8 @@ future DataMigrationServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/dataplex/v1/internal/content_tracing_connection.cc b/google/cloud/dataplex/v1/internal/content_tracing_connection.cc index 99d60746e1e4..4797cdb3d689 100644 --- a/google/cloud/dataplex/v1/internal/content_tracing_connection.cc +++ b/google/cloud/dataplex/v1/internal/content_tracing_connection.cc @@ -97,7 +97,7 @@ ContentServiceTracingConnection::ListContent( google::cloud::dataplex::v1::ListContentRequest request) { auto span = internal::MakeSpan("dataplex_v1::ContentServiceConnection::ListContent"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListContent(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); diff --git a/google/cloud/dataplex/v1/internal/dataplex_tracing_connection.cc b/google/cloud/dataplex/v1/internal/dataplex_tracing_connection.cc index 3c3b7c9820f8..6ea14b299aee 100644 --- a/google/cloud/dataplex/v1/internal/dataplex_tracing_connection.cc +++ b/google/cloud/dataplex/v1/internal/dataplex_tracing_connection.cc @@ -37,7 +37,7 @@ DataplexServiceTracingConnection::CreateLake( google::cloud::dataplex::v1::CreateLakeRequest const& request) { auto span = internal::MakeSpan("dataplex_v1::DataplexServiceConnection::CreateLake"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateLake(request)); } @@ -46,7 +46,7 @@ DataplexServiceTracingConnection::UpdateLake( google::cloud::dataplex::v1::UpdateLakeRequest const& request) { auto span = internal::MakeSpan("dataplex_v1::DataplexServiceConnection::UpdateLake"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateLake(request)); } @@ -55,7 +55,7 @@ DataplexServiceTracingConnection::DeleteLake( google::cloud::dataplex::v1::DeleteLakeRequest const& request) { auto span = internal::MakeSpan("dataplex_v1::DataplexServiceConnection::DeleteLake"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteLake(request)); } @@ -64,7 +64,7 @@ DataplexServiceTracingConnection::ListLakes( google::cloud::dataplex::v1::ListLakesRequest request) { auto span = internal::MakeSpan("dataplex_v1::DataplexServiceConnection::ListLakes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListLakes(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -84,7 +84,7 @@ DataplexServiceTracingConnection::ListLakeActions( google::cloud::dataplex::v1::ListLakeActionsRequest request) { auto span = internal::MakeSpan( "dataplex_v1::DataplexServiceConnection::ListLakeActions"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListLakeActions(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -95,7 +95,7 @@ DataplexServiceTracingConnection::CreateZone( google::cloud::dataplex::v1::CreateZoneRequest const& request) { auto span = internal::MakeSpan("dataplex_v1::DataplexServiceConnection::CreateZone"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateZone(request)); } @@ -104,7 +104,7 @@ DataplexServiceTracingConnection::UpdateZone( google::cloud::dataplex::v1::UpdateZoneRequest const& request) { auto span = internal::MakeSpan("dataplex_v1::DataplexServiceConnection::UpdateZone"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateZone(request)); } @@ -113,7 +113,7 @@ DataplexServiceTracingConnection::DeleteZone( google::cloud::dataplex::v1::DeleteZoneRequest const& request) { auto span = internal::MakeSpan("dataplex_v1::DataplexServiceConnection::DeleteZone"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteZone(request)); } @@ -122,7 +122,7 @@ DataplexServiceTracingConnection::ListZones( google::cloud::dataplex::v1::ListZonesRequest request) { auto span = internal::MakeSpan("dataplex_v1::DataplexServiceConnection::ListZones"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListZones(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -142,7 +142,7 @@ DataplexServiceTracingConnection::ListZoneActions( google::cloud::dataplex::v1::ListZoneActionsRequest request) { auto span = internal::MakeSpan( "dataplex_v1::DataplexServiceConnection::ListZoneActions"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListZoneActions(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -153,7 +153,7 @@ DataplexServiceTracingConnection::CreateAsset( google::cloud::dataplex::v1::CreateAssetRequest const& request) { auto span = internal::MakeSpan("dataplex_v1::DataplexServiceConnection::CreateAsset"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateAsset(request)); } @@ -162,7 +162,7 @@ DataplexServiceTracingConnection::UpdateAsset( google::cloud::dataplex::v1::UpdateAssetRequest const& request) { auto span = internal::MakeSpan("dataplex_v1::DataplexServiceConnection::UpdateAsset"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateAsset(request)); } @@ -171,7 +171,7 @@ DataplexServiceTracingConnection::DeleteAsset( google::cloud::dataplex::v1::DeleteAssetRequest const& request) { auto span = internal::MakeSpan("dataplex_v1::DataplexServiceConnection::DeleteAsset"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteAsset(request)); } @@ -180,7 +180,7 @@ DataplexServiceTracingConnection::ListAssets( google::cloud::dataplex::v1::ListAssetsRequest request) { auto span = internal::MakeSpan("dataplex_v1::DataplexServiceConnection::ListAssets"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListAssets(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -200,7 +200,7 @@ DataplexServiceTracingConnection::ListAssetActions( google::cloud::dataplex::v1::ListAssetActionsRequest request) { auto span = internal::MakeSpan( "dataplex_v1::DataplexServiceConnection::ListAssetActions"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListAssetActions(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -211,7 +211,7 @@ DataplexServiceTracingConnection::CreateTask( google::cloud::dataplex::v1::CreateTaskRequest const& request) { auto span = internal::MakeSpan("dataplex_v1::DataplexServiceConnection::CreateTask"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateTask(request)); } @@ -220,7 +220,7 @@ DataplexServiceTracingConnection::UpdateTask( google::cloud::dataplex::v1::UpdateTaskRequest const& request) { auto span = internal::MakeSpan("dataplex_v1::DataplexServiceConnection::UpdateTask"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateTask(request)); } @@ -229,7 +229,7 @@ DataplexServiceTracingConnection::DeleteTask( google::cloud::dataplex::v1::DeleteTaskRequest const& request) { auto span = internal::MakeSpan("dataplex_v1::DataplexServiceConnection::DeleteTask"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteTask(request)); } @@ -238,7 +238,7 @@ DataplexServiceTracingConnection::ListTasks( google::cloud::dataplex::v1::ListTasksRequest request) { auto span = internal::MakeSpan("dataplex_v1::DataplexServiceConnection::ListTasks"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListTasks(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -258,7 +258,7 @@ DataplexServiceTracingConnection::ListJobs( google::cloud::dataplex::v1::ListJobsRequest request) { auto span = internal::MakeSpan("dataplex_v1::DataplexServiceConnection::ListJobs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListJobs(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -295,7 +295,7 @@ DataplexServiceTracingConnection::CreateEnvironment( google::cloud::dataplex::v1::CreateEnvironmentRequest const& request) { auto span = internal::MakeSpan( "dataplex_v1::DataplexServiceConnection::CreateEnvironment"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateEnvironment(request)); } @@ -304,7 +304,7 @@ DataplexServiceTracingConnection::UpdateEnvironment( google::cloud::dataplex::v1::UpdateEnvironmentRequest const& request) { auto span = internal::MakeSpan( "dataplex_v1::DataplexServiceConnection::UpdateEnvironment"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateEnvironment(request)); } @@ -313,7 +313,7 @@ DataplexServiceTracingConnection::DeleteEnvironment( google::cloud::dataplex::v1::DeleteEnvironmentRequest const& request) { auto span = internal::MakeSpan( "dataplex_v1::DataplexServiceConnection::DeleteEnvironment"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteEnvironment(request)); } @@ -322,7 +322,7 @@ DataplexServiceTracingConnection::ListEnvironments( google::cloud::dataplex::v1::ListEnvironmentsRequest request) { auto span = internal::MakeSpan( "dataplex_v1::DataplexServiceConnection::ListEnvironments"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListEnvironments(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::dataplex::v1::Environment>(std::move(span), std::move(sr)); @@ -342,7 +342,7 @@ DataplexServiceTracingConnection::ListSessions( google::cloud::dataplex::v1::ListSessionsRequest request) { auto span = internal::MakeSpan( "dataplex_v1::DataplexServiceConnection::ListSessions"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListSessions(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); diff --git a/google/cloud/dataplex/v1/internal/dataplex_tracing_stub.cc b/google/cloud/dataplex/v1/internal/dataplex_tracing_stub.cc index 1547f1b6c79e..704e1b55aa7e 100644 --- a/google/cloud/dataplex/v1/internal/dataplex_tracing_stub.cc +++ b/google/cloud/dataplex/v1/internal/dataplex_tracing_stub.cc @@ -37,10 +37,8 @@ DataplexServiceTracingStub::AsyncCreateLake( google::cloud::dataplex::v1::CreateLakeRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.dataplex.v1.DataplexService", "CreateLake"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateLake(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -52,10 +50,8 @@ DataplexServiceTracingStub::AsyncUpdateLake( google::cloud::dataplex::v1::UpdateLakeRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.dataplex.v1.DataplexService", "UpdateLake"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateLake(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -67,10 +63,8 @@ DataplexServiceTracingStub::AsyncDeleteLake( google::cloud::dataplex::v1::DeleteLakeRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.dataplex.v1.DataplexService", "DeleteLake"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteLake(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -115,10 +109,8 @@ DataplexServiceTracingStub::AsyncCreateZone( google::cloud::dataplex::v1::CreateZoneRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.dataplex.v1.DataplexService", "CreateZone"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateZone(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -130,10 +122,8 @@ DataplexServiceTracingStub::AsyncUpdateZone( google::cloud::dataplex::v1::UpdateZoneRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.dataplex.v1.DataplexService", "UpdateZone"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateZone(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -145,10 +135,8 @@ DataplexServiceTracingStub::AsyncDeleteZone( google::cloud::dataplex::v1::DeleteZoneRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.dataplex.v1.DataplexService", "DeleteZone"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteZone(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -193,10 +181,8 @@ DataplexServiceTracingStub::AsyncCreateAsset( google::cloud::dataplex::v1::CreateAssetRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.dataplex.v1.DataplexService", "CreateAsset"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateAsset(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -208,10 +194,8 @@ DataplexServiceTracingStub::AsyncUpdateAsset( google::cloud::dataplex::v1::UpdateAssetRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.dataplex.v1.DataplexService", "UpdateAsset"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateAsset(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -223,10 +207,8 @@ DataplexServiceTracingStub::AsyncDeleteAsset( google::cloud::dataplex::v1::DeleteAssetRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.dataplex.v1.DataplexService", "DeleteAsset"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteAsset(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -273,10 +255,8 @@ DataplexServiceTracingStub::AsyncCreateTask( google::cloud::dataplex::v1::CreateTaskRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.dataplex.v1.DataplexService", "CreateTask"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateTask(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -288,10 +268,8 @@ DataplexServiceTracingStub::AsyncUpdateTask( google::cloud::dataplex::v1::UpdateTaskRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.dataplex.v1.DataplexService", "UpdateTask"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateTask(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -303,10 +281,8 @@ DataplexServiceTracingStub::AsyncDeleteTask( google::cloud::dataplex::v1::DeleteTaskRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.dataplex.v1.DataplexService", "DeleteTask"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteTask(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -381,10 +357,8 @@ DataplexServiceTracingStub::AsyncCreateEnvironment( google::cloud::dataplex::v1::CreateEnvironmentRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.dataplex.v1.DataplexService", "CreateEnvironment"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateEnvironment(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -396,10 +370,8 @@ DataplexServiceTracingStub::AsyncUpdateEnvironment( google::cloud::dataplex::v1::UpdateEnvironmentRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.dataplex.v1.DataplexService", "UpdateEnvironment"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateEnvironment(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -411,10 +383,8 @@ DataplexServiceTracingStub::AsyncDeleteEnvironment( google::cloud::dataplex::v1::DeleteEnvironmentRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.dataplex.v1.DataplexService", "DeleteEnvironment"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteEnvironment(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -462,10 +432,8 @@ DataplexServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -476,10 +444,8 @@ future DataplexServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/dataplex/v1/internal/metadata_tracing_connection.cc b/google/cloud/dataplex/v1/internal/metadata_tracing_connection.cc index 01441b07a5a8..906640cb6dec 100644 --- a/google/cloud/dataplex/v1/internal/metadata_tracing_connection.cc +++ b/google/cloud/dataplex/v1/internal/metadata_tracing_connection.cc @@ -72,7 +72,7 @@ MetadataServiceTracingConnection::ListEntities( google::cloud::dataplex::v1::ListEntitiesRequest request) { auto span = internal::MakeSpan( "dataplex_v1::MetadataServiceConnection::ListEntities"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListEntities(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -109,7 +109,7 @@ MetadataServiceTracingConnection::ListPartitions( google::cloud::dataplex::v1::ListPartitionsRequest request) { auto span = internal::MakeSpan( "dataplex_v1::MetadataServiceConnection::ListPartitions"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListPartitions(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::dataplex::v1::Partition>(std::move(span), std::move(sr)); diff --git a/google/cloud/dataproc/v1/internal/autoscaling_policy_tracing_connection.cc b/google/cloud/dataproc/v1/internal/autoscaling_policy_tracing_connection.cc index be0340242840..9c544989c5e9 100644 --- a/google/cloud/dataproc/v1/internal/autoscaling_policy_tracing_connection.cc +++ b/google/cloud/dataproc/v1/internal/autoscaling_policy_tracing_connection.cc @@ -70,7 +70,7 @@ AutoscalingPolicyServiceTracingConnection::ListAutoscalingPolicies( auto span = internal::MakeSpan( "dataproc_v1::AutoscalingPolicyServiceConnection::" "ListAutoscalingPolicies"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListAutoscalingPolicies(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::dataproc::v1::AutoscalingPolicy>(std::move(span), diff --git a/google/cloud/dataproc/v1/internal/batch_controller_tracing_connection.cc b/google/cloud/dataproc/v1/internal/batch_controller_tracing_connection.cc index 2e1c3bdb59b2..980411b831d7 100644 --- a/google/cloud/dataproc/v1/internal/batch_controller_tracing_connection.cc +++ b/google/cloud/dataproc/v1/internal/batch_controller_tracing_connection.cc @@ -37,7 +37,7 @@ BatchControllerTracingConnection::CreateBatch( google::cloud::dataproc::v1::CreateBatchRequest const& request) { auto span = internal::MakeSpan("dataproc_v1::BatchControllerConnection::CreateBatch"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateBatch(request)); } @@ -55,7 +55,7 @@ BatchControllerTracingConnection::ListBatches( google::cloud::dataproc::v1::ListBatchesRequest request) { auto span = internal::MakeSpan("dataproc_v1::BatchControllerConnection::ListBatches"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListBatches(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); diff --git a/google/cloud/dataproc/v1/internal/batch_controller_tracing_stub.cc b/google/cloud/dataproc/v1/internal/batch_controller_tracing_stub.cc index 34fc3e1dc9d4..7cca80de7f55 100644 --- a/google/cloud/dataproc/v1/internal/batch_controller_tracing_stub.cc +++ b/google/cloud/dataproc/v1/internal/batch_controller_tracing_stub.cc @@ -37,10 +37,8 @@ BatchControllerTracingStub::AsyncCreateBatch( google::cloud::dataproc::v1::CreateBatchRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.dataproc.v1.BatchController", "CreateBatch"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateBatch(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -86,10 +84,8 @@ BatchControllerTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -100,10 +96,8 @@ future BatchControllerTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/dataproc/v1/internal/cluster_controller_tracing_connection.cc b/google/cloud/dataproc/v1/internal/cluster_controller_tracing_connection.cc index 732fde68bd21..d0059ca6c2bc 100644 --- a/google/cloud/dataproc/v1/internal/cluster_controller_tracing_connection.cc +++ b/google/cloud/dataproc/v1/internal/cluster_controller_tracing_connection.cc @@ -37,7 +37,7 @@ ClusterControllerTracingConnection::CreateCluster( google::cloud::dataproc::v1::CreateClusterRequest const& request) { auto span = internal::MakeSpan( "dataproc_v1::ClusterControllerConnection::CreateCluster"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateCluster(request)); } @@ -46,7 +46,7 @@ ClusterControllerTracingConnection::UpdateCluster( google::cloud::dataproc::v1::UpdateClusterRequest const& request) { auto span = internal::MakeSpan( "dataproc_v1::ClusterControllerConnection::UpdateCluster"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateCluster(request)); } @@ -55,7 +55,7 @@ ClusterControllerTracingConnection::StopCluster( google::cloud::dataproc::v1::StopClusterRequest const& request) { auto span = internal::MakeSpan( "dataproc_v1::ClusterControllerConnection::StopCluster"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->StopCluster(request)); } @@ -64,7 +64,7 @@ ClusterControllerTracingConnection::StartCluster( google::cloud::dataproc::v1::StartClusterRequest const& request) { auto span = internal::MakeSpan( "dataproc_v1::ClusterControllerConnection::StartCluster"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->StartCluster(request)); } @@ -73,7 +73,7 @@ ClusterControllerTracingConnection::DeleteCluster( google::cloud::dataproc::v1::DeleteClusterRequest const& request) { auto span = internal::MakeSpan( "dataproc_v1::ClusterControllerConnection::DeleteCluster"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteCluster(request)); } @@ -91,7 +91,7 @@ ClusterControllerTracingConnection::ListClusters( google::cloud::dataproc::v1::ListClustersRequest request) { auto span = internal::MakeSpan( "dataproc_v1::ClusterControllerConnection::ListClusters"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListClusters(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -102,7 +102,7 @@ ClusterControllerTracingConnection::DiagnoseCluster( google::cloud::dataproc::v1::DiagnoseClusterRequest const& request) { auto span = internal::MakeSpan( "dataproc_v1::ClusterControllerConnection::DiagnoseCluster"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DiagnoseCluster(request)); } diff --git a/google/cloud/dataproc/v1/internal/cluster_controller_tracing_stub.cc b/google/cloud/dataproc/v1/internal/cluster_controller_tracing_stub.cc index cda54ce29383..a4edc809d12a 100644 --- a/google/cloud/dataproc/v1/internal/cluster_controller_tracing_stub.cc +++ b/google/cloud/dataproc/v1/internal/cluster_controller_tracing_stub.cc @@ -37,10 +37,8 @@ ClusterControllerTracingStub::AsyncCreateCluster( google::cloud::dataproc::v1::CreateClusterRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.dataproc.v1.ClusterController", "CreateCluster"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateCluster(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -52,10 +50,8 @@ ClusterControllerTracingStub::AsyncUpdateCluster( google::cloud::dataproc::v1::UpdateClusterRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.dataproc.v1.ClusterController", "UpdateCluster"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateCluster(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -67,10 +63,8 @@ ClusterControllerTracingStub::AsyncStopCluster( google::cloud::dataproc::v1::StopClusterRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.dataproc.v1.ClusterController", "StopCluster"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncStopCluster(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -82,10 +76,8 @@ ClusterControllerTracingStub::AsyncStartCluster( google::cloud::dataproc::v1::StartClusterRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.dataproc.v1.ClusterController", "StartCluster"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncStartCluster(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -97,10 +89,8 @@ ClusterControllerTracingStub::AsyncDeleteCluster( google::cloud::dataproc::v1::DeleteClusterRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.dataproc.v1.ClusterController", "DeleteCluster"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteCluster(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -136,10 +126,8 @@ ClusterControllerTracingStub::AsyncDiagnoseCluster( google::cloud::dataproc::v1::DiagnoseClusterRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.dataproc.v1.ClusterController", "DiagnoseCluster"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDiagnoseCluster(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -151,10 +139,8 @@ ClusterControllerTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -165,10 +151,8 @@ future ClusterControllerTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/dataproc/v1/internal/job_controller_tracing_connection.cc b/google/cloud/dataproc/v1/internal/job_controller_tracing_connection.cc index bb81b41898b6..e7a4f7394302 100644 --- a/google/cloud/dataproc/v1/internal/job_controller_tracing_connection.cc +++ b/google/cloud/dataproc/v1/internal/job_controller_tracing_connection.cc @@ -46,7 +46,7 @@ JobControllerTracingConnection::SubmitJobAsOperation( google::cloud::dataproc::v1::SubmitJobRequest const& request) { auto span = internal::MakeSpan( "dataproc_v1::JobControllerConnection::SubmitJobAsOperation"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SubmitJobAsOperation(request)); } @@ -65,7 +65,7 @@ JobControllerTracingConnection::ListJobs( google::cloud::dataproc::v1::ListJobsRequest request) { auto span = internal::MakeSpan("dataproc_v1::JobControllerConnection::ListJobs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListJobs(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); diff --git a/google/cloud/dataproc/v1/internal/job_controller_tracing_stub.cc b/google/cloud/dataproc/v1/internal/job_controller_tracing_stub.cc index e57b22065e49..4a5e154ab03e 100644 --- a/google/cloud/dataproc/v1/internal/job_controller_tracing_stub.cc +++ b/google/cloud/dataproc/v1/internal/job_controller_tracing_stub.cc @@ -47,10 +47,8 @@ JobControllerTracingStub::AsyncSubmitJobAsOperation( google::cloud::dataproc::v1::SubmitJobRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.dataproc.v1.JobController", "SubmitJobAsOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncSubmitJobAsOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -113,10 +111,8 @@ JobControllerTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -127,10 +123,8 @@ future JobControllerTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/dataproc/v1/internal/node_group_controller_tracing_connection.cc b/google/cloud/dataproc/v1/internal/node_group_controller_tracing_connection.cc index e2b7bd3bcc79..ee4e6dda9781 100644 --- a/google/cloud/dataproc/v1/internal/node_group_controller_tracing_connection.cc +++ b/google/cloud/dataproc/v1/internal/node_group_controller_tracing_connection.cc @@ -36,7 +36,7 @@ NodeGroupControllerTracingConnection::CreateNodeGroup( google::cloud::dataproc::v1::CreateNodeGroupRequest const& request) { auto span = internal::MakeSpan( "dataproc_v1::NodeGroupControllerConnection::CreateNodeGroup"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateNodeGroup(request)); } @@ -45,7 +45,7 @@ NodeGroupControllerTracingConnection::ResizeNodeGroup( google::cloud::dataproc::v1::ResizeNodeGroupRequest const& request) { auto span = internal::MakeSpan( "dataproc_v1::NodeGroupControllerConnection::ResizeNodeGroup"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ResizeNodeGroup(request)); } diff --git a/google/cloud/dataproc/v1/internal/node_group_controller_tracing_stub.cc b/google/cloud/dataproc/v1/internal/node_group_controller_tracing_stub.cc index 3cc3f7cb8847..e0ccd810c914 100644 --- a/google/cloud/dataproc/v1/internal/node_group_controller_tracing_stub.cc +++ b/google/cloud/dataproc/v1/internal/node_group_controller_tracing_stub.cc @@ -37,10 +37,8 @@ NodeGroupControllerTracingStub::AsyncCreateNodeGroup( google::cloud::dataproc::v1::CreateNodeGroupRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.dataproc.v1.NodeGroupController", "CreateNodeGroup"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateNodeGroup(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -52,10 +50,8 @@ NodeGroupControllerTracingStub::AsyncResizeNodeGroup( google::cloud::dataproc::v1::ResizeNodeGroupRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.dataproc.v1.NodeGroupController", "ResizeNodeGroup"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncResizeNodeGroup(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -79,10 +75,8 @@ NodeGroupControllerTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -93,10 +87,8 @@ future NodeGroupControllerTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/dataproc/v1/internal/workflow_template_tracing_connection.cc b/google/cloud/dataproc/v1/internal/workflow_template_tracing_connection.cc index 3da864354284..65c9694f5001 100644 --- a/google/cloud/dataproc/v1/internal/workflow_template_tracing_connection.cc +++ b/google/cloud/dataproc/v1/internal/workflow_template_tracing_connection.cc @@ -58,7 +58,7 @@ WorkflowTemplateServiceTracingConnection::InstantiateWorkflowTemplate( auto span = internal::MakeSpan( "dataproc_v1::WorkflowTemplateServiceConnection::" "InstantiateWorkflowTemplate"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InstantiateWorkflowTemplate(request)); } @@ -70,7 +70,7 @@ WorkflowTemplateServiceTracingConnection::InstantiateInlineWorkflowTemplate( auto span = internal::MakeSpan( "dataproc_v1::WorkflowTemplateServiceConnection::" "InstantiateInlineWorkflowTemplate"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->InstantiateInlineWorkflowTemplate(request)); } @@ -89,7 +89,7 @@ WorkflowTemplateServiceTracingConnection::ListWorkflowTemplates( google::cloud::dataproc::v1::ListWorkflowTemplatesRequest request) { auto span = internal::MakeSpan( "dataproc_v1::WorkflowTemplateServiceConnection::ListWorkflowTemplates"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListWorkflowTemplates(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::dataproc::v1::WorkflowTemplate>(std::move(span), diff --git a/google/cloud/dataproc/v1/internal/workflow_template_tracing_stub.cc b/google/cloud/dataproc/v1/internal/workflow_template_tracing_stub.cc index a9a26dbf1f78..288d51b5f136 100644 --- a/google/cloud/dataproc/v1/internal/workflow_template_tracing_stub.cc +++ b/google/cloud/dataproc/v1/internal/workflow_template_tracing_stub.cc @@ -65,10 +65,8 @@ WorkflowTemplateServiceTracingStub::AsyncInstantiateWorkflowTemplate( auto span = internal::MakeSpanGrpc("google.cloud.dataproc.v1.WorkflowTemplateService", "InstantiateWorkflowTemplate"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncInstantiateWorkflowTemplate(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -82,10 +80,8 @@ WorkflowTemplateServiceTracingStub::AsyncInstantiateInlineWorkflowTemplate( auto span = internal::MakeSpanGrpc("google.cloud.dataproc.v1.WorkflowTemplateService", "InstantiateInlineWorkflowTemplate"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncInstantiateInlineWorkflowTemplate(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -135,10 +131,8 @@ WorkflowTemplateServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -149,10 +143,8 @@ future WorkflowTemplateServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/datastore/admin/v1/internal/datastore_admin_tracing_connection.cc b/google/cloud/datastore/admin/v1/internal/datastore_admin_tracing_connection.cc index c94f206d3fb8..50b2e20e26fa 100644 --- a/google/cloud/datastore/admin/v1/internal/datastore_admin_tracing_connection.cc +++ b/google/cloud/datastore/admin/v1/internal/datastore_admin_tracing_connection.cc @@ -37,7 +37,7 @@ DatastoreAdminTracingConnection::ExportEntities( google::datastore::admin::v1::ExportEntitiesRequest const& request) { auto span = internal::MakeSpan( "datastore_admin_v1::DatastoreAdminConnection::ExportEntities"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ExportEntities(request)); } @@ -46,7 +46,7 @@ DatastoreAdminTracingConnection::ImportEntities( google::datastore::admin::v1::ImportEntitiesRequest const& request) { auto span = internal::MakeSpan( "datastore_admin_v1::DatastoreAdminConnection::ImportEntities"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ImportEntities(request)); } @@ -55,7 +55,7 @@ DatastoreAdminTracingConnection::CreateIndex( google::datastore::admin::v1::CreateIndexRequest const& request) { auto span = internal::MakeSpan( "datastore_admin_v1::DatastoreAdminConnection::CreateIndex"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateIndex(request)); } @@ -64,7 +64,7 @@ DatastoreAdminTracingConnection::DeleteIndex( google::datastore::admin::v1::DeleteIndexRequest const& request) { auto span = internal::MakeSpan( "datastore_admin_v1::DatastoreAdminConnection::DeleteIndex"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteIndex(request)); } @@ -82,7 +82,7 @@ DatastoreAdminTracingConnection::ListIndexes( google::datastore::admin::v1::ListIndexesRequest request) { auto span = internal::MakeSpan( "datastore_admin_v1::DatastoreAdminConnection::ListIndexes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListIndexes(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); diff --git a/google/cloud/datastore/admin/v1/internal/datastore_admin_tracing_stub.cc b/google/cloud/datastore/admin/v1/internal/datastore_admin_tracing_stub.cc index 2fc8167bbe13..69eac6d36542 100644 --- a/google/cloud/datastore/admin/v1/internal/datastore_admin_tracing_stub.cc +++ b/google/cloud/datastore/admin/v1/internal/datastore_admin_tracing_stub.cc @@ -37,10 +37,8 @@ DatastoreAdminTracingStub::AsyncExportEntities( google::datastore::admin::v1::ExportEntitiesRequest const& request) { auto span = internal::MakeSpanGrpc("google.datastore.admin.v1.DatastoreAdmin", "ExportEntities"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncExportEntities(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -52,10 +50,8 @@ DatastoreAdminTracingStub::AsyncImportEntities( google::datastore::admin::v1::ImportEntitiesRequest const& request) { auto span = internal::MakeSpanGrpc("google.datastore.admin.v1.DatastoreAdmin", "ImportEntities"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncImportEntities(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -67,10 +63,8 @@ DatastoreAdminTracingStub::AsyncCreateIndex( google::datastore::admin::v1::CreateIndexRequest const& request) { auto span = internal::MakeSpanGrpc("google.datastore.admin.v1.DatastoreAdmin", "CreateIndex"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateIndex(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -82,10 +76,8 @@ DatastoreAdminTracingStub::AsyncDeleteIndex( google::datastore::admin::v1::DeleteIndexRequest const& request) { auto span = internal::MakeSpanGrpc("google.datastore.admin.v1.DatastoreAdmin", "DeleteIndex"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteIndex(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -120,10 +112,8 @@ DatastoreAdminTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -134,10 +124,8 @@ future DatastoreAdminTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/datastream/v1/internal/datastream_tracing_connection.cc b/google/cloud/datastream/v1/internal/datastream_tracing_connection.cc index 28b13d7fcb7b..14da26152907 100644 --- a/google/cloud/datastream/v1/internal/datastream_tracing_connection.cc +++ b/google/cloud/datastream/v1/internal/datastream_tracing_connection.cc @@ -37,7 +37,7 @@ DatastreamTracingConnection::ListConnectionProfiles( google::cloud::datastream::v1::ListConnectionProfilesRequest request) { auto span = internal::MakeSpan( "datastream_v1::DatastreamConnection::ListConnectionProfiles"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListConnectionProfiles(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::datastream::v1::ConnectionProfile>(std::move(span), @@ -59,7 +59,7 @@ DatastreamTracingConnection::CreateConnectionProfile( request) { auto span = internal::MakeSpan( "datastream_v1::DatastreamConnection::CreateConnectionProfile"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateConnectionProfile(request)); } @@ -70,7 +70,7 @@ DatastreamTracingConnection::UpdateConnectionProfile( request) { auto span = internal::MakeSpan( "datastream_v1::DatastreamConnection::UpdateConnectionProfile"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateConnectionProfile(request)); } @@ -81,7 +81,7 @@ DatastreamTracingConnection::DeleteConnectionProfile( request) { auto span = internal::MakeSpan( "datastream_v1::DatastreamConnection::DeleteConnectionProfile"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteConnectionProfile(request)); } @@ -101,7 +101,7 @@ DatastreamTracingConnection::ListStreams( google::cloud::datastream::v1::ListStreamsRequest request) { auto span = internal::MakeSpan("datastream_v1::DatastreamConnection::ListStreams"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListStreams(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -121,7 +121,7 @@ DatastreamTracingConnection::CreateStream( google::cloud::datastream::v1::CreateStreamRequest const& request) { auto span = internal::MakeSpan("datastream_v1::DatastreamConnection::CreateStream"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateStream(request)); } @@ -130,7 +130,7 @@ DatastreamTracingConnection::UpdateStream( google::cloud::datastream::v1::UpdateStreamRequest const& request) { auto span = internal::MakeSpan("datastream_v1::DatastreamConnection::UpdateStream"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateStream(request)); } @@ -139,7 +139,7 @@ DatastreamTracingConnection::DeleteStream( google::cloud::datastream::v1::DeleteStreamRequest const& request) { auto span = internal::MakeSpan("datastream_v1::DatastreamConnection::DeleteStream"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteStream(request)); } @@ -166,7 +166,7 @@ DatastreamTracingConnection::ListStreamObjects( google::cloud::datastream::v1::ListStreamObjectsRequest request) { auto span = internal::MakeSpan( "datastream_v1::DatastreamConnection::ListStreamObjects"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListStreamObjects(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::datastream::v1::StreamObject>(std::move(span), @@ -195,7 +195,7 @@ StreamRange DatastreamTracingConnection::FetchStaticIps( google::cloud::datastream::v1::FetchStaticIpsRequest request) { auto span = internal::MakeSpan("datastream_v1::DatastreamConnection::FetchStaticIps"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->FetchStaticIps(std::move(request)); return internal::MakeTracedStreamRange(std::move(span), std::move(sr)); @@ -207,7 +207,7 @@ DatastreamTracingConnection::CreatePrivateConnection( request) { auto span = internal::MakeSpan( "datastream_v1::DatastreamConnection::CreatePrivateConnection"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreatePrivateConnection(request)); } @@ -226,7 +226,7 @@ DatastreamTracingConnection::ListPrivateConnections( google::cloud::datastream::v1::ListPrivateConnectionsRequest request) { auto span = internal::MakeSpan( "datastream_v1::DatastreamConnection::ListPrivateConnections"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListPrivateConnections(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::datastream::v1::PrivateConnection>(std::move(span), @@ -239,7 +239,7 @@ DatastreamTracingConnection::DeletePrivateConnection( request) { auto span = internal::MakeSpan( "datastream_v1::DatastreamConnection::DeletePrivateConnection"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeletePrivateConnection(request)); } @@ -249,7 +249,7 @@ DatastreamTracingConnection::CreateRoute( google::cloud::datastream::v1::CreateRouteRequest const& request) { auto span = internal::MakeSpan("datastream_v1::DatastreamConnection::CreateRoute"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateRoute(request)); } @@ -267,7 +267,7 @@ DatastreamTracingConnection::ListRoutes( google::cloud::datastream::v1::ListRoutesRequest request) { auto span = internal::MakeSpan("datastream_v1::DatastreamConnection::ListRoutes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListRoutes(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -278,7 +278,7 @@ DatastreamTracingConnection::DeleteRoute( google::cloud::datastream::v1::DeleteRouteRequest const& request) { auto span = internal::MakeSpan("datastream_v1::DatastreamConnection::DeleteRoute"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteRoute(request)); } diff --git a/google/cloud/datastream/v1/internal/datastream_tracing_stub.cc b/google/cloud/datastream/v1/internal/datastream_tracing_stub.cc index 0f9394194e51..473b978a0e8b 100644 --- a/google/cloud/datastream/v1/internal/datastream_tracing_stub.cc +++ b/google/cloud/datastream/v1/internal/datastream_tracing_stub.cc @@ -63,10 +63,8 @@ DatastreamTracingStub::AsyncCreateConnectionProfile( request) { auto span = internal::MakeSpanGrpc("google.cloud.datastream.v1.Datastream", "CreateConnectionProfile"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateConnectionProfile(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -79,10 +77,8 @@ DatastreamTracingStub::AsyncUpdateConnectionProfile( request) { auto span = internal::MakeSpanGrpc("google.cloud.datastream.v1.Datastream", "UpdateConnectionProfile"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateConnectionProfile(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -95,10 +91,8 @@ DatastreamTracingStub::AsyncDeleteConnectionProfile( request) { auto span = internal::MakeSpanGrpc("google.cloud.datastream.v1.Datastream", "DeleteConnectionProfile"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteConnectionProfile(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -146,10 +140,8 @@ DatastreamTracingStub::AsyncCreateStream( google::cloud::datastream::v1::CreateStreamRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.datastream.v1.Datastream", "CreateStream"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateStream(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -161,10 +153,8 @@ DatastreamTracingStub::AsyncUpdateStream( google::cloud::datastream::v1::UpdateStreamRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.datastream.v1.Datastream", "UpdateStream"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateStream(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -176,10 +166,8 @@ DatastreamTracingStub::AsyncDeleteStream( google::cloud::datastream::v1::DeleteStreamRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.datastream.v1.Datastream", "DeleteStream"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteStream(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -264,10 +252,8 @@ DatastreamTracingStub::AsyncCreatePrivateConnection( request) { auto span = internal::MakeSpanGrpc("google.cloud.datastream.v1.Datastream", "CreatePrivateConnection"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreatePrivateConnection(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -305,10 +291,8 @@ DatastreamTracingStub::AsyncDeletePrivateConnection( request) { auto span = internal::MakeSpanGrpc("google.cloud.datastream.v1.Datastream", "DeletePrivateConnection"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeletePrivateConnection(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -320,10 +304,8 @@ DatastreamTracingStub::AsyncCreateRoute( google::cloud::datastream::v1::CreateRouteRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.datastream.v1.Datastream", "CreateRoute"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateRoute(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -357,10 +339,8 @@ DatastreamTracingStub::AsyncDeleteRoute( google::cloud::datastream::v1::DeleteRouteRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.datastream.v1.Datastream", "DeleteRoute"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteRoute(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -372,10 +352,8 @@ DatastreamTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -386,10 +364,8 @@ future DatastreamTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/deploy/v1/internal/cloud_deploy_tracing_connection.cc b/google/cloud/deploy/v1/internal/cloud_deploy_tracing_connection.cc index a3ab3d9f296e..705d498a5ae1 100644 --- a/google/cloud/deploy/v1/internal/cloud_deploy_tracing_connection.cc +++ b/google/cloud/deploy/v1/internal/cloud_deploy_tracing_connection.cc @@ -37,7 +37,7 @@ CloudDeployTracingConnection::ListDeliveryPipelines( google::cloud::deploy::v1::ListDeliveryPipelinesRequest request) { auto span = internal::MakeSpan( "deploy_v1::CloudDeployConnection::ListDeliveryPipelines"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListDeliveryPipelines(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::deploy::v1::DeliveryPipeline>(std::move(span), @@ -58,7 +58,7 @@ CloudDeployTracingConnection::CreateDeliveryPipeline( google::cloud::deploy::v1::CreateDeliveryPipelineRequest const& request) { auto span = internal::MakeSpan( "deploy_v1::CloudDeployConnection::CreateDeliveryPipeline"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateDeliveryPipeline(request)); } @@ -68,7 +68,7 @@ CloudDeployTracingConnection::UpdateDeliveryPipeline( google::cloud::deploy::v1::UpdateDeliveryPipelineRequest const& request) { auto span = internal::MakeSpan( "deploy_v1::CloudDeployConnection::UpdateDeliveryPipeline"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateDeliveryPipeline(request)); } @@ -78,7 +78,7 @@ CloudDeployTracingConnection::DeleteDeliveryPipeline( google::cloud::deploy::v1::DeleteDeliveryPipelineRequest const& request) { auto span = internal::MakeSpan( "deploy_v1::CloudDeployConnection::DeleteDeliveryPipeline"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteDeliveryPipeline(request)); } @@ -88,7 +88,7 @@ CloudDeployTracingConnection::ListTargets( google::cloud::deploy::v1::ListTargetsRequest request) { auto span = internal::MakeSpan("deploy_v1::CloudDeployConnection::ListTargets"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListTargets(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -107,7 +107,7 @@ CloudDeployTracingConnection::CreateTarget( google::cloud::deploy::v1::CreateTargetRequest const& request) { auto span = internal::MakeSpan("deploy_v1::CloudDeployConnection::CreateTarget"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateTarget(request)); } @@ -116,7 +116,7 @@ CloudDeployTracingConnection::UpdateTarget( google::cloud::deploy::v1::UpdateTargetRequest const& request) { auto span = internal::MakeSpan("deploy_v1::CloudDeployConnection::UpdateTarget"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateTarget(request)); } @@ -125,7 +125,7 @@ CloudDeployTracingConnection::DeleteTarget( google::cloud::deploy::v1::DeleteTargetRequest const& request) { auto span = internal::MakeSpan("deploy_v1::CloudDeployConnection::DeleteTarget"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteTarget(request)); } @@ -134,7 +134,7 @@ CloudDeployTracingConnection::ListReleases( google::cloud::deploy::v1::ListReleasesRequest request) { auto span = internal::MakeSpan("deploy_v1::CloudDeployConnection::ListReleases"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListReleases(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -154,7 +154,7 @@ CloudDeployTracingConnection::CreateRelease( google::cloud::deploy::v1::CreateReleaseRequest const& request) { auto span = internal::MakeSpan("deploy_v1::CloudDeployConnection::CreateRelease"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateRelease(request)); } @@ -199,7 +199,7 @@ CloudDeployTracingConnection::ListRollouts( google::cloud::deploy::v1::ListRolloutsRequest request) { auto span = internal::MakeSpan("deploy_v1::CloudDeployConnection::ListRollouts"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListRollouts(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -219,7 +219,7 @@ CloudDeployTracingConnection::CreateRollout( google::cloud::deploy::v1::CreateRolloutRequest const& request) { auto span = internal::MakeSpan("deploy_v1::CloudDeployConnection::CreateRollout"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateRollout(request)); } @@ -244,7 +244,7 @@ CloudDeployTracingConnection::ListJobRuns( google::cloud::deploy::v1::ListJobRunsRequest request) { auto span = internal::MakeSpan("deploy_v1::CloudDeployConnection::ListJobRuns"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListJobRuns(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); diff --git a/google/cloud/deploy/v1/internal/cloud_deploy_tracing_stub.cc b/google/cloud/deploy/v1/internal/cloud_deploy_tracing_stub.cc index 6b856092bae2..c973f6a34173 100644 --- a/google/cloud/deploy/v1/internal/cloud_deploy_tracing_stub.cc +++ b/google/cloud/deploy/v1/internal/cloud_deploy_tracing_stub.cc @@ -61,10 +61,8 @@ CloudDeployTracingStub::AsyncCreateDeliveryPipeline( google::cloud::deploy::v1::CreateDeliveryPipelineRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.deploy.v1.CloudDeploy", "CreateDeliveryPipeline"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateDeliveryPipeline(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -76,10 +74,8 @@ CloudDeployTracingStub::AsyncUpdateDeliveryPipeline( google::cloud::deploy::v1::UpdateDeliveryPipelineRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.deploy.v1.CloudDeploy", "UpdateDeliveryPipeline"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateDeliveryPipeline(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -91,10 +87,8 @@ CloudDeployTracingStub::AsyncDeleteDeliveryPipeline( google::cloud::deploy::v1::DeleteDeliveryPipelineRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.deploy.v1.CloudDeploy", "DeleteDeliveryPipeline"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteDeliveryPipeline(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -128,10 +122,8 @@ CloudDeployTracingStub::AsyncCreateTarget( google::cloud::deploy::v1::CreateTargetRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.deploy.v1.CloudDeploy", "CreateTarget"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateTarget(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -143,10 +135,8 @@ CloudDeployTracingStub::AsyncUpdateTarget( google::cloud::deploy::v1::UpdateTargetRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.deploy.v1.CloudDeploy", "UpdateTarget"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateTarget(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -158,10 +148,8 @@ CloudDeployTracingStub::AsyncDeleteTarget( google::cloud::deploy::v1::DeleteTargetRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.deploy.v1.CloudDeploy", "DeleteTarget"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteTarget(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -196,10 +184,8 @@ CloudDeployTracingStub::AsyncCreateRelease( google::cloud::deploy::v1::CreateReleaseRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.deploy.v1.CloudDeploy", "CreateRelease"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateRelease(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -282,10 +268,8 @@ CloudDeployTracingStub::AsyncCreateRollout( google::cloud::deploy::v1::CreateRolloutRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.deploy.v1.CloudDeploy", "CreateRollout"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateRollout(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -363,10 +347,8 @@ CloudDeployTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -377,10 +359,8 @@ future CloudDeployTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/dialogflow_cx/internal/agents_tracing_connection.cc b/google/cloud/dialogflow_cx/internal/agents_tracing_connection.cc index 03cb4f9b2b52..107f13e4ecdb 100644 --- a/google/cloud/dialogflow_cx/internal/agents_tracing_connection.cc +++ b/google/cloud/dialogflow_cx/internal/agents_tracing_connection.cc @@ -36,7 +36,7 @@ StreamRange AgentsTracingConnection::ListAgents( google::cloud::dialogflow::cx::v3::ListAgentsRequest request) { auto span = internal::MakeSpan("dialogflow_cx::AgentsConnection::ListAgents"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListAgents(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::dialogflow::cx::v3::Agent>(std::move(span), std::move(sr)); @@ -81,7 +81,7 @@ AgentsTracingConnection::ExportAgent( google::cloud::dialogflow::cx::v3::ExportAgentRequest const& request) { auto span = internal::MakeSpan("dialogflow_cx::AgentsConnection::ExportAgent"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ExportAgent(request)); } @@ -90,7 +90,7 @@ AgentsTracingConnection::RestoreAgent( google::cloud::dialogflow::cx::v3::RestoreAgentRequest const& request) { auto span = internal::MakeSpan("dialogflow_cx::AgentsConnection::RestoreAgent"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RestoreAgent(request)); } diff --git a/google/cloud/dialogflow_cx/internal/agents_tracing_stub.cc b/google/cloud/dialogflow_cx/internal/agents_tracing_stub.cc index 1aa2ef2bbf41..6f4f5863fbf8 100644 --- a/google/cloud/dialogflow_cx/internal/agents_tracing_stub.cc +++ b/google/cloud/dialogflow_cx/internal/agents_tracing_stub.cc @@ -93,10 +93,8 @@ AgentsTracingStub::AsyncExportAgent( google::cloud::dialogflow::cx::v3::ExportAgentRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.dialogflow.cx.v3.Agents", "ExportAgent"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncExportAgent(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -108,10 +106,8 @@ AgentsTracingStub::AsyncRestoreAgent( google::cloud::dialogflow::cx::v3::RestoreAgentRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.dialogflow.cx.v3.Agents", "RestoreAgent"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncRestoreAgent(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -174,10 +170,8 @@ AgentsTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -188,10 +182,8 @@ future AgentsTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/dialogflow_cx/internal/changelogs_tracing_connection.cc b/google/cloud/dialogflow_cx/internal/changelogs_tracing_connection.cc index 1ceb7066e78a..129db21b9f25 100644 --- a/google/cloud/dialogflow_cx/internal/changelogs_tracing_connection.cc +++ b/google/cloud/dialogflow_cx/internal/changelogs_tracing_connection.cc @@ -37,7 +37,7 @@ ChangelogsTracingConnection::ListChangelogs( google::cloud::dialogflow::cx::v3::ListChangelogsRequest request) { auto span = internal::MakeSpan("dialogflow_cx::ChangelogsConnection::ListChangelogs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListChangelogs(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::dialogflow::cx::v3::Changelog>(std::move(span), diff --git a/google/cloud/dialogflow_cx/internal/deployments_tracing_connection.cc b/google/cloud/dialogflow_cx/internal/deployments_tracing_connection.cc index ae1e0873273e..712e7293672c 100644 --- a/google/cloud/dialogflow_cx/internal/deployments_tracing_connection.cc +++ b/google/cloud/dialogflow_cx/internal/deployments_tracing_connection.cc @@ -37,7 +37,7 @@ DeploymentsTracingConnection::ListDeployments( google::cloud::dialogflow::cx::v3::ListDeploymentsRequest request) { auto span = internal::MakeSpan( "dialogflow_cx::DeploymentsConnection::ListDeployments"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListDeployments(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::dialogflow::cx::v3::Deployment>(std::move(span), diff --git a/google/cloud/dialogflow_cx/internal/entity_types_tracing_connection.cc b/google/cloud/dialogflow_cx/internal/entity_types_tracing_connection.cc index 60ce3635d0aa..bdd003f320c7 100644 --- a/google/cloud/dialogflow_cx/internal/entity_types_tracing_connection.cc +++ b/google/cloud/dialogflow_cx/internal/entity_types_tracing_connection.cc @@ -37,7 +37,7 @@ EntityTypesTracingConnection::ListEntityTypes( google::cloud::dialogflow::cx::v3::ListEntityTypesRequest request) { auto span = internal::MakeSpan( "dialogflow_cx::EntityTypesConnection::ListEntityTypes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListEntityTypes(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::dialogflow::cx::v3::EntityType>(std::move(span), diff --git a/google/cloud/dialogflow_cx/internal/environments_tracing_connection.cc b/google/cloud/dialogflow_cx/internal/environments_tracing_connection.cc index c90405ddbfa6..33271fe1f591 100644 --- a/google/cloud/dialogflow_cx/internal/environments_tracing_connection.cc +++ b/google/cloud/dialogflow_cx/internal/environments_tracing_connection.cc @@ -37,7 +37,7 @@ EnvironmentsTracingConnection::ListEnvironments( google::cloud::dialogflow::cx::v3::ListEnvironmentsRequest request) { auto span = internal::MakeSpan( "dialogflow_cx::EnvironmentsConnection::ListEnvironments"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListEnvironments(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::dialogflow::cx::v3::Environment>(std::move(span), @@ -59,7 +59,7 @@ EnvironmentsTracingConnection::CreateEnvironment( request) { auto span = internal::MakeSpan( "dialogflow_cx::EnvironmentsConnection::CreateEnvironment"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateEnvironment(request)); } @@ -69,7 +69,7 @@ EnvironmentsTracingConnection::UpdateEnvironment( request) { auto span = internal::MakeSpan( "dialogflow_cx::EnvironmentsConnection::UpdateEnvironment"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateEnvironment(request)); } @@ -88,7 +88,7 @@ EnvironmentsTracingConnection::LookupEnvironmentHistory( request) { auto span = internal::MakeSpan( "dialogflow_cx::EnvironmentsConnection::LookupEnvironmentHistory"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->LookupEnvironmentHistory(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::dialogflow::cx::v3::Environment>(std::move(span), @@ -101,7 +101,7 @@ EnvironmentsTracingConnection::RunContinuousTest( request) { auto span = internal::MakeSpan( "dialogflow_cx::EnvironmentsConnection::RunContinuousTest"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RunContinuousTest(request)); } @@ -111,7 +111,7 @@ EnvironmentsTracingConnection::ListContinuousTestResults( request) { auto span = internal::MakeSpan( "dialogflow_cx::EnvironmentsConnection::ListContinuousTestResults"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListContinuousTestResults(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::dialogflow::cx::v3::ContinuousTestResult>(std::move(span), @@ -123,7 +123,7 @@ EnvironmentsTracingConnection::DeployFlow( google::cloud::dialogflow::cx::v3::DeployFlowRequest const& request) { auto span = internal::MakeSpan("dialogflow_cx::EnvironmentsConnection::DeployFlow"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeployFlow(request)); } diff --git a/google/cloud/dialogflow_cx/internal/environments_tracing_stub.cc b/google/cloud/dialogflow_cx/internal/environments_tracing_stub.cc index 596a15296c1c..5776c3806f8b 100644 --- a/google/cloud/dialogflow_cx/internal/environments_tracing_stub.cc +++ b/google/cloud/dialogflow_cx/internal/environments_tracing_stub.cc @@ -62,10 +62,8 @@ EnvironmentsTracingStub::AsyncCreateEnvironment( request) { auto span = internal::MakeSpanGrpc( "google.cloud.dialogflow.cx.v3.Environments", "CreateEnvironment"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateEnvironment(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -78,10 +76,8 @@ EnvironmentsTracingStub::AsyncUpdateEnvironment( request) { auto span = internal::MakeSpanGrpc( "google.cloud.dialogflow.cx.v3.Environments", "UpdateEnvironment"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateEnvironment(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -119,10 +115,8 @@ EnvironmentsTracingStub::AsyncRunContinuousTest( request) { auto span = internal::MakeSpanGrpc( "google.cloud.dialogflow.cx.v3.Environments", "RunContinuousTest"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncRunContinuousTest(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -148,10 +142,8 @@ EnvironmentsTracingStub::AsyncDeployFlow( google::cloud::dialogflow::cx::v3::DeployFlowRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.dialogflow.cx.v3.Environments", "DeployFlow"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeployFlow(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -163,10 +155,8 @@ EnvironmentsTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -177,10 +167,8 @@ future EnvironmentsTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/dialogflow_cx/internal/experiments_tracing_connection.cc b/google/cloud/dialogflow_cx/internal/experiments_tracing_connection.cc index 1af8ba0bf9ad..8b75807f7365 100644 --- a/google/cloud/dialogflow_cx/internal/experiments_tracing_connection.cc +++ b/google/cloud/dialogflow_cx/internal/experiments_tracing_connection.cc @@ -37,7 +37,7 @@ ExperimentsTracingConnection::ListExperiments( google::cloud::dialogflow::cx::v3::ListExperimentsRequest request) { auto span = internal::MakeSpan( "dialogflow_cx::ExperimentsConnection::ListExperiments"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListExperiments(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::dialogflow::cx::v3::Experiment>(std::move(span), diff --git a/google/cloud/dialogflow_cx/internal/flows_tracing_connection.cc b/google/cloud/dialogflow_cx/internal/flows_tracing_connection.cc index 2631b3539488..987ff6411c4c 100644 --- a/google/cloud/dialogflow_cx/internal/flows_tracing_connection.cc +++ b/google/cloud/dialogflow_cx/internal/flows_tracing_connection.cc @@ -51,7 +51,7 @@ StreamRange FlowsTracingConnection::ListFlows( google::cloud::dialogflow::cx::v3::ListFlowsRequest request) { auto span = internal::MakeSpan("dialogflow_cx::FlowsConnection::ListFlows"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListFlows(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::dialogflow::cx::v3::Flow>(std::move(span), std::move(sr)); @@ -76,7 +76,7 @@ FlowsTracingConnection::UpdateFlow( future> FlowsTracingConnection::TrainFlow( google::cloud::dialogflow::cx::v3::TrainFlowRequest const& request) { auto span = internal::MakeSpan("dialogflow_cx::FlowsConnection::TrainFlow"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->TrainFlow(request)); } @@ -103,7 +103,7 @@ future> FlowsTracingConnection::ImportFlow( google::cloud::dialogflow::cx::v3::ImportFlowRequest const& request) { auto span = internal::MakeSpan("dialogflow_cx::FlowsConnection::ImportFlow"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ImportFlow(request)); } @@ -111,7 +111,7 @@ future> FlowsTracingConnection::ExportFlow( google::cloud::dialogflow::cx::v3::ExportFlowRequest const& request) { auto span = internal::MakeSpan("dialogflow_cx::FlowsConnection::ExportFlow"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ExportFlow(request)); } diff --git a/google/cloud/dialogflow_cx/internal/flows_tracing_stub.cc b/google/cloud/dialogflow_cx/internal/flows_tracing_stub.cc index 00a2df898f9c..023af5fd5e0c 100644 --- a/google/cloud/dialogflow_cx/internal/flows_tracing_stub.cc +++ b/google/cloud/dialogflow_cx/internal/flows_tracing_stub.cc @@ -90,10 +90,8 @@ FlowsTracingStub::AsyncTrainFlow( google::cloud::dialogflow::cx::v3::TrainFlowRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.dialogflow.cx.v3.Flows", "TrainFlow"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncTrainFlow(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -130,10 +128,8 @@ FlowsTracingStub::AsyncImportFlow( google::cloud::dialogflow::cx::v3::ImportFlowRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.dialogflow.cx.v3.Flows", "ImportFlow"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncImportFlow(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -145,10 +141,8 @@ FlowsTracingStub::AsyncExportFlow( google::cloud::dialogflow::cx::v3::ExportFlowRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.dialogflow.cx.v3.Flows", "ExportFlow"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncExportFlow(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -160,10 +154,8 @@ FlowsTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -174,10 +166,8 @@ future FlowsTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/dialogflow_cx/internal/intents_tracing_connection.cc b/google/cloud/dialogflow_cx/internal/intents_tracing_connection.cc index d0b2b31cc2ca..7d41308bd723 100644 --- a/google/cloud/dialogflow_cx/internal/intents_tracing_connection.cc +++ b/google/cloud/dialogflow_cx/internal/intents_tracing_connection.cc @@ -37,7 +37,7 @@ IntentsTracingConnection::ListIntents( google::cloud::dialogflow::cx::v3::ListIntentsRequest request) { auto span = internal::MakeSpan("dialogflow_cx::IntentsConnection::ListIntents"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListIntents(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::dialogflow::cx::v3::Intent>(std::move(span), @@ -83,7 +83,7 @@ IntentsTracingConnection::ImportIntents( google::cloud::dialogflow::cx::v3::ImportIntentsRequest const& request) { auto span = internal::MakeSpan("dialogflow_cx::IntentsConnection::ImportIntents"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ImportIntents(request)); } @@ -92,7 +92,7 @@ IntentsTracingConnection::ExportIntents( google::cloud::dialogflow::cx::v3::ExportIntentsRequest const& request) { auto span = internal::MakeSpan("dialogflow_cx::IntentsConnection::ExportIntents"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ExportIntents(request)); } diff --git a/google/cloud/dialogflow_cx/internal/intents_tracing_stub.cc b/google/cloud/dialogflow_cx/internal/intents_tracing_stub.cc index bdc6d1cea088..ac36bf20993d 100644 --- a/google/cloud/dialogflow_cx/internal/intents_tracing_stub.cc +++ b/google/cloud/dialogflow_cx/internal/intents_tracing_stub.cc @@ -94,10 +94,8 @@ IntentsTracingStub::AsyncImportIntents( google::cloud::dialogflow::cx::v3::ImportIntentsRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.dialogflow.cx.v3.Intents", "ImportIntents"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncImportIntents(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -109,10 +107,8 @@ IntentsTracingStub::AsyncExportIntents( google::cloud::dialogflow::cx::v3::ExportIntentsRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.dialogflow.cx.v3.Intents", "ExportIntents"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncExportIntents(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -124,10 +120,8 @@ IntentsTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -138,10 +132,8 @@ future IntentsTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/dialogflow_cx/internal/pages_tracing_connection.cc b/google/cloud/dialogflow_cx/internal/pages_tracing_connection.cc index 9093a6cb8868..298db704d2a8 100644 --- a/google/cloud/dialogflow_cx/internal/pages_tracing_connection.cc +++ b/google/cloud/dialogflow_cx/internal/pages_tracing_connection.cc @@ -36,7 +36,7 @@ StreamRange PagesTracingConnection::ListPages( google::cloud::dialogflow::cx::v3::ListPagesRequest request) { auto span = internal::MakeSpan("dialogflow_cx::PagesConnection::ListPages"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListPages(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::dialogflow::cx::v3::Page>(std::move(span), std::move(sr)); diff --git a/google/cloud/dialogflow_cx/internal/security_settings_tracing_connection.cc b/google/cloud/dialogflow_cx/internal/security_settings_tracing_connection.cc index 807c28290880..2e309be5ee89 100644 --- a/google/cloud/dialogflow_cx/internal/security_settings_tracing_connection.cc +++ b/google/cloud/dialogflow_cx/internal/security_settings_tracing_connection.cc @@ -70,7 +70,7 @@ SecuritySettingsServiceTracingConnection::ListSecuritySettings( google::cloud::dialogflow::cx::v3::ListSecuritySettingsRequest request) { auto span = internal::MakeSpan( "dialogflow_cx::SecuritySettingsServiceConnection::ListSecuritySettings"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListSecuritySettings(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::dialogflow::cx::v3::SecuritySettings>(std::move(span), diff --git a/google/cloud/dialogflow_cx/internal/session_entity_types_tracing_connection.cc b/google/cloud/dialogflow_cx/internal/session_entity_types_tracing_connection.cc index 6b1fcd4eb0f2..20f9ac37a2a3 100644 --- a/google/cloud/dialogflow_cx/internal/session_entity_types_tracing_connection.cc +++ b/google/cloud/dialogflow_cx/internal/session_entity_types_tracing_connection.cc @@ -37,7 +37,7 @@ SessionEntityTypesTracingConnection::ListSessionEntityTypes( google::cloud::dialogflow::cx::v3::ListSessionEntityTypesRequest request) { auto span = internal::MakeSpan( "dialogflow_cx::SessionEntityTypesConnection::ListSessionEntityTypes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListSessionEntityTypes(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::dialogflow::cx::v3::SessionEntityType>(std::move(span), diff --git a/google/cloud/dialogflow_cx/internal/sessions_tracing_stub.cc b/google/cloud/dialogflow_cx/internal/sessions_tracing_stub.cc index 0f82a54558e9..14946a8e19b3 100644 --- a/google/cloud/dialogflow_cx/internal/sessions_tracing_stub.cc +++ b/google/cloud/dialogflow_cx/internal/sessions_tracing_stub.cc @@ -49,7 +49,7 @@ SessionsTracingStub::AsyncStreamingDetectIntent( CompletionQueue const& cq, std::shared_ptr context) { auto span = internal::MakeSpanGrpc("google.cloud.dialogflow.cx.v3.Sessions", "StreamingDetectIntent"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); internal::InjectTraceContext(*context, *propagator_); auto stream = child_->AsyncStreamingDetectIntent(cq, context); return std::make_uniqueListTestCases(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::dialogflow::cx::v3::TestCase>(std::move(span), @@ -85,7 +85,7 @@ TestCasesTracingConnection::RunTestCase( google::cloud::dialogflow::cx::v3::RunTestCaseRequest const& request) { auto span = internal::MakeSpan("dialogflow_cx::TestCasesConnection::RunTestCase"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RunTestCase(request)); } @@ -95,7 +95,7 @@ TestCasesTracingConnection::BatchRunTestCases( request) { auto span = internal::MakeSpan( "dialogflow_cx::TestCasesConnection::BatchRunTestCases"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->BatchRunTestCases(request)); } @@ -114,7 +114,7 @@ TestCasesTracingConnection::ImportTestCases( google::cloud::dialogflow::cx::v3::ImportTestCasesRequest const& request) { auto span = internal::MakeSpan("dialogflow_cx::TestCasesConnection::ImportTestCases"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ImportTestCases(request)); } @@ -123,7 +123,7 @@ TestCasesTracingConnection::ExportTestCases( google::cloud::dialogflow::cx::v3::ExportTestCasesRequest const& request) { auto span = internal::MakeSpan("dialogflow_cx::TestCasesConnection::ExportTestCases"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ExportTestCases(request)); } @@ -132,7 +132,7 @@ TestCasesTracingConnection::ListTestCaseResults( google::cloud::dialogflow::cx::v3::ListTestCaseResultsRequest request) { auto span = internal::MakeSpan( "dialogflow_cx::TestCasesConnection::ListTestCaseResults"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListTestCaseResults(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::dialogflow::cx::v3::TestCaseResult>(std::move(span), diff --git a/google/cloud/dialogflow_cx/internal/test_cases_tracing_stub.cc b/google/cloud/dialogflow_cx/internal/test_cases_tracing_stub.cc index 25960bee85f0..960104b848d8 100644 --- a/google/cloud/dialogflow_cx/internal/test_cases_tracing_stub.cc +++ b/google/cloud/dialogflow_cx/internal/test_cases_tracing_stub.cc @@ -96,10 +96,8 @@ TestCasesTracingStub::AsyncRunTestCase( google::cloud::dialogflow::cx::v3::RunTestCaseRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.dialogflow.cx.v3.TestCases", "RunTestCase"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncRunTestCase(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -112,10 +110,8 @@ TestCasesTracingStub::AsyncBatchRunTestCases( request) { auto span = internal::MakeSpanGrpc("google.cloud.dialogflow.cx.v3.TestCases", "BatchRunTestCases"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncBatchRunTestCases(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -140,10 +136,8 @@ TestCasesTracingStub::AsyncImportTestCases( google::cloud::dialogflow::cx::v3::ImportTestCasesRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.dialogflow.cx.v3.TestCases", "ImportTestCases"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncImportTestCases(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -155,10 +149,8 @@ TestCasesTracingStub::AsyncExportTestCases( google::cloud::dialogflow::cx::v3::ExportTestCasesRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.dialogflow.cx.v3.TestCases", "ExportTestCases"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncExportTestCases(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -196,10 +188,8 @@ TestCasesTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -210,10 +200,8 @@ future TestCasesTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/dialogflow_cx/internal/transition_route_groups_tracing_connection.cc b/google/cloud/dialogflow_cx/internal/transition_route_groups_tracing_connection.cc index ca8560355fa6..fb80f839f1f7 100644 --- a/google/cloud/dialogflow_cx/internal/transition_route_groups_tracing_connection.cc +++ b/google/cloud/dialogflow_cx/internal/transition_route_groups_tracing_connection.cc @@ -39,7 +39,7 @@ TransitionRouteGroupsTracingConnection::ListTransitionRouteGroups( auto span = internal::MakeSpan( "dialogflow_cx::TransitionRouteGroupsConnection::" "ListTransitionRouteGroups"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListTransitionRouteGroups(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::dialogflow::cx::v3::TransitionRouteGroup>(std::move(span), diff --git a/google/cloud/dialogflow_cx/internal/versions_tracing_connection.cc b/google/cloud/dialogflow_cx/internal/versions_tracing_connection.cc index 7b7a470e9a14..44bdfac8f5da 100644 --- a/google/cloud/dialogflow_cx/internal/versions_tracing_connection.cc +++ b/google/cloud/dialogflow_cx/internal/versions_tracing_connection.cc @@ -37,7 +37,7 @@ VersionsTracingConnection::ListVersions( google::cloud::dialogflow::cx::v3::ListVersionsRequest request) { auto span = internal::MakeSpan("dialogflow_cx::VersionsConnection::ListVersions"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListVersions(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::dialogflow::cx::v3::Version>(std::move(span), @@ -58,7 +58,7 @@ VersionsTracingConnection::CreateVersion( google::cloud::dialogflow::cx::v3::CreateVersionRequest const& request) { auto span = internal::MakeSpan("dialogflow_cx::VersionsConnection::CreateVersion"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateVersion(request)); } @@ -84,7 +84,7 @@ VersionsTracingConnection::LoadVersion( google::cloud::dialogflow::cx::v3::LoadVersionRequest const& request) { auto span = internal::MakeSpan("dialogflow_cx::VersionsConnection::LoadVersion"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->LoadVersion(request)); } diff --git a/google/cloud/dialogflow_cx/internal/versions_tracing_stub.cc b/google/cloud/dialogflow_cx/internal/versions_tracing_stub.cc index ad4262b168e4..e5de46046779 100644 --- a/google/cloud/dialogflow_cx/internal/versions_tracing_stub.cc +++ b/google/cloud/dialogflow_cx/internal/versions_tracing_stub.cc @@ -60,10 +60,8 @@ VersionsTracingStub::AsyncCreateVersion( google::cloud::dialogflow::cx::v3::CreateVersionRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.dialogflow.cx.v3.Versions", "CreateVersion"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateVersion(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -98,10 +96,8 @@ VersionsTracingStub::AsyncLoadVersion( google::cloud::dialogflow::cx::v3::LoadVersionRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.dialogflow.cx.v3.Versions", "LoadVersion"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncLoadVersion(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -125,10 +121,8 @@ VersionsTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -139,10 +133,8 @@ future VersionsTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/dialogflow_cx/internal/webhooks_tracing_connection.cc b/google/cloud/dialogflow_cx/internal/webhooks_tracing_connection.cc index 326248f1a99a..1548ae389d01 100644 --- a/google/cloud/dialogflow_cx/internal/webhooks_tracing_connection.cc +++ b/google/cloud/dialogflow_cx/internal/webhooks_tracing_connection.cc @@ -37,7 +37,7 @@ WebhooksTracingConnection::ListWebhooks( google::cloud::dialogflow::cx::v3::ListWebhooksRequest request) { auto span = internal::MakeSpan("dialogflow_cx::WebhooksConnection::ListWebhooks"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListWebhooks(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::dialogflow::cx::v3::Webhook>(std::move(span), diff --git a/google/cloud/dialogflow_es/internal/agents_tracing_connection.cc b/google/cloud/dialogflow_es/internal/agents_tracing_connection.cc index 8ab67442ec7e..03b477d18b7e 100644 --- a/google/cloud/dialogflow_es/internal/agents_tracing_connection.cc +++ b/google/cloud/dialogflow_es/internal/agents_tracing_connection.cc @@ -61,7 +61,7 @@ AgentsTracingConnection::SearchAgents( google::cloud::dialogflow::v2::SearchAgentsRequest request) { auto span = internal::MakeSpan("dialogflow_es::AgentsConnection::SearchAgents"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->SearchAgents(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -70,7 +70,7 @@ AgentsTracingConnection::SearchAgents( future> AgentsTracingConnection::TrainAgent( google::cloud::dialogflow::v2::TrainAgentRequest const& request) { auto span = internal::MakeSpan("dialogflow_es::AgentsConnection::TrainAgent"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->TrainAgent(request)); } @@ -79,7 +79,7 @@ AgentsTracingConnection::ExportAgent( google::cloud::dialogflow::v2::ExportAgentRequest const& request) { auto span = internal::MakeSpan("dialogflow_es::AgentsConnection::ExportAgent"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ExportAgent(request)); } @@ -87,7 +87,7 @@ future> AgentsTracingConnection::ImportAgent( google::cloud::dialogflow::v2::ImportAgentRequest const& request) { auto span = internal::MakeSpan("dialogflow_es::AgentsConnection::ImportAgent"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ImportAgent(request)); } @@ -96,7 +96,7 @@ AgentsTracingConnection::RestoreAgent( google::cloud::dialogflow::v2::RestoreAgentRequest const& request) { auto span = internal::MakeSpan("dialogflow_es::AgentsConnection::RestoreAgent"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RestoreAgent(request)); } diff --git a/google/cloud/dialogflow_es/internal/agents_tracing_stub.cc b/google/cloud/dialogflow_es/internal/agents_tracing_stub.cc index 0d065807280b..4c8fe9e78ef6 100644 --- a/google/cloud/dialogflow_es/internal/agents_tracing_stub.cc +++ b/google/cloud/dialogflow_es/internal/agents_tracing_stub.cc @@ -79,10 +79,8 @@ AgentsTracingStub::AsyncTrainAgent( google::cloud::dialogflow::v2::TrainAgentRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.dialogflow.v2.Agents", "TrainAgent"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncTrainAgent(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -94,10 +92,8 @@ AgentsTracingStub::AsyncExportAgent( google::cloud::dialogflow::v2::ExportAgentRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.dialogflow.v2.Agents", "ExportAgent"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncExportAgent(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -109,10 +105,8 @@ AgentsTracingStub::AsyncImportAgent( google::cloud::dialogflow::v2::ImportAgentRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.dialogflow.v2.Agents", "ImportAgent"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncImportAgent(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -124,10 +118,8 @@ AgentsTracingStub::AsyncRestoreAgent( google::cloud::dialogflow::v2::RestoreAgentRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.dialogflow.v2.Agents", "RestoreAgent"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncRestoreAgent(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -151,10 +143,8 @@ AgentsTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -165,10 +155,8 @@ future AgentsTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/dialogflow_es/internal/answer_records_tracing_connection.cc b/google/cloud/dialogflow_es/internal/answer_records_tracing_connection.cc index aa15d264ff17..1cbd79f9691e 100644 --- a/google/cloud/dialogflow_es/internal/answer_records_tracing_connection.cc +++ b/google/cloud/dialogflow_es/internal/answer_records_tracing_connection.cc @@ -37,7 +37,7 @@ AnswerRecordsTracingConnection::ListAnswerRecords( google::cloud::dialogflow::v2::ListAnswerRecordsRequest request) { auto span = internal::MakeSpan( "dialogflow_es::AnswerRecordsConnection::ListAnswerRecords"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListAnswerRecords(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::dialogflow::v2::AnswerRecord>(std::move(span), diff --git a/google/cloud/dialogflow_es/internal/contexts_tracing_connection.cc b/google/cloud/dialogflow_es/internal/contexts_tracing_connection.cc index ffe771750af4..b006a731c2a3 100644 --- a/google/cloud/dialogflow_es/internal/contexts_tracing_connection.cc +++ b/google/cloud/dialogflow_es/internal/contexts_tracing_connection.cc @@ -37,7 +37,7 @@ ContextsTracingConnection::ListContexts( google::cloud::dialogflow::v2::ListContextsRequest request) { auto span = internal::MakeSpan("dialogflow_es::ContextsConnection::ListContexts"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListContexts(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::dialogflow::v2::Context>(std::move(span), std::move(sr)); diff --git a/google/cloud/dialogflow_es/internal/conversation_datasets_tracing_connection.cc b/google/cloud/dialogflow_es/internal/conversation_datasets_tracing_connection.cc index eebd9f7565ad..9000fc5fd1ee 100644 --- a/google/cloud/dialogflow_es/internal/conversation_datasets_tracing_connection.cc +++ b/google/cloud/dialogflow_es/internal/conversation_datasets_tracing_connection.cc @@ -39,7 +39,7 @@ ConversationDatasetsTracingConnection::CreateConversationDataset( auto span = internal::MakeSpan( "dialogflow_es::ConversationDatasetsConnection::" "CreateConversationDataset"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateConversationDataset(request)); } @@ -60,7 +60,7 @@ ConversationDatasetsTracingConnection::ListConversationDatasets( auto span = internal::MakeSpan( "dialogflow_es::ConversationDatasetsConnection::" "ListConversationDatasets"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListConversationDatasets(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::dialogflow::v2::ConversationDataset>(std::move(span), @@ -75,7 +75,7 @@ ConversationDatasetsTracingConnection::DeleteConversationDataset( auto span = internal::MakeSpan( "dialogflow_es::ConversationDatasetsConnection::" "DeleteConversationDataset"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteConversationDataset(request)); } @@ -87,7 +87,7 @@ ConversationDatasetsTracingConnection::ImportConversationData( request) { auto span = internal::MakeSpan( "dialogflow_es::ConversationDatasetsConnection::ImportConversationData"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ImportConversationData(request)); } diff --git a/google/cloud/dialogflow_es/internal/conversation_datasets_tracing_stub.cc b/google/cloud/dialogflow_es/internal/conversation_datasets_tracing_stub.cc index 95cc162abed6..7d94f8677fbc 100644 --- a/google/cloud/dialogflow_es/internal/conversation_datasets_tracing_stub.cc +++ b/google/cloud/dialogflow_es/internal/conversation_datasets_tracing_stub.cc @@ -39,10 +39,8 @@ ConversationDatasetsTracingStub::AsyncCreateConversationDataset( auto span = internal::MakeSpanGrpc("google.cloud.dialogflow.v2.ConversationDatasets", "CreateConversationDataset"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateConversationDataset(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -84,10 +82,8 @@ ConversationDatasetsTracingStub::AsyncDeleteConversationDataset( auto span = internal::MakeSpanGrpc("google.cloud.dialogflow.v2.ConversationDatasets", "DeleteConversationDataset"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteConversationDataset(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -101,10 +97,8 @@ ConversationDatasetsTracingStub::AsyncImportConversationData( auto span = internal::MakeSpanGrpc("google.cloud.dialogflow.v2.ConversationDatasets", "ImportConversationData"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncImportConversationData(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -116,10 +110,8 @@ ConversationDatasetsTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -130,10 +122,8 @@ future ConversationDatasetsTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/dialogflow_es/internal/conversation_models_tracing_connection.cc b/google/cloud/dialogflow_es/internal/conversation_models_tracing_connection.cc index 7e0ddae0e06c..56b8fb83fe81 100644 --- a/google/cloud/dialogflow_es/internal/conversation_models_tracing_connection.cc +++ b/google/cloud/dialogflow_es/internal/conversation_models_tracing_connection.cc @@ -38,7 +38,7 @@ ConversationModelsTracingConnection::CreateConversationModel( request) { auto span = internal::MakeSpan( "dialogflow_es::ConversationModelsConnection::CreateConversationModel"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateConversationModel(request)); } @@ -57,7 +57,7 @@ ConversationModelsTracingConnection::ListConversationModels( google::cloud::dialogflow::v2::ListConversationModelsRequest request) { auto span = internal::MakeSpan( "dialogflow_es::ConversationModelsConnection::ListConversationModels"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListConversationModels(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::dialogflow::v2::ConversationModel>(std::move(span), @@ -71,7 +71,7 @@ ConversationModelsTracingConnection::DeleteConversationModel( request) { auto span = internal::MakeSpan( "dialogflow_es::ConversationModelsConnection::DeleteConversationModel"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteConversationModel(request)); } @@ -83,7 +83,7 @@ ConversationModelsTracingConnection::DeployConversationModel( request) { auto span = internal::MakeSpan( "dialogflow_es::ConversationModelsConnection::DeployConversationModel"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeployConversationModel(request)); } @@ -95,7 +95,7 @@ ConversationModelsTracingConnection::UndeployConversationModel( request) { auto span = internal::MakeSpan( "dialogflow_es::ConversationModelsConnection::UndeployConversationModel"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UndeployConversationModel(request)); } @@ -119,7 +119,7 @@ ConversationModelsTracingConnection::ListConversationModelEvaluations( auto span = internal::MakeSpan( "dialogflow_es::ConversationModelsConnection::" "ListConversationModelEvaluations"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListConversationModelEvaluations(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::dialogflow::v2::ConversationModelEvaluation>( @@ -133,7 +133,7 @@ ConversationModelsTracingConnection::CreateConversationModelEvaluation( auto span = internal::MakeSpan( "dialogflow_es::ConversationModelsConnection::" "CreateConversationModelEvaluation"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateConversationModelEvaluation(request)); } diff --git a/google/cloud/dialogflow_es/internal/conversation_models_tracing_stub.cc b/google/cloud/dialogflow_es/internal/conversation_models_tracing_stub.cc index 6108cbde1dff..6dbd977de324 100644 --- a/google/cloud/dialogflow_es/internal/conversation_models_tracing_stub.cc +++ b/google/cloud/dialogflow_es/internal/conversation_models_tracing_stub.cc @@ -39,10 +39,8 @@ ConversationModelsTracingStub::AsyncCreateConversationModel( auto span = internal::MakeSpanGrpc("google.cloud.dialogflow.v2.ConversationModels", "CreateConversationModel"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateConversationModel(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -82,10 +80,8 @@ ConversationModelsTracingStub::AsyncDeleteConversationModel( auto span = internal::MakeSpanGrpc("google.cloud.dialogflow.v2.ConversationModels", "DeleteConversationModel"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteConversationModel(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -99,10 +95,8 @@ ConversationModelsTracingStub::AsyncDeployConversationModel( auto span = internal::MakeSpanGrpc("google.cloud.dialogflow.v2.ConversationModels", "DeployConversationModel"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeployConversationModel(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -116,10 +110,8 @@ ConversationModelsTracingStub::AsyncUndeployConversationModel( auto span = internal::MakeSpanGrpc("google.cloud.dialogflow.v2.ConversationModels", "UndeployConversationModel"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUndeployConversationModel(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -163,10 +155,8 @@ ConversationModelsTracingStub::AsyncCreateConversationModelEvaluation( auto span = internal::MakeSpanGrpc("google.cloud.dialogflow.v2.ConversationModels", "CreateConversationModelEvaluation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateConversationModelEvaluation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -178,10 +168,8 @@ ConversationModelsTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -192,10 +180,8 @@ future ConversationModelsTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/dialogflow_es/internal/conversation_profiles_tracing_connection.cc b/google/cloud/dialogflow_es/internal/conversation_profiles_tracing_connection.cc index 0b4354dfeab7..0413d8f21205 100644 --- a/google/cloud/dialogflow_es/internal/conversation_profiles_tracing_connection.cc +++ b/google/cloud/dialogflow_es/internal/conversation_profiles_tracing_connection.cc @@ -38,7 +38,7 @@ ConversationProfilesTracingConnection::ListConversationProfiles( auto span = internal::MakeSpan( "dialogflow_es::ConversationProfilesConnection::" "ListConversationProfiles"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListConversationProfiles(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::dialogflow::v2::ConversationProfile>(std::move(span), @@ -94,7 +94,7 @@ ConversationProfilesTracingConnection::SetSuggestionFeatureConfig( auto span = internal::MakeSpan( "dialogflow_es::ConversationProfilesConnection::" "SetSuggestionFeatureConfig"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetSuggestionFeatureConfig(request)); } @@ -106,7 +106,7 @@ ConversationProfilesTracingConnection::ClearSuggestionFeatureConfig( auto span = internal::MakeSpan( "dialogflow_es::ConversationProfilesConnection::" "ClearSuggestionFeatureConfig"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ClearSuggestionFeatureConfig(request)); } diff --git a/google/cloud/dialogflow_es/internal/conversation_profiles_tracing_stub.cc b/google/cloud/dialogflow_es/internal/conversation_profiles_tracing_stub.cc index ff5e026c4c5a..1ab0748ad884 100644 --- a/google/cloud/dialogflow_es/internal/conversation_profiles_tracing_stub.cc +++ b/google/cloud/dialogflow_es/internal/conversation_profiles_tracing_stub.cc @@ -108,10 +108,8 @@ ConversationProfilesTracingStub::AsyncSetSuggestionFeatureConfig( auto span = internal::MakeSpanGrpc("google.cloud.dialogflow.v2.ConversationProfiles", "SetSuggestionFeatureConfig"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncSetSuggestionFeatureConfig(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -125,10 +123,8 @@ ConversationProfilesTracingStub::AsyncClearSuggestionFeatureConfig( auto span = internal::MakeSpanGrpc("google.cloud.dialogflow.v2.ConversationProfiles", "ClearSuggestionFeatureConfig"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncClearSuggestionFeatureConfig(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -140,10 +136,8 @@ ConversationProfilesTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -154,10 +148,8 @@ future ConversationProfilesTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/dialogflow_es/internal/conversations_tracing_connection.cc b/google/cloud/dialogflow_es/internal/conversations_tracing_connection.cc index a580bce0f68c..e92399df8e71 100644 --- a/google/cloud/dialogflow_es/internal/conversations_tracing_connection.cc +++ b/google/cloud/dialogflow_es/internal/conversations_tracing_connection.cc @@ -46,7 +46,7 @@ ConversationsTracingConnection::ListConversations( google::cloud::dialogflow::v2::ListConversationsRequest request) { auto span = internal::MakeSpan( "dialogflow_es::ConversationsConnection::ListConversations"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListConversations(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::dialogflow::v2::Conversation>(std::move(span), @@ -76,7 +76,7 @@ ConversationsTracingConnection::ListMessages( google::cloud::dialogflow::v2::ListMessagesRequest request) { auto span = internal::MakeSpan( "dialogflow_es::ConversationsConnection::ListMessages"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListMessages(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::dialogflow::v2::Message>(std::move(span), std::move(sr)); diff --git a/google/cloud/dialogflow_es/internal/documents_tracing_connection.cc b/google/cloud/dialogflow_es/internal/documents_tracing_connection.cc index debe4d5ba5c4..ca286aa501a8 100644 --- a/google/cloud/dialogflow_es/internal/documents_tracing_connection.cc +++ b/google/cloud/dialogflow_es/internal/documents_tracing_connection.cc @@ -37,7 +37,7 @@ DocumentsTracingConnection::ListDocuments( google::cloud::dialogflow::v2::ListDocumentsRequest request) { auto span = internal::MakeSpan("dialogflow_es::DocumentsConnection::ListDocuments"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListDocuments(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::dialogflow::v2::Document>(std::move(span), std::move(sr)); @@ -57,7 +57,7 @@ DocumentsTracingConnection::CreateDocument( google::cloud::dialogflow::v2::CreateDocumentRequest const& request) { auto span = internal::MakeSpan("dialogflow_es::DocumentsConnection::CreateDocument"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateDocument(request)); } @@ -66,7 +66,7 @@ DocumentsTracingConnection::ImportDocuments( google::cloud::dialogflow::v2::ImportDocumentsRequest const& request) { auto span = internal::MakeSpan("dialogflow_es::DocumentsConnection::ImportDocuments"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ImportDocuments(request)); } @@ -75,7 +75,7 @@ DocumentsTracingConnection::DeleteDocument( google::cloud::dialogflow::v2::DeleteDocumentRequest const& request) { auto span = internal::MakeSpan("dialogflow_es::DocumentsConnection::DeleteDocument"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteDocument(request)); } @@ -84,7 +84,7 @@ DocumentsTracingConnection::UpdateDocument( google::cloud::dialogflow::v2::UpdateDocumentRequest const& request) { auto span = internal::MakeSpan("dialogflow_es::DocumentsConnection::UpdateDocument"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateDocument(request)); } @@ -93,7 +93,7 @@ DocumentsTracingConnection::ReloadDocument( google::cloud::dialogflow::v2::ReloadDocumentRequest const& request) { auto span = internal::MakeSpan("dialogflow_es::DocumentsConnection::ReloadDocument"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ReloadDocument(request)); } @@ -102,7 +102,7 @@ DocumentsTracingConnection::ExportDocument( google::cloud::dialogflow::v2::ExportDocumentRequest const& request) { auto span = internal::MakeSpan("dialogflow_es::DocumentsConnection::ExportDocument"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ExportDocument(request)); } diff --git a/google/cloud/dialogflow_es/internal/documents_tracing_stub.cc b/google/cloud/dialogflow_es/internal/documents_tracing_stub.cc index b6d153d5c054..5aeedc401dc5 100644 --- a/google/cloud/dialogflow_es/internal/documents_tracing_stub.cc +++ b/google/cloud/dialogflow_es/internal/documents_tracing_stub.cc @@ -60,10 +60,8 @@ DocumentsTracingStub::AsyncCreateDocument( google::cloud::dialogflow::v2::CreateDocumentRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.dialogflow.v2.Documents", "CreateDocument"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateDocument(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -75,10 +73,8 @@ DocumentsTracingStub::AsyncImportDocuments( google::cloud::dialogflow::v2::ImportDocumentsRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.dialogflow.v2.Documents", "ImportDocuments"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncImportDocuments(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -90,10 +86,8 @@ DocumentsTracingStub::AsyncDeleteDocument( google::cloud::dialogflow::v2::DeleteDocumentRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.dialogflow.v2.Documents", "DeleteDocument"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteDocument(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -105,10 +99,8 @@ DocumentsTracingStub::AsyncUpdateDocument( google::cloud::dialogflow::v2::UpdateDocumentRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.dialogflow.v2.Documents", "UpdateDocument"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateDocument(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -120,10 +112,8 @@ DocumentsTracingStub::AsyncReloadDocument( google::cloud::dialogflow::v2::ReloadDocumentRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.dialogflow.v2.Documents", "ReloadDocument"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncReloadDocument(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -135,10 +125,8 @@ DocumentsTracingStub::AsyncExportDocument( google::cloud::dialogflow::v2::ExportDocumentRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.dialogflow.v2.Documents", "ExportDocument"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncExportDocument(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -150,10 +138,8 @@ DocumentsTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -164,10 +150,8 @@ future DocumentsTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/dialogflow_es/internal/entity_types_tracing_connection.cc b/google/cloud/dialogflow_es/internal/entity_types_tracing_connection.cc index 0a8eecdb7368..7327e55c7d0a 100644 --- a/google/cloud/dialogflow_es/internal/entity_types_tracing_connection.cc +++ b/google/cloud/dialogflow_es/internal/entity_types_tracing_connection.cc @@ -37,7 +37,7 @@ EntityTypesTracingConnection::ListEntityTypes( google::cloud::dialogflow::v2::ListEntityTypesRequest request) { auto span = internal::MakeSpan( "dialogflow_es::EntityTypesConnection::ListEntityTypes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListEntityTypes(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::dialogflow::v2::EntityType>(std::move(span), @@ -85,7 +85,7 @@ EntityTypesTracingConnection::BatchUpdateEntityTypes( request) { auto span = internal::MakeSpan( "dialogflow_es::EntityTypesConnection::BatchUpdateEntityTypes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->BatchUpdateEntityTypes(request)); } @@ -96,7 +96,7 @@ EntityTypesTracingConnection::BatchDeleteEntityTypes( request) { auto span = internal::MakeSpan( "dialogflow_es::EntityTypesConnection::BatchDeleteEntityTypes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->BatchDeleteEntityTypes(request)); } @@ -106,7 +106,7 @@ EntityTypesTracingConnection::BatchCreateEntities( google::cloud::dialogflow::v2::BatchCreateEntitiesRequest const& request) { auto span = internal::MakeSpan( "dialogflow_es::EntityTypesConnection::BatchCreateEntities"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->BatchCreateEntities(request)); } @@ -116,7 +116,7 @@ EntityTypesTracingConnection::BatchUpdateEntities( google::cloud::dialogflow::v2::BatchUpdateEntitiesRequest const& request) { auto span = internal::MakeSpan( "dialogflow_es::EntityTypesConnection::BatchUpdateEntities"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->BatchUpdateEntities(request)); } @@ -126,7 +126,7 @@ EntityTypesTracingConnection::BatchDeleteEntities( google::cloud::dialogflow::v2::BatchDeleteEntitiesRequest const& request) { auto span = internal::MakeSpan( "dialogflow_es::EntityTypesConnection::BatchDeleteEntities"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->BatchDeleteEntities(request)); } diff --git a/google/cloud/dialogflow_es/internal/entity_types_tracing_stub.cc b/google/cloud/dialogflow_es/internal/entity_types_tracing_stub.cc index cbfdef906139..6b87505b2a55 100644 --- a/google/cloud/dialogflow_es/internal/entity_types_tracing_stub.cc +++ b/google/cloud/dialogflow_es/internal/entity_types_tracing_stub.cc @@ -97,10 +97,8 @@ EntityTypesTracingStub::AsyncBatchUpdateEntityTypes( request) { auto span = internal::MakeSpanGrpc("google.cloud.dialogflow.v2.EntityTypes", "BatchUpdateEntityTypes"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncBatchUpdateEntityTypes(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -113,10 +111,8 @@ EntityTypesTracingStub::AsyncBatchDeleteEntityTypes( request) { auto span = internal::MakeSpanGrpc("google.cloud.dialogflow.v2.EntityTypes", "BatchDeleteEntityTypes"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncBatchDeleteEntityTypes(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -128,10 +124,8 @@ EntityTypesTracingStub::AsyncBatchCreateEntities( google::cloud::dialogflow::v2::BatchCreateEntitiesRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.dialogflow.v2.EntityTypes", "BatchCreateEntities"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncBatchCreateEntities(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -143,10 +137,8 @@ EntityTypesTracingStub::AsyncBatchUpdateEntities( google::cloud::dialogflow::v2::BatchUpdateEntitiesRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.dialogflow.v2.EntityTypes", "BatchUpdateEntities"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncBatchUpdateEntities(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -158,10 +150,8 @@ EntityTypesTracingStub::AsyncBatchDeleteEntities( google::cloud::dialogflow::v2::BatchDeleteEntitiesRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.dialogflow.v2.EntityTypes", "BatchDeleteEntities"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncBatchDeleteEntities(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -173,10 +163,8 @@ EntityTypesTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -187,10 +175,8 @@ future EntityTypesTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/dialogflow_es/internal/environments_tracing_connection.cc b/google/cloud/dialogflow_es/internal/environments_tracing_connection.cc index c07805513666..8630f4532cf1 100644 --- a/google/cloud/dialogflow_es/internal/environments_tracing_connection.cc +++ b/google/cloud/dialogflow_es/internal/environments_tracing_connection.cc @@ -37,7 +37,7 @@ EnvironmentsTracingConnection::ListEnvironments( google::cloud::dialogflow::v2::ListEnvironmentsRequest request) { auto span = internal::MakeSpan( "dialogflow_es::EnvironmentsConnection::ListEnvironments"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListEnvironments(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::dialogflow::v2::Environment>(std::move(span), @@ -84,7 +84,7 @@ EnvironmentsTracingConnection::GetEnvironmentHistory( google::cloud::dialogflow::v2::GetEnvironmentHistoryRequest request) { auto span = internal::MakeSpan( "dialogflow_es::EnvironmentsConnection::GetEnvironmentHistory"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->GetEnvironmentHistory(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::dialogflow::v2::EnvironmentHistory::Entry>(std::move(span), diff --git a/google/cloud/dialogflow_es/internal/intents_tracing_connection.cc b/google/cloud/dialogflow_es/internal/intents_tracing_connection.cc index 5c033a2cae4f..5b693f4e4b93 100644 --- a/google/cloud/dialogflow_es/internal/intents_tracing_connection.cc +++ b/google/cloud/dialogflow_es/internal/intents_tracing_connection.cc @@ -37,7 +37,7 @@ IntentsTracingConnection::ListIntents( google::cloud::dialogflow::v2::ListIntentsRequest request) { auto span = internal::MakeSpan("dialogflow_es::IntentsConnection::ListIntents"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListIntents(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -82,7 +82,7 @@ IntentsTracingConnection::BatchUpdateIntents( google::cloud::dialogflow::v2::BatchUpdateIntentsRequest const& request) { auto span = internal::MakeSpan( "dialogflow_es::IntentsConnection::BatchUpdateIntents"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->BatchUpdateIntents(request)); } @@ -92,7 +92,7 @@ IntentsTracingConnection::BatchDeleteIntents( google::cloud::dialogflow::v2::BatchDeleteIntentsRequest const& request) { auto span = internal::MakeSpan( "dialogflow_es::IntentsConnection::BatchDeleteIntents"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->BatchDeleteIntents(request)); } diff --git a/google/cloud/dialogflow_es/internal/intents_tracing_stub.cc b/google/cloud/dialogflow_es/internal/intents_tracing_stub.cc index d6081d3f37ca..11c28a2c0202 100644 --- a/google/cloud/dialogflow_es/internal/intents_tracing_stub.cc +++ b/google/cloud/dialogflow_es/internal/intents_tracing_stub.cc @@ -93,10 +93,8 @@ IntentsTracingStub::AsyncBatchUpdateIntents( google::cloud::dialogflow::v2::BatchUpdateIntentsRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.dialogflow.v2.Intents", "BatchUpdateIntents"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncBatchUpdateIntents(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -108,10 +106,8 @@ IntentsTracingStub::AsyncBatchDeleteIntents( google::cloud::dialogflow::v2::BatchDeleteIntentsRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.dialogflow.v2.Intents", "BatchDeleteIntents"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncBatchDeleteIntents(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -123,10 +119,8 @@ IntentsTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -137,10 +131,8 @@ future IntentsTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/dialogflow_es/internal/knowledge_bases_tracing_connection.cc b/google/cloud/dialogflow_es/internal/knowledge_bases_tracing_connection.cc index 0350e1a9c003..b93ae9c50e6b 100644 --- a/google/cloud/dialogflow_es/internal/knowledge_bases_tracing_connection.cc +++ b/google/cloud/dialogflow_es/internal/knowledge_bases_tracing_connection.cc @@ -37,7 +37,7 @@ KnowledgeBasesTracingConnection::ListKnowledgeBases( google::cloud::dialogflow::v2::ListKnowledgeBasesRequest request) { auto span = internal::MakeSpan( "dialogflow_es::KnowledgeBasesConnection::ListKnowledgeBases"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListKnowledgeBases(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::dialogflow::v2::KnowledgeBase>(std::move(span), diff --git a/google/cloud/dialogflow_es/internal/participants_tracing_connection.cc b/google/cloud/dialogflow_es/internal/participants_tracing_connection.cc index d86704e4755c..9504bebb072f 100644 --- a/google/cloud/dialogflow_es/internal/participants_tracing_connection.cc +++ b/google/cloud/dialogflow_es/internal/participants_tracing_connection.cc @@ -55,7 +55,7 @@ ParticipantsTracingConnection::ListParticipants( google::cloud::dialogflow::v2::ListParticipantsRequest request) { auto span = internal::MakeSpan( "dialogflow_es::ParticipantsConnection::ListParticipants"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListParticipants(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::dialogflow::v2::Participant>(std::move(span), diff --git a/google/cloud/dialogflow_es/internal/participants_tracing_stub.cc b/google/cloud/dialogflow_es/internal/participants_tracing_stub.cc index b99c98224e14..450ad6a3266e 100644 --- a/google/cloud/dialogflow_es/internal/participants_tracing_stub.cc +++ b/google/cloud/dialogflow_es/internal/participants_tracing_stub.cc @@ -98,7 +98,7 @@ ParticipantsTracingStub::AsyncStreamingAnalyzeContent( CompletionQueue const& cq, std::shared_ptr context) { auto span = internal::MakeSpanGrpc("google.cloud.dialogflow.v2.Participants", "StreamingAnalyzeContent"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); internal::InjectTraceContext(*context, *propagator_); auto stream = child_->AsyncStreamingAnalyzeContent(cq, context); return std::make_uniqueListSessionEntityTypes(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::dialogflow::v2::SessionEntityType>(std::move(span), diff --git a/google/cloud/dialogflow_es/internal/sessions_tracing_stub.cc b/google/cloud/dialogflow_es/internal/sessions_tracing_stub.cc index ef18b7bdb742..5f5fcac0230a 100644 --- a/google/cloud/dialogflow_es/internal/sessions_tracing_stub.cc +++ b/google/cloud/dialogflow_es/internal/sessions_tracing_stub.cc @@ -49,7 +49,7 @@ SessionsTracingStub::AsyncStreamingDetectIntent( CompletionQueue const& cq, std::shared_ptr context) { auto span = internal::MakeSpanGrpc("google.cloud.dialogflow.v2.Sessions", "StreamingDetectIntent"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); internal::InjectTraceContext(*context, *propagator_); auto stream = child_->AsyncStreamingDetectIntent(cq, context); return std::make_uniqueListVersions(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::dialogflow::v2::Version>(std::move(span), std::move(sr)); diff --git a/google/cloud/discoveryengine/v1/internal/conversational_search_tracing_connection.cc b/google/cloud/discoveryengine/v1/internal/conversational_search_tracing_connection.cc index c9bdbebd7398..09ee3132d219 100644 --- a/google/cloud/discoveryengine/v1/internal/conversational_search_tracing_connection.cc +++ b/google/cloud/discoveryengine/v1/internal/conversational_search_tracing_connection.cc @@ -94,7 +94,7 @@ ConversationalSearchServiceTracingConnection::ListConversations( auto span = internal::MakeSpan( "discoveryengine_v1::ConversationalSearchServiceConnection::" "ListConversations"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListConversations(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::discoveryengine::v1::Conversation>(std::move(span), diff --git a/google/cloud/discoveryengine/v1/internal/document_tracing_connection.cc b/google/cloud/discoveryengine/v1/internal/document_tracing_connection.cc index 905e721d5ef4..9a054ad5d8fd 100644 --- a/google/cloud/discoveryengine/v1/internal/document_tracing_connection.cc +++ b/google/cloud/discoveryengine/v1/internal/document_tracing_connection.cc @@ -46,7 +46,7 @@ DocumentServiceTracingConnection::ListDocuments( google::cloud::discoveryengine::v1::ListDocumentsRequest request) { auto span = internal::MakeSpan( "discoveryengine_v1::DocumentServiceConnection::ListDocuments"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListDocuments(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::discoveryengine::v1::Document>(std::move(span), @@ -84,7 +84,7 @@ DocumentServiceTracingConnection::ImportDocuments( google::cloud::discoveryengine::v1::ImportDocumentsRequest const& request) { auto span = internal::MakeSpan( "discoveryengine_v1::DocumentServiceConnection::ImportDocuments"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ImportDocuments(request)); } @@ -93,7 +93,7 @@ DocumentServiceTracingConnection::PurgeDocuments( google::cloud::discoveryengine::v1::PurgeDocumentsRequest const& request) { auto span = internal::MakeSpan( "discoveryengine_v1::DocumentServiceConnection::PurgeDocuments"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PurgeDocuments(request)); } diff --git a/google/cloud/discoveryengine/v1/internal/document_tracing_stub.cc b/google/cloud/discoveryengine/v1/internal/document_tracing_stub.cc index ec616eb85644..8a4dcd5480d0 100644 --- a/google/cloud/discoveryengine/v1/internal/document_tracing_stub.cc +++ b/google/cloud/discoveryengine/v1/internal/document_tracing_stub.cc @@ -96,10 +96,8 @@ DocumentServiceTracingStub::AsyncImportDocuments( google::cloud::discoveryengine::v1::ImportDocumentsRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.discoveryengine.v1.DocumentService", "ImportDocuments"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncImportDocuments(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -111,10 +109,8 @@ DocumentServiceTracingStub::AsyncPurgeDocuments( google::cloud::discoveryengine::v1::PurgeDocumentsRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.discoveryengine.v1.DocumentService", "PurgeDocuments"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncPurgeDocuments(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -126,10 +122,8 @@ DocumentServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -140,10 +134,8 @@ future DocumentServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/discoveryengine/v1/internal/schema_tracing_connection.cc b/google/cloud/discoveryengine/v1/internal/schema_tracing_connection.cc index c579a986bc5c..04c79c32d7ef 100644 --- a/google/cloud/discoveryengine/v1/internal/schema_tracing_connection.cc +++ b/google/cloud/discoveryengine/v1/internal/schema_tracing_connection.cc @@ -46,7 +46,7 @@ SchemaServiceTracingConnection::ListSchemas( google::cloud::discoveryengine::v1::ListSchemasRequest request) { auto span = internal::MakeSpan( "discoveryengine_v1::SchemaServiceConnection::ListSchemas"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListSchemas(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::discoveryengine::v1::Schema>(std::move(span), @@ -58,7 +58,7 @@ SchemaServiceTracingConnection::CreateSchema( google::cloud::discoveryengine::v1::CreateSchemaRequest const& request) { auto span = internal::MakeSpan( "discoveryengine_v1::SchemaServiceConnection::CreateSchema"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateSchema(request)); } @@ -67,7 +67,7 @@ SchemaServiceTracingConnection::UpdateSchema( google::cloud::discoveryengine::v1::UpdateSchemaRequest const& request) { auto span = internal::MakeSpan( "discoveryengine_v1::SchemaServiceConnection::UpdateSchema"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateSchema(request)); } @@ -76,7 +76,7 @@ SchemaServiceTracingConnection::DeleteSchema( google::cloud::discoveryengine::v1::DeleteSchemaRequest const& request) { auto span = internal::MakeSpan( "discoveryengine_v1::SchemaServiceConnection::DeleteSchema"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteSchema(request)); } diff --git a/google/cloud/discoveryengine/v1/internal/schema_tracing_stub.cc b/google/cloud/discoveryengine/v1/internal/schema_tracing_stub.cc index 93295a323097..35403a1a10e6 100644 --- a/google/cloud/discoveryengine/v1/internal/schema_tracing_stub.cc +++ b/google/cloud/discoveryengine/v1/internal/schema_tracing_stub.cc @@ -60,10 +60,8 @@ SchemaServiceTracingStub::AsyncCreateSchema( google::cloud::discoveryengine::v1::CreateSchemaRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.discoveryengine.v1.SchemaService", "CreateSchema"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateSchema(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -75,10 +73,8 @@ SchemaServiceTracingStub::AsyncUpdateSchema( google::cloud::discoveryengine::v1::UpdateSchemaRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.discoveryengine.v1.SchemaService", "UpdateSchema"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateSchema(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -90,10 +86,8 @@ SchemaServiceTracingStub::AsyncDeleteSchema( google::cloud::discoveryengine::v1::DeleteSchemaRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.discoveryengine.v1.SchemaService", "DeleteSchema"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteSchema(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -105,10 +99,8 @@ SchemaServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -119,10 +111,8 @@ future SchemaServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/discoveryengine/v1/internal/search_tracing_connection.cc b/google/cloud/discoveryengine/v1/internal/search_tracing_connection.cc index b2ac6781380c..fbf74f6250b1 100644 --- a/google/cloud/discoveryengine/v1/internal/search_tracing_connection.cc +++ b/google/cloud/discoveryengine/v1/internal/search_tracing_connection.cc @@ -37,7 +37,7 @@ SearchServiceTracingConnection::Search( google::cloud::discoveryengine::v1::SearchRequest request) { auto span = internal::MakeSpan("discoveryengine_v1::SearchServiceConnection::Search"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->Search(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::discoveryengine::v1::SearchResponse::SearchResult>( diff --git a/google/cloud/discoveryengine/v1/internal/user_event_tracing_connection.cc b/google/cloud/discoveryengine/v1/internal/user_event_tracing_connection.cc index 91e89e62de15..611eabd6b72c 100644 --- a/google/cloud/discoveryengine/v1/internal/user_event_tracing_connection.cc +++ b/google/cloud/discoveryengine/v1/internal/user_event_tracing_connection.cc @@ -56,7 +56,7 @@ UserEventServiceTracingConnection::ImportUserEvents( request) { auto span = internal::MakeSpan( "discoveryengine_v1::UserEventServiceConnection::ImportUserEvents"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ImportUserEvents(request)); } diff --git a/google/cloud/discoveryengine/v1/internal/user_event_tracing_stub.cc b/google/cloud/discoveryengine/v1/internal/user_event_tracing_stub.cc index 54e03b827133..a751fb54085c 100644 --- a/google/cloud/discoveryengine/v1/internal/user_event_tracing_stub.cc +++ b/google/cloud/discoveryengine/v1/internal/user_event_tracing_stub.cc @@ -62,10 +62,8 @@ UserEventServiceTracingStub::AsyncImportUserEvents( request) { auto span = internal::MakeSpanGrpc( "google.cloud.discoveryengine.v1.UserEventService", "ImportUserEvents"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncImportUserEvents(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -77,10 +75,8 @@ UserEventServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -91,10 +87,8 @@ future UserEventServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/dlp/v2/internal/dlp_tracing_connection.cc b/google/cloud/dlp/v2/internal/dlp_tracing_connection.cc index 28518cb95db5..a20d3a5ea714 100644 --- a/google/cloud/dlp/v2/internal/dlp_tracing_connection.cc +++ b/google/cloud/dlp/v2/internal/dlp_tracing_connection.cc @@ -107,7 +107,7 @@ DlpServiceTracingConnection::ListInspectTemplates( google::privacy::dlp::v2::ListInspectTemplatesRequest request) { auto span = internal::MakeSpan("dlp_v2::DlpServiceConnection::ListInspectTemplates"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListInspectTemplates(std::move(request)); return internal::MakeTracedStreamRange< google::privacy::dlp::v2::InspectTemplate>(std::move(span), @@ -154,7 +154,7 @@ DlpServiceTracingConnection::ListDeidentifyTemplates( google::privacy::dlp::v2::ListDeidentifyTemplatesRequest request) { auto span = internal::MakeSpan( "dlp_v2::DlpServiceConnection::ListDeidentifyTemplates"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListDeidentifyTemplates(std::move(request)); return internal::MakeTracedStreamRange< google::privacy::dlp::v2::DeidentifyTemplate>(std::move(span), @@ -209,7 +209,7 @@ DlpServiceTracingConnection::ListJobTriggers( google::privacy::dlp::v2::ListJobTriggersRequest request) { auto span = internal::MakeSpan("dlp_v2::DlpServiceConnection::ListJobTriggers"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListJobTriggers(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -244,7 +244,7 @@ StreamRange DlpServiceTracingConnection::ListDlpJobs( google::privacy::dlp::v2::ListDlpJobsRequest request) { auto span = internal::MakeSpan("dlp_v2::DlpServiceConnection::ListDlpJobs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListDlpJobs(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -304,7 +304,7 @@ DlpServiceTracingConnection::ListStoredInfoTypes( google::privacy::dlp::v2::ListStoredInfoTypesRequest request) { auto span = internal::MakeSpan("dlp_v2::DlpServiceConnection::ListStoredInfoTypes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListStoredInfoTypes(std::move(request)); return internal::MakeTracedStreamRange< google::privacy::dlp::v2::StoredInfoType>(std::move(span), std::move(sr)); diff --git a/google/cloud/documentai/v1/internal/document_processor_tracing_connection.cc b/google/cloud/documentai/v1/internal/document_processor_tracing_connection.cc index 047df0f3ab63..faa941d17700 100644 --- a/google/cloud/documentai/v1/internal/document_processor_tracing_connection.cc +++ b/google/cloud/documentai/v1/internal/document_processor_tracing_connection.cc @@ -49,7 +49,7 @@ DocumentProcessorServiceTracingConnection::BatchProcessDocuments( auto span = internal::MakeSpan( "documentai_v1::DocumentProcessorServiceConnection::" "BatchProcessDocuments"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->BatchProcessDocuments(request)); } @@ -68,7 +68,7 @@ DocumentProcessorServiceTracingConnection::ListProcessorTypes( google::cloud::documentai::v1::ListProcessorTypesRequest request) { auto span = internal::MakeSpan( "documentai_v1::DocumentProcessorServiceConnection::ListProcessorTypes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListProcessorTypes(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::documentai::v1::ProcessorType>(std::move(span), @@ -89,7 +89,7 @@ DocumentProcessorServiceTracingConnection::ListProcessors( google::cloud::documentai::v1::ListProcessorsRequest request) { auto span = internal::MakeSpan( "documentai_v1::DocumentProcessorServiceConnection::ListProcessors"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListProcessors(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::documentai::v1::Processor>(std::move(span), std::move(sr)); @@ -111,7 +111,7 @@ DocumentProcessorServiceTracingConnection::TrainProcessorVersion( auto span = internal::MakeSpan( "documentai_v1::DocumentProcessorServiceConnection::" "TrainProcessorVersion"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->TrainProcessorVersion(request)); } @@ -131,7 +131,7 @@ DocumentProcessorServiceTracingConnection::ListProcessorVersions( auto span = internal::MakeSpan( "documentai_v1::DocumentProcessorServiceConnection::" "ListProcessorVersions"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListProcessorVersions(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::documentai::v1::ProcessorVersion>(std::move(span), @@ -145,7 +145,7 @@ DocumentProcessorServiceTracingConnection::DeleteProcessorVersion( auto span = internal::MakeSpan( "documentai_v1::DocumentProcessorServiceConnection::" "DeleteProcessorVersion"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteProcessorVersion(request)); } @@ -157,7 +157,7 @@ DocumentProcessorServiceTracingConnection::DeployProcessorVersion( auto span = internal::MakeSpan( "documentai_v1::DocumentProcessorServiceConnection::" "DeployProcessorVersion"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeployProcessorVersion(request)); } @@ -170,7 +170,7 @@ DocumentProcessorServiceTracingConnection::UndeployProcessorVersion( auto span = internal::MakeSpan( "documentai_v1::DocumentProcessorServiceConnection::" "UndeployProcessorVersion"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UndeployProcessorVersion(request)); } @@ -189,7 +189,7 @@ DocumentProcessorServiceTracingConnection::DeleteProcessor( google::cloud::documentai::v1::DeleteProcessorRequest const& request) { auto span = internal::MakeSpan( "documentai_v1::DocumentProcessorServiceConnection::DeleteProcessor"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteProcessor(request)); } @@ -198,7 +198,7 @@ DocumentProcessorServiceTracingConnection::EnableProcessor( google::cloud::documentai::v1::EnableProcessorRequest const& request) { auto span = internal::MakeSpan( "documentai_v1::DocumentProcessorServiceConnection::EnableProcessor"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->EnableProcessor(request)); } @@ -207,7 +207,7 @@ DocumentProcessorServiceTracingConnection::DisableProcessor( google::cloud::documentai::v1::DisableProcessorRequest const& request) { auto span = internal::MakeSpan( "documentai_v1::DocumentProcessorServiceConnection::DisableProcessor"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DisableProcessor(request)); } @@ -219,7 +219,7 @@ DocumentProcessorServiceTracingConnection::SetDefaultProcessorVersion( auto span = internal::MakeSpan( "documentai_v1::DocumentProcessorServiceConnection::" "SetDefaultProcessorVersion"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetDefaultProcessorVersion(request)); } @@ -229,7 +229,7 @@ DocumentProcessorServiceTracingConnection::ReviewDocument( google::cloud::documentai::v1::ReviewDocumentRequest const& request) { auto span = internal::MakeSpan( "documentai_v1::DocumentProcessorServiceConnection::ReviewDocument"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ReviewDocument(request)); } @@ -241,7 +241,7 @@ DocumentProcessorServiceTracingConnection::EvaluateProcessorVersion( auto span = internal::MakeSpan( "documentai_v1::DocumentProcessorServiceConnection::" "EvaluateProcessorVersion"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->EvaluateProcessorVersion(request)); } @@ -260,7 +260,7 @@ DocumentProcessorServiceTracingConnection::ListEvaluations( google::cloud::documentai::v1::ListEvaluationsRequest request) { auto span = internal::MakeSpan( "documentai_v1::DocumentProcessorServiceConnection::ListEvaluations"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListEvaluations(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::documentai::v1::Evaluation>(std::move(span), diff --git a/google/cloud/documentai/v1/internal/document_processor_tracing_stub.cc b/google/cloud/documentai/v1/internal/document_processor_tracing_stub.cc index 1348e00118bd..7aace31f8b0d 100644 --- a/google/cloud/documentai/v1/internal/document_processor_tracing_stub.cc +++ b/google/cloud/documentai/v1/internal/document_processor_tracing_stub.cc @@ -50,10 +50,8 @@ DocumentProcessorServiceTracingStub::AsyncBatchProcessDocuments( auto span = internal::MakeSpanGrpc( "google.cloud.documentai.v1.DocumentProcessorService", "BatchProcessDocuments"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncBatchProcessDocuments(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -130,10 +128,8 @@ DocumentProcessorServiceTracingStub::AsyncTrainProcessorVersion( auto span = internal::MakeSpanGrpc( "google.cloud.documentai.v1.DocumentProcessorService", "TrainProcessorVersion"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncTrainProcessorVersion(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -174,10 +170,8 @@ DocumentProcessorServiceTracingStub::AsyncDeleteProcessorVersion( auto span = internal::MakeSpanGrpc( "google.cloud.documentai.v1.DocumentProcessorService", "DeleteProcessorVersion"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteProcessorVersion(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -191,10 +185,8 @@ DocumentProcessorServiceTracingStub::AsyncDeployProcessorVersion( auto span = internal::MakeSpanGrpc( "google.cloud.documentai.v1.DocumentProcessorService", "DeployProcessorVersion"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeployProcessorVersion(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -208,10 +200,8 @@ DocumentProcessorServiceTracingStub::AsyncUndeployProcessorVersion( auto span = internal::MakeSpanGrpc( "google.cloud.documentai.v1.DocumentProcessorService", "UndeployProcessorVersion"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUndeployProcessorVersion(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -235,10 +225,8 @@ DocumentProcessorServiceTracingStub::AsyncDeleteProcessor( google::cloud::documentai::v1::DeleteProcessorRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.documentai.v1.DocumentProcessorService", "DeleteProcessor"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteProcessor(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -250,10 +238,8 @@ DocumentProcessorServiceTracingStub::AsyncEnableProcessor( google::cloud::documentai::v1::EnableProcessorRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.documentai.v1.DocumentProcessorService", "EnableProcessor"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncEnableProcessor(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -266,10 +252,8 @@ DocumentProcessorServiceTracingStub::AsyncDisableProcessor( auto span = internal::MakeSpanGrpc( "google.cloud.documentai.v1.DocumentProcessorService", "DisableProcessor"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDisableProcessor(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -283,10 +267,8 @@ DocumentProcessorServiceTracingStub::AsyncSetDefaultProcessorVersion( auto span = internal::MakeSpanGrpc( "google.cloud.documentai.v1.DocumentProcessorService", "SetDefaultProcessorVersion"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncSetDefaultProcessorVersion(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -298,10 +280,8 @@ DocumentProcessorServiceTracingStub::AsyncReviewDocument( google::cloud::documentai::v1::ReviewDocumentRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.documentai.v1.DocumentProcessorService", "ReviewDocument"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncReviewDocument(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -315,10 +295,8 @@ DocumentProcessorServiceTracingStub::AsyncEvaluateProcessorVersion( auto span = internal::MakeSpanGrpc( "google.cloud.documentai.v1.DocumentProcessorService", "EvaluateProcessorVersion"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncEvaluateProcessorVersion(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -354,10 +332,8 @@ DocumentProcessorServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -368,10 +344,8 @@ future DocumentProcessorServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/domains/v1/internal/domains_tracing_connection.cc b/google/cloud/domains/v1/internal/domains_tracing_connection.cc index 1cd85f157527..36077ced0394 100644 --- a/google/cloud/domains/v1/internal/domains_tracing_connection.cc +++ b/google/cloud/domains/v1/internal/domains_tracing_connection.cc @@ -56,7 +56,7 @@ DomainsTracingConnection::RegisterDomain( google::cloud::domains::v1::RegisterDomainRequest const& request) { auto span = internal::MakeSpan("domains_v1::DomainsConnection::RegisterDomain"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RegisterDomain(request)); } @@ -75,7 +75,7 @@ DomainsTracingConnection::TransferDomain( google::cloud::domains::v1::TransferDomainRequest const& request) { auto span = internal::MakeSpan("domains_v1::DomainsConnection::TransferDomain"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->TransferDomain(request)); } @@ -84,7 +84,7 @@ DomainsTracingConnection::ListRegistrations( google::cloud::domains::v1::ListRegistrationsRequest request) { auto span = internal::MakeSpan("domains_v1::DomainsConnection::ListRegistrations"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListRegistrations(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::domains::v1::Registration>(std::move(span), std::move(sr)); @@ -104,7 +104,7 @@ DomainsTracingConnection::UpdateRegistration( google::cloud::domains::v1::UpdateRegistrationRequest const& request) { auto span = internal::MakeSpan("domains_v1::DomainsConnection::UpdateRegistration"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateRegistration(request)); } @@ -115,7 +115,7 @@ DomainsTracingConnection::ConfigureManagementSettings( request) { auto span = internal::MakeSpan( "domains_v1::DomainsConnection::ConfigureManagementSettings"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ConfigureManagementSettings(request)); } @@ -125,7 +125,7 @@ DomainsTracingConnection::ConfigureDnsSettings( google::cloud::domains::v1::ConfigureDnsSettingsRequest const& request) { auto span = internal::MakeSpan("domains_v1::DomainsConnection::ConfigureDnsSettings"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ConfigureDnsSettings(request)); } @@ -136,7 +136,7 @@ DomainsTracingConnection::ConfigureContactSettings( request) { auto span = internal::MakeSpan( "domains_v1::DomainsConnection::ConfigureContactSettings"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ConfigureContactSettings(request)); } @@ -146,7 +146,7 @@ DomainsTracingConnection::ExportRegistration( google::cloud::domains::v1::ExportRegistrationRequest const& request) { auto span = internal::MakeSpan("domains_v1::DomainsConnection::ExportRegistration"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ExportRegistration(request)); } @@ -156,7 +156,7 @@ DomainsTracingConnection::DeleteRegistration( google::cloud::domains::v1::DeleteRegistrationRequest const& request) { auto span = internal::MakeSpan("domains_v1::DomainsConnection::DeleteRegistration"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteRegistration(request)); } diff --git a/google/cloud/domains/v1/internal/domains_tracing_stub.cc b/google/cloud/domains/v1/internal/domains_tracing_stub.cc index bb0a7166965b..2cf3e05a213f 100644 --- a/google/cloud/domains/v1/internal/domains_tracing_stub.cc +++ b/google/cloud/domains/v1/internal/domains_tracing_stub.cc @@ -61,10 +61,8 @@ DomainsTracingStub::AsyncRegisterDomain( google::cloud::domains::v1::RegisterDomainRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.domains.v1.Domains", "RegisterDomain"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncRegisterDomain(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -89,10 +87,8 @@ DomainsTracingStub::AsyncTransferDomain( google::cloud::domains::v1::TransferDomainRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.domains.v1.Domains", "TransferDomain"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncTransferDomain(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -128,10 +124,8 @@ DomainsTracingStub::AsyncUpdateRegistration( google::cloud::domains::v1::UpdateRegistrationRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.domains.v1.Domains", "UpdateRegistration"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateRegistration(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -144,10 +138,8 @@ DomainsTracingStub::AsyncConfigureManagementSettings( request) { auto span = internal::MakeSpanGrpc("google.cloud.domains.v1.Domains", "ConfigureManagementSettings"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncConfigureManagementSettings(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -159,10 +151,8 @@ DomainsTracingStub::AsyncConfigureDnsSettings( google::cloud::domains::v1::ConfigureDnsSettingsRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.domains.v1.Domains", "ConfigureDnsSettings"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncConfigureDnsSettings(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -175,10 +165,8 @@ DomainsTracingStub::AsyncConfigureContactSettings( request) { auto span = internal::MakeSpanGrpc("google.cloud.domains.v1.Domains", "ConfigureContactSettings"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncConfigureContactSettings(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -190,10 +178,8 @@ DomainsTracingStub::AsyncExportRegistration( google::cloud::domains::v1::ExportRegistrationRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.domains.v1.Domains", "ExportRegistration"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncExportRegistration(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -205,10 +191,8 @@ DomainsTracingStub::AsyncDeleteRegistration( google::cloud::domains::v1::DeleteRegistrationRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.domains.v1.Domains", "DeleteRegistration"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteRegistration(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -245,10 +229,8 @@ DomainsTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -259,10 +241,8 @@ future DomainsTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/edgecontainer/v1/internal/edge_container_tracing_connection.cc b/google/cloud/edgecontainer/v1/internal/edge_container_tracing_connection.cc index 7d10d72041c9..573d4ce804c5 100644 --- a/google/cloud/edgecontainer/v1/internal/edge_container_tracing_connection.cc +++ b/google/cloud/edgecontainer/v1/internal/edge_container_tracing_connection.cc @@ -37,7 +37,7 @@ EdgeContainerTracingConnection::ListClusters( google::cloud::edgecontainer::v1::ListClustersRequest request) { auto span = internal::MakeSpan( "edgecontainer_v1::EdgeContainerConnection::ListClusters"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListClusters(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::edgecontainer::v1::Cluster>(std::move(span), @@ -58,7 +58,7 @@ EdgeContainerTracingConnection::CreateCluster( google::cloud::edgecontainer::v1::CreateClusterRequest const& request) { auto span = internal::MakeSpan( "edgecontainer_v1::EdgeContainerConnection::CreateCluster"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateCluster(request)); } @@ -67,7 +67,7 @@ EdgeContainerTracingConnection::UpdateCluster( google::cloud::edgecontainer::v1::UpdateClusterRequest const& request) { auto span = internal::MakeSpan( "edgecontainer_v1::EdgeContainerConnection::UpdateCluster"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateCluster(request)); } @@ -76,7 +76,7 @@ EdgeContainerTracingConnection::DeleteCluster( google::cloud::edgecontainer::v1::DeleteClusterRequest const& request) { auto span = internal::MakeSpan( "edgecontainer_v1::EdgeContainerConnection::DeleteCluster"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteCluster(request)); } @@ -95,7 +95,7 @@ EdgeContainerTracingConnection::ListNodePools( google::cloud::edgecontainer::v1::ListNodePoolsRequest request) { auto span = internal::MakeSpan( "edgecontainer_v1::EdgeContainerConnection::ListNodePools"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListNodePools(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::edgecontainer::v1::NodePool>(std::move(span), @@ -116,7 +116,7 @@ EdgeContainerTracingConnection::CreateNodePool( google::cloud::edgecontainer::v1::CreateNodePoolRequest const& request) { auto span = internal::MakeSpan( "edgecontainer_v1::EdgeContainerConnection::CreateNodePool"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateNodePool(request)); } @@ -125,7 +125,7 @@ EdgeContainerTracingConnection::UpdateNodePool( google::cloud::edgecontainer::v1::UpdateNodePoolRequest const& request) { auto span = internal::MakeSpan( "edgecontainer_v1::EdgeContainerConnection::UpdateNodePool"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateNodePool(request)); } @@ -134,7 +134,7 @@ EdgeContainerTracingConnection::DeleteNodePool( google::cloud::edgecontainer::v1::DeleteNodePoolRequest const& request) { auto span = internal::MakeSpan( "edgecontainer_v1::EdgeContainerConnection::DeleteNodePool"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteNodePool(request)); } @@ -143,7 +143,7 @@ EdgeContainerTracingConnection::ListMachines( google::cloud::edgecontainer::v1::ListMachinesRequest request) { auto span = internal::MakeSpan( "edgecontainer_v1::EdgeContainerConnection::ListMachines"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListMachines(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::edgecontainer::v1::Machine>(std::move(span), @@ -164,7 +164,7 @@ EdgeContainerTracingConnection::ListVpnConnections( google::cloud::edgecontainer::v1::ListVpnConnectionsRequest request) { auto span = internal::MakeSpan( "edgecontainer_v1::EdgeContainerConnection::ListVpnConnections"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListVpnConnections(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::edgecontainer::v1::VpnConnection>(std::move(span), @@ -186,7 +186,7 @@ EdgeContainerTracingConnection::CreateVpnConnection( request) { auto span = internal::MakeSpan( "edgecontainer_v1::EdgeContainerConnection::CreateVpnConnection"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateVpnConnection(request)); } @@ -197,7 +197,7 @@ EdgeContainerTracingConnection::DeleteVpnConnection( request) { auto span = internal::MakeSpan( "edgecontainer_v1::EdgeContainerConnection::DeleteVpnConnection"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteVpnConnection(request)); } diff --git a/google/cloud/edgecontainer/v1/internal/edge_container_tracing_stub.cc b/google/cloud/edgecontainer/v1/internal/edge_container_tracing_stub.cc index 22b7dd136cd8..8a4ab5a89726 100644 --- a/google/cloud/edgecontainer/v1/internal/edge_container_tracing_stub.cc +++ b/google/cloud/edgecontainer/v1/internal/edge_container_tracing_stub.cc @@ -61,10 +61,8 @@ EdgeContainerTracingStub::AsyncCreateCluster( google::cloud::edgecontainer::v1::CreateClusterRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.edgecontainer.v1.EdgeContainer", "CreateCluster"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateCluster(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -76,10 +74,8 @@ EdgeContainerTracingStub::AsyncUpdateCluster( google::cloud::edgecontainer::v1::UpdateClusterRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.edgecontainer.v1.EdgeContainer", "UpdateCluster"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateCluster(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -91,10 +87,8 @@ EdgeContainerTracingStub::AsyncDeleteCluster( google::cloud::edgecontainer::v1::DeleteClusterRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.edgecontainer.v1.EdgeContainer", "DeleteCluster"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteCluster(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -143,10 +137,8 @@ EdgeContainerTracingStub::AsyncCreateNodePool( google::cloud::edgecontainer::v1::CreateNodePoolRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.edgecontainer.v1.EdgeContainer", "CreateNodePool"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateNodePool(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -158,10 +150,8 @@ EdgeContainerTracingStub::AsyncUpdateNodePool( google::cloud::edgecontainer::v1::UpdateNodePoolRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.edgecontainer.v1.EdgeContainer", "UpdateNodePool"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateNodePool(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -173,10 +163,8 @@ EdgeContainerTracingStub::AsyncDeleteNodePool( google::cloud::edgecontainer::v1::DeleteNodePoolRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.edgecontainer.v1.EdgeContainer", "DeleteNodePool"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteNodePool(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -238,10 +226,8 @@ EdgeContainerTracingStub::AsyncCreateVpnConnection( request) { auto span = internal::MakeSpanGrpc( "google.cloud.edgecontainer.v1.EdgeContainer", "CreateVpnConnection"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateVpnConnection(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -254,10 +240,8 @@ EdgeContainerTracingStub::AsyncDeleteVpnConnection( request) { auto span = internal::MakeSpanGrpc( "google.cloud.edgecontainer.v1.EdgeContainer", "DeleteVpnConnection"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteVpnConnection(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -269,10 +253,8 @@ EdgeContainerTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -283,10 +265,8 @@ future EdgeContainerTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/essentialcontacts/v1/internal/essential_contacts_tracing_connection.cc b/google/cloud/essentialcontacts/v1/internal/essential_contacts_tracing_connection.cc index 4bfc1c6d4d41..b948ef7a2e27 100644 --- a/google/cloud/essentialcontacts/v1/internal/essential_contacts_tracing_connection.cc +++ b/google/cloud/essentialcontacts/v1/internal/essential_contacts_tracing_connection.cc @@ -60,7 +60,7 @@ EssentialContactsServiceTracingConnection::ListContacts( google::cloud::essentialcontacts::v1::ListContactsRequest request) { auto span = internal::MakeSpan( "essentialcontacts_v1::EssentialContactsServiceConnection::ListContacts"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListContacts(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::essentialcontacts::v1::Contact>(std::move(span), @@ -91,7 +91,7 @@ EssentialContactsServiceTracingConnection::ComputeContacts( auto span = internal::MakeSpan( "essentialcontacts_v1::EssentialContactsServiceConnection::" "ComputeContacts"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ComputeContacts(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::essentialcontacts::v1::Contact>(std::move(span), diff --git a/google/cloud/eventarc/v1/internal/eventarc_tracing_connection.cc b/google/cloud/eventarc/v1/internal/eventarc_tracing_connection.cc index 9366905e3729..9e2d7edd00e0 100644 --- a/google/cloud/eventarc/v1/internal/eventarc_tracing_connection.cc +++ b/google/cloud/eventarc/v1/internal/eventarc_tracing_connection.cc @@ -45,7 +45,7 @@ EventarcTracingConnection::ListTriggers( google::cloud::eventarc::v1::ListTriggersRequest request) { auto span = internal::MakeSpan("eventarc_v1::EventarcConnection::ListTriggers"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListTriggers(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -56,7 +56,7 @@ EventarcTracingConnection::CreateTrigger( google::cloud::eventarc::v1::CreateTriggerRequest const& request) { auto span = internal::MakeSpan("eventarc_v1::EventarcConnection::CreateTrigger"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateTrigger(request)); } @@ -65,7 +65,7 @@ EventarcTracingConnection::UpdateTrigger( google::cloud::eventarc::v1::UpdateTriggerRequest const& request) { auto span = internal::MakeSpan("eventarc_v1::EventarcConnection::UpdateTrigger"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateTrigger(request)); } @@ -74,7 +74,7 @@ EventarcTracingConnection::DeleteTrigger( google::cloud::eventarc::v1::DeleteTriggerRequest const& request) { auto span = internal::MakeSpan("eventarc_v1::EventarcConnection::DeleteTrigger"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteTrigger(request)); } @@ -91,7 +91,7 @@ EventarcTracingConnection::ListChannels( google::cloud::eventarc::v1::ListChannelsRequest request) { auto span = internal::MakeSpan("eventarc_v1::EventarcConnection::ListChannels"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListChannels(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -102,7 +102,7 @@ EventarcTracingConnection::CreateChannel( google::cloud::eventarc::v1::CreateChannelRequest const& request) { auto span = internal::MakeSpan("eventarc_v1::EventarcConnection::CreateChannel"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateChannel(request)); } @@ -111,7 +111,7 @@ EventarcTracingConnection::UpdateChannel( google::cloud::eventarc::v1::UpdateChannelRequest const& request) { auto span = internal::MakeSpan("eventarc_v1::EventarcConnection::UpdateChannel"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateChannel(request)); } @@ -120,7 +120,7 @@ EventarcTracingConnection::DeleteChannel( google::cloud::eventarc::v1::DeleteChannelRequest const& request) { auto span = internal::MakeSpan("eventarc_v1::EventarcConnection::DeleteChannel"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteChannel(request)); } @@ -138,7 +138,7 @@ EventarcTracingConnection::ListProviders( google::cloud::eventarc::v1::ListProvidersRequest request) { auto span = internal::MakeSpan("eventarc_v1::EventarcConnection::ListProviders"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListProviders(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -158,7 +158,7 @@ EventarcTracingConnection::ListChannelConnections( google::cloud::eventarc::v1::ListChannelConnectionsRequest request) { auto span = internal::MakeSpan( "eventarc_v1::EventarcConnection::ListChannelConnections"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListChannelConnections(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::eventarc::v1::ChannelConnection>(std::move(span), @@ -171,7 +171,7 @@ EventarcTracingConnection::CreateChannelConnection( request) { auto span = internal::MakeSpan( "eventarc_v1::EventarcConnection::CreateChannelConnection"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateChannelConnection(request)); } @@ -182,7 +182,7 @@ EventarcTracingConnection::DeleteChannelConnection( request) { auto span = internal::MakeSpan( "eventarc_v1::EventarcConnection::DeleteChannelConnection"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteChannelConnection(request)); } diff --git a/google/cloud/eventarc/v1/internal/eventarc_tracing_stub.cc b/google/cloud/eventarc/v1/internal/eventarc_tracing_stub.cc index 12f43e08e9ac..f508e59d6b88 100644 --- a/google/cloud/eventarc/v1/internal/eventarc_tracing_stub.cc +++ b/google/cloud/eventarc/v1/internal/eventarc_tracing_stub.cc @@ -59,10 +59,8 @@ EventarcTracingStub::AsyncCreateTrigger( google::cloud::eventarc::v1::CreateTriggerRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.eventarc.v1.Eventarc", "CreateTrigger"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateTrigger(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -74,10 +72,8 @@ EventarcTracingStub::AsyncUpdateTrigger( google::cloud::eventarc::v1::UpdateTriggerRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.eventarc.v1.Eventarc", "UpdateTrigger"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateTrigger(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -89,10 +85,8 @@ EventarcTracingStub::AsyncDeleteTrigger( google::cloud::eventarc::v1::DeleteTriggerRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.eventarc.v1.Eventarc", "DeleteTrigger"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteTrigger(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -127,10 +121,8 @@ EventarcTracingStub::AsyncCreateChannel( google::cloud::eventarc::v1::CreateChannelRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.eventarc.v1.Eventarc", "CreateChannel"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateChannel(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -142,10 +134,8 @@ EventarcTracingStub::AsyncUpdateChannel( google::cloud::eventarc::v1::UpdateChannelRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.eventarc.v1.Eventarc", "UpdateChannel"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateChannel(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -157,10 +147,8 @@ EventarcTracingStub::AsyncDeleteChannel( google::cloud::eventarc::v1::DeleteChannelRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.eventarc.v1.Eventarc", "DeleteChannel"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteChannel(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -221,10 +209,8 @@ EventarcTracingStub::AsyncCreateChannelConnection( request) { auto span = internal::MakeSpanGrpc("google.cloud.eventarc.v1.Eventarc", "CreateChannelConnection"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateChannelConnection(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -237,10 +223,8 @@ EventarcTracingStub::AsyncDeleteChannelConnection( request) { auto span = internal::MakeSpanGrpc("google.cloud.eventarc.v1.Eventarc", "DeleteChannelConnection"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteChannelConnection(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -277,10 +261,8 @@ EventarcTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -291,10 +273,8 @@ future EventarcTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/filestore/v1/internal/cloud_filestore_manager_tracing_connection.cc b/google/cloud/filestore/v1/internal/cloud_filestore_manager_tracing_connection.cc index 407083a8ad0c..ef798a880e23 100644 --- a/google/cloud/filestore/v1/internal/cloud_filestore_manager_tracing_connection.cc +++ b/google/cloud/filestore/v1/internal/cloud_filestore_manager_tracing_connection.cc @@ -37,7 +37,7 @@ CloudFilestoreManagerTracingConnection::ListInstances( google::cloud::filestore::v1::ListInstancesRequest request) { auto span = internal::MakeSpan( "filestore_v1::CloudFilestoreManagerConnection::ListInstances"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListInstances(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::filestore::v1::Instance>(std::move(span), std::move(sr)); @@ -57,7 +57,7 @@ CloudFilestoreManagerTracingConnection::CreateInstance( google::cloud::filestore::v1::CreateInstanceRequest const& request) { auto span = internal::MakeSpan( "filestore_v1::CloudFilestoreManagerConnection::CreateInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateInstance(request)); } @@ -66,7 +66,7 @@ CloudFilestoreManagerTracingConnection::UpdateInstance( google::cloud::filestore::v1::UpdateInstanceRequest const& request) { auto span = internal::MakeSpan( "filestore_v1::CloudFilestoreManagerConnection::UpdateInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateInstance(request)); } @@ -75,7 +75,7 @@ CloudFilestoreManagerTracingConnection::RestoreInstance( google::cloud::filestore::v1::RestoreInstanceRequest const& request) { auto span = internal::MakeSpan( "filestore_v1::CloudFilestoreManagerConnection::RestoreInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RestoreInstance(request)); } @@ -84,7 +84,7 @@ CloudFilestoreManagerTracingConnection::DeleteInstance( google::cloud::filestore::v1::DeleteInstanceRequest const& request) { auto span = internal::MakeSpan( "filestore_v1::CloudFilestoreManagerConnection::DeleteInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteInstance(request)); } @@ -93,7 +93,7 @@ CloudFilestoreManagerTracingConnection::ListSnapshots( google::cloud::filestore::v1::ListSnapshotsRequest request) { auto span = internal::MakeSpan( "filestore_v1::CloudFilestoreManagerConnection::ListSnapshots"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListSnapshots(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::filestore::v1::Snapshot>(std::move(span), std::move(sr)); @@ -113,7 +113,7 @@ CloudFilestoreManagerTracingConnection::CreateSnapshot( google::cloud::filestore::v1::CreateSnapshotRequest const& request) { auto span = internal::MakeSpan( "filestore_v1::CloudFilestoreManagerConnection::CreateSnapshot"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateSnapshot(request)); } @@ -122,7 +122,7 @@ CloudFilestoreManagerTracingConnection::DeleteSnapshot( google::cloud::filestore::v1::DeleteSnapshotRequest const& request) { auto span = internal::MakeSpan( "filestore_v1::CloudFilestoreManagerConnection::DeleteSnapshot"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteSnapshot(request)); } @@ -131,7 +131,7 @@ CloudFilestoreManagerTracingConnection::UpdateSnapshot( google::cloud::filestore::v1::UpdateSnapshotRequest const& request) { auto span = internal::MakeSpan( "filestore_v1::CloudFilestoreManagerConnection::UpdateSnapshot"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateSnapshot(request)); } @@ -140,7 +140,7 @@ CloudFilestoreManagerTracingConnection::ListBackups( google::cloud::filestore::v1::ListBackupsRequest request) { auto span = internal::MakeSpan( "filestore_v1::CloudFilestoreManagerConnection::ListBackups"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListBackups(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -160,7 +160,7 @@ CloudFilestoreManagerTracingConnection::CreateBackup( google::cloud::filestore::v1::CreateBackupRequest const& request) { auto span = internal::MakeSpan( "filestore_v1::CloudFilestoreManagerConnection::CreateBackup"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateBackup(request)); } @@ -169,7 +169,7 @@ CloudFilestoreManagerTracingConnection::DeleteBackup( google::cloud::filestore::v1::DeleteBackupRequest const& request) { auto span = internal::MakeSpan( "filestore_v1::CloudFilestoreManagerConnection::DeleteBackup"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteBackup(request)); } @@ -178,7 +178,7 @@ CloudFilestoreManagerTracingConnection::UpdateBackup( google::cloud::filestore::v1::UpdateBackupRequest const& request) { auto span = internal::MakeSpan( "filestore_v1::CloudFilestoreManagerConnection::UpdateBackup"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateBackup(request)); } diff --git a/google/cloud/filestore/v1/internal/cloud_filestore_manager_tracing_stub.cc b/google/cloud/filestore/v1/internal/cloud_filestore_manager_tracing_stub.cc index dedb7f26b2f2..09ad3fdf309b 100644 --- a/google/cloud/filestore/v1/internal/cloud_filestore_manager_tracing_stub.cc +++ b/google/cloud/filestore/v1/internal/cloud_filestore_manager_tracing_stub.cc @@ -61,10 +61,8 @@ CloudFilestoreManagerTracingStub::AsyncCreateInstance( google::cloud::filestore::v1::CreateInstanceRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.filestore.v1.CloudFilestoreManager", "CreateInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -76,10 +74,8 @@ CloudFilestoreManagerTracingStub::AsyncUpdateInstance( google::cloud::filestore::v1::UpdateInstanceRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.filestore.v1.CloudFilestoreManager", "UpdateInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -91,10 +87,8 @@ CloudFilestoreManagerTracingStub::AsyncRestoreInstance( google::cloud::filestore::v1::RestoreInstanceRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.filestore.v1.CloudFilestoreManager", "RestoreInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncRestoreInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -106,10 +100,8 @@ CloudFilestoreManagerTracingStub::AsyncDeleteInstance( google::cloud::filestore::v1::DeleteInstanceRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.filestore.v1.CloudFilestoreManager", "DeleteInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -145,10 +137,8 @@ CloudFilestoreManagerTracingStub::AsyncCreateSnapshot( google::cloud::filestore::v1::CreateSnapshotRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.filestore.v1.CloudFilestoreManager", "CreateSnapshot"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateSnapshot(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -160,10 +150,8 @@ CloudFilestoreManagerTracingStub::AsyncDeleteSnapshot( google::cloud::filestore::v1::DeleteSnapshotRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.filestore.v1.CloudFilestoreManager", "DeleteSnapshot"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteSnapshot(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -175,10 +163,8 @@ CloudFilestoreManagerTracingStub::AsyncUpdateSnapshot( google::cloud::filestore::v1::UpdateSnapshotRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.filestore.v1.CloudFilestoreManager", "UpdateSnapshot"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateSnapshot(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -213,10 +199,8 @@ CloudFilestoreManagerTracingStub::AsyncCreateBackup( google::cloud::filestore::v1::CreateBackupRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.filestore.v1.CloudFilestoreManager", "CreateBackup"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateBackup(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -228,10 +212,8 @@ CloudFilestoreManagerTracingStub::AsyncDeleteBackup( google::cloud::filestore::v1::DeleteBackupRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.filestore.v1.CloudFilestoreManager", "DeleteBackup"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteBackup(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -243,10 +225,8 @@ CloudFilestoreManagerTracingStub::AsyncUpdateBackup( google::cloud::filestore::v1::UpdateBackupRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.filestore.v1.CloudFilestoreManager", "UpdateBackup"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateBackup(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -258,10 +238,8 @@ CloudFilestoreManagerTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -272,10 +250,8 @@ future CloudFilestoreManagerTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/functions/v1/internal/cloud_functions_tracing_connection.cc b/google/cloud/functions/v1/internal/cloud_functions_tracing_connection.cc index e181ffc8bf53..39d882b920a4 100644 --- a/google/cloud/functions/v1/internal/cloud_functions_tracing_connection.cc +++ b/google/cloud/functions/v1/internal/cloud_functions_tracing_connection.cc @@ -37,7 +37,7 @@ CloudFunctionsServiceTracingConnection::ListFunctions( google::cloud::functions::v1::ListFunctionsRequest request) { auto span = internal::MakeSpan( "functions_v1::CloudFunctionsServiceConnection::ListFunctions"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListFunctions(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::functions::v1::CloudFunction>(std::move(span), @@ -58,7 +58,7 @@ CloudFunctionsServiceTracingConnection::CreateFunction( google::cloud::functions::v1::CreateFunctionRequest const& request) { auto span = internal::MakeSpan( "functions_v1::CloudFunctionsServiceConnection::CreateFunction"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateFunction(request)); } @@ -67,7 +67,7 @@ CloudFunctionsServiceTracingConnection::UpdateFunction( google::cloud::functions::v1::UpdateFunctionRequest const& request) { auto span = internal::MakeSpan( "functions_v1::CloudFunctionsServiceConnection::UpdateFunction"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateFunction(request)); } @@ -76,7 +76,7 @@ CloudFunctionsServiceTracingConnection::DeleteFunction( google::cloud::functions::v1::DeleteFunctionRequest const& request) { auto span = internal::MakeSpan( "functions_v1::CloudFunctionsServiceConnection::DeleteFunction"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteFunction(request)); } diff --git a/google/cloud/functions/v1/internal/cloud_functions_tracing_stub.cc b/google/cloud/functions/v1/internal/cloud_functions_tracing_stub.cc index 05efc5dc2614..cbead6a0aa7c 100644 --- a/google/cloud/functions/v1/internal/cloud_functions_tracing_stub.cc +++ b/google/cloud/functions/v1/internal/cloud_functions_tracing_stub.cc @@ -61,10 +61,8 @@ CloudFunctionsServiceTracingStub::AsyncCreateFunction( google::cloud::functions::v1::CreateFunctionRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.functions.v1.CloudFunctionsService", "CreateFunction"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateFunction(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -76,10 +74,8 @@ CloudFunctionsServiceTracingStub::AsyncUpdateFunction( google::cloud::functions::v1::UpdateFunctionRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.functions.v1.CloudFunctionsService", "UpdateFunction"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateFunction(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -91,10 +87,8 @@ CloudFunctionsServiceTracingStub::AsyncDeleteFunction( google::cloud::functions::v1::DeleteFunctionRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.functions.v1.CloudFunctionsService", "DeleteFunction"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteFunction(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -178,10 +172,8 @@ CloudFunctionsServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -192,10 +184,8 @@ future CloudFunctionsServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/functions/v2/internal/function_tracing_connection.cc b/google/cloud/functions/v2/internal/function_tracing_connection.cc index ea372663f0de..db81192750fb 100644 --- a/google/cloud/functions/v2/internal/function_tracing_connection.cc +++ b/google/cloud/functions/v2/internal/function_tracing_connection.cc @@ -46,7 +46,7 @@ FunctionServiceTracingConnection::ListFunctions( google::cloud::functions::v2::ListFunctionsRequest request) { auto span = internal::MakeSpan( "functions_v2::FunctionServiceConnection::ListFunctions"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListFunctions(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::functions::v2::Function>(std::move(span), std::move(sr)); @@ -57,7 +57,7 @@ FunctionServiceTracingConnection::CreateFunction( google::cloud::functions::v2::CreateFunctionRequest const& request) { auto span = internal::MakeSpan( "functions_v2::FunctionServiceConnection::CreateFunction"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateFunction(request)); } @@ -66,7 +66,7 @@ FunctionServiceTracingConnection::UpdateFunction( google::cloud::functions::v2::UpdateFunctionRequest const& request) { auto span = internal::MakeSpan( "functions_v2::FunctionServiceConnection::UpdateFunction"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateFunction(request)); } @@ -75,7 +75,7 @@ FunctionServiceTracingConnection::DeleteFunction( google::cloud::functions::v2::DeleteFunctionRequest const& request) { auto span = internal::MakeSpan( "functions_v2::FunctionServiceConnection::DeleteFunction"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteFunction(request)); } diff --git a/google/cloud/functions/v2/internal/function_tracing_stub.cc b/google/cloud/functions/v2/internal/function_tracing_stub.cc index 4ed44aa595e2..0d4a1cf6e1f7 100644 --- a/google/cloud/functions/v2/internal/function_tracing_stub.cc +++ b/google/cloud/functions/v2/internal/function_tracing_stub.cc @@ -61,10 +61,8 @@ FunctionServiceTracingStub::AsyncCreateFunction( google::cloud::functions::v2::CreateFunctionRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.functions.v2.FunctionService", "CreateFunction"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateFunction(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -76,10 +74,8 @@ FunctionServiceTracingStub::AsyncUpdateFunction( google::cloud::functions::v2::UpdateFunctionRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.functions.v2.FunctionService", "UpdateFunction"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateFunction(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -91,10 +87,8 @@ FunctionServiceTracingStub::AsyncDeleteFunction( google::cloud::functions::v2::DeleteFunctionRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.functions.v2.FunctionService", "DeleteFunction"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteFunction(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -142,10 +136,8 @@ FunctionServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -156,10 +148,8 @@ future FunctionServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/gkebackup/v1/internal/backup_for_gke_tracing_connection.cc b/google/cloud/gkebackup/v1/internal/backup_for_gke_tracing_connection.cc index 897535d50019..84aed97c9b05 100644 --- a/google/cloud/gkebackup/v1/internal/backup_for_gke_tracing_connection.cc +++ b/google/cloud/gkebackup/v1/internal/backup_for_gke_tracing_connection.cc @@ -37,7 +37,7 @@ BackupForGKETracingConnection::CreateBackupPlan( google::cloud::gkebackup::v1::CreateBackupPlanRequest const& request) { auto span = internal::MakeSpan( "gkebackup_v1::BackupForGKEConnection::CreateBackupPlan"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateBackupPlan(request)); } @@ -46,7 +46,7 @@ BackupForGKETracingConnection::ListBackupPlans( google::cloud::gkebackup::v1::ListBackupPlansRequest request) { auto span = internal::MakeSpan( "gkebackup_v1::BackupForGKEConnection::ListBackupPlans"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListBackupPlans(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::gkebackup::v1::BackupPlan>(std::move(span), std::move(sr)); @@ -66,7 +66,7 @@ BackupForGKETracingConnection::UpdateBackupPlan( google::cloud::gkebackup::v1::UpdateBackupPlanRequest const& request) { auto span = internal::MakeSpan( "gkebackup_v1::BackupForGKEConnection::UpdateBackupPlan"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateBackupPlan(request)); } @@ -75,7 +75,7 @@ BackupForGKETracingConnection::DeleteBackupPlan( google::cloud::gkebackup::v1::DeleteBackupPlanRequest const& request) { auto span = internal::MakeSpan( "gkebackup_v1::BackupForGKEConnection::DeleteBackupPlan"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteBackupPlan(request)); } @@ -84,7 +84,7 @@ BackupForGKETracingConnection::CreateBackup( google::cloud::gkebackup::v1::CreateBackupRequest const& request) { auto span = internal::MakeSpan("gkebackup_v1::BackupForGKEConnection::CreateBackup"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateBackup(request)); } @@ -93,7 +93,7 @@ BackupForGKETracingConnection::ListBackups( google::cloud::gkebackup::v1::ListBackupsRequest request) { auto span = internal::MakeSpan("gkebackup_v1::BackupForGKEConnection::ListBackups"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListBackups(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -113,7 +113,7 @@ BackupForGKETracingConnection::UpdateBackup( google::cloud::gkebackup::v1::UpdateBackupRequest const& request) { auto span = internal::MakeSpan("gkebackup_v1::BackupForGKEConnection::UpdateBackup"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateBackup(request)); } @@ -122,7 +122,7 @@ BackupForGKETracingConnection::DeleteBackup( google::cloud::gkebackup::v1::DeleteBackupRequest const& request) { auto span = internal::MakeSpan("gkebackup_v1::BackupForGKEConnection::DeleteBackup"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteBackup(request)); } @@ -131,7 +131,7 @@ BackupForGKETracingConnection::ListVolumeBackups( google::cloud::gkebackup::v1::ListVolumeBackupsRequest request) { auto span = internal::MakeSpan( "gkebackup_v1::BackupForGKEConnection::ListVolumeBackups"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListVolumeBackups(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::gkebackup::v1::VolumeBackup>(std::move(span), @@ -152,7 +152,7 @@ BackupForGKETracingConnection::CreateRestorePlan( google::cloud::gkebackup::v1::CreateRestorePlanRequest const& request) { auto span = internal::MakeSpan( "gkebackup_v1::BackupForGKEConnection::CreateRestorePlan"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateRestorePlan(request)); } @@ -161,7 +161,7 @@ BackupForGKETracingConnection::ListRestorePlans( google::cloud::gkebackup::v1::ListRestorePlansRequest request) { auto span = internal::MakeSpan( "gkebackup_v1::BackupForGKEConnection::ListRestorePlans"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListRestorePlans(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::gkebackup::v1::RestorePlan>(std::move(span), @@ -182,7 +182,7 @@ BackupForGKETracingConnection::UpdateRestorePlan( google::cloud::gkebackup::v1::UpdateRestorePlanRequest const& request) { auto span = internal::MakeSpan( "gkebackup_v1::BackupForGKEConnection::UpdateRestorePlan"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateRestorePlan(request)); } @@ -191,7 +191,7 @@ BackupForGKETracingConnection::DeleteRestorePlan( google::cloud::gkebackup::v1::DeleteRestorePlanRequest const& request) { auto span = internal::MakeSpan( "gkebackup_v1::BackupForGKEConnection::DeleteRestorePlan"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteRestorePlan(request)); } @@ -200,7 +200,7 @@ BackupForGKETracingConnection::CreateRestore( google::cloud::gkebackup::v1::CreateRestoreRequest const& request) { auto span = internal::MakeSpan("gkebackup_v1::BackupForGKEConnection::CreateRestore"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateRestore(request)); } @@ -209,7 +209,7 @@ BackupForGKETracingConnection::ListRestores( google::cloud::gkebackup::v1::ListRestoresRequest request) { auto span = internal::MakeSpan("gkebackup_v1::BackupForGKEConnection::ListRestores"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListRestores(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -229,7 +229,7 @@ BackupForGKETracingConnection::UpdateRestore( google::cloud::gkebackup::v1::UpdateRestoreRequest const& request) { auto span = internal::MakeSpan("gkebackup_v1::BackupForGKEConnection::UpdateRestore"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateRestore(request)); } @@ -238,7 +238,7 @@ BackupForGKETracingConnection::DeleteRestore( google::cloud::gkebackup::v1::DeleteRestoreRequest const& request) { auto span = internal::MakeSpan("gkebackup_v1::BackupForGKEConnection::DeleteRestore"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteRestore(request)); } @@ -247,7 +247,7 @@ BackupForGKETracingConnection::ListVolumeRestores( google::cloud::gkebackup::v1::ListVolumeRestoresRequest request) { auto span = internal::MakeSpan( "gkebackup_v1::BackupForGKEConnection::ListVolumeRestores"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListVolumeRestores(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::gkebackup::v1::VolumeRestore>(std::move(span), diff --git a/google/cloud/gkebackup/v1/internal/backup_for_gke_tracing_stub.cc b/google/cloud/gkebackup/v1/internal/backup_for_gke_tracing_stub.cc index 69f9abe0536e..bf7e7f008c0a 100644 --- a/google/cloud/gkebackup/v1/internal/backup_for_gke_tracing_stub.cc +++ b/google/cloud/gkebackup/v1/internal/backup_for_gke_tracing_stub.cc @@ -37,10 +37,8 @@ BackupForGKETracingStub::AsyncCreateBackupPlan( google::cloud::gkebackup::v1::CreateBackupPlanRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.gkebackup.v1.BackupForGKE", "CreateBackupPlan"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateBackupPlan(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -76,10 +74,8 @@ BackupForGKETracingStub::AsyncUpdateBackupPlan( google::cloud::gkebackup::v1::UpdateBackupPlanRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.gkebackup.v1.BackupForGKE", "UpdateBackupPlan"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateBackupPlan(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -91,10 +87,8 @@ BackupForGKETracingStub::AsyncDeleteBackupPlan( google::cloud::gkebackup::v1::DeleteBackupPlanRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.gkebackup.v1.BackupForGKE", "DeleteBackupPlan"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteBackupPlan(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -106,10 +100,8 @@ BackupForGKETracingStub::AsyncCreateBackup( google::cloud::gkebackup::v1::CreateBackupRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.gkebackup.v1.BackupForGKE", "CreateBackup"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateBackup(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -144,10 +136,8 @@ BackupForGKETracingStub::AsyncUpdateBackup( google::cloud::gkebackup::v1::UpdateBackupRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.gkebackup.v1.BackupForGKE", "UpdateBackup"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateBackup(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -159,10 +149,8 @@ BackupForGKETracingStub::AsyncDeleteBackup( google::cloud::gkebackup::v1::DeleteBackupRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.gkebackup.v1.BackupForGKE", "DeleteBackup"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteBackup(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -198,10 +186,8 @@ BackupForGKETracingStub::AsyncCreateRestorePlan( google::cloud::gkebackup::v1::CreateRestorePlanRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.gkebackup.v1.BackupForGKE", "CreateRestorePlan"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateRestorePlan(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -237,10 +223,8 @@ BackupForGKETracingStub::AsyncUpdateRestorePlan( google::cloud::gkebackup::v1::UpdateRestorePlanRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.gkebackup.v1.BackupForGKE", "UpdateRestorePlan"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateRestorePlan(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -252,10 +236,8 @@ BackupForGKETracingStub::AsyncDeleteRestorePlan( google::cloud::gkebackup::v1::DeleteRestorePlanRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.gkebackup.v1.BackupForGKE", "DeleteRestorePlan"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteRestorePlan(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -267,10 +249,8 @@ BackupForGKETracingStub::AsyncCreateRestore( google::cloud::gkebackup::v1::CreateRestoreRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.gkebackup.v1.BackupForGKE", "CreateRestore"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateRestore(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -306,10 +286,8 @@ BackupForGKETracingStub::AsyncUpdateRestore( google::cloud::gkebackup::v1::UpdateRestoreRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.gkebackup.v1.BackupForGKE", "UpdateRestore"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateRestore(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -321,10 +299,8 @@ BackupForGKETracingStub::AsyncDeleteRestore( google::cloud::gkebackup::v1::DeleteRestoreRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.gkebackup.v1.BackupForGKE", "DeleteRestore"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteRestore(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -360,10 +336,8 @@ BackupForGKETracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -374,10 +348,8 @@ future BackupForGKETracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/gkehub/v1/internal/gke_hub_tracing_connection.cc b/google/cloud/gkehub/v1/internal/gke_hub_tracing_connection.cc index a164ebe5b893..541bd9b86f13 100644 --- a/google/cloud/gkehub/v1/internal/gke_hub_tracing_connection.cc +++ b/google/cloud/gkehub/v1/internal/gke_hub_tracing_connection.cc @@ -37,7 +37,7 @@ GkeHubTracingConnection::ListMemberships( google::cloud::gkehub::v1::ListMembershipsRequest request) { auto span = internal::MakeSpan("gkehub_v1::GkeHubConnection::ListMemberships"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListMemberships(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -47,7 +47,7 @@ StreamRange GkeHubTracingConnection::ListFeatures( google::cloud::gkehub::v1::ListFeaturesRequest request) { auto span = internal::MakeSpan("gkehub_v1::GkeHubConnection::ListFeatures"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListFeatures(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -74,7 +74,7 @@ GkeHubTracingConnection::CreateMembership( google::cloud::gkehub::v1::CreateMembershipRequest const& request) { auto span = internal::MakeSpan("gkehub_v1::GkeHubConnection::CreateMembership"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateMembership(request)); } @@ -82,7 +82,7 @@ future> GkeHubTracingConnection::CreateFeature( google::cloud::gkehub::v1::CreateFeatureRequest const& request) { auto span = internal::MakeSpan("gkehub_v1::GkeHubConnection::CreateFeature"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateFeature(request)); } @@ -91,7 +91,7 @@ GkeHubTracingConnection::DeleteMembership( google::cloud::gkehub::v1::DeleteMembershipRequest const& request) { auto span = internal::MakeSpan("gkehub_v1::GkeHubConnection::DeleteMembership"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteMembership(request)); } @@ -99,7 +99,7 @@ future> GkeHubTracingConnection::DeleteFeature( google::cloud::gkehub::v1::DeleteFeatureRequest const& request) { auto span = internal::MakeSpan("gkehub_v1::GkeHubConnection::DeleteFeature"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteFeature(request)); } @@ -108,7 +108,7 @@ GkeHubTracingConnection::UpdateMembership( google::cloud::gkehub::v1::UpdateMembershipRequest const& request) { auto span = internal::MakeSpan("gkehub_v1::GkeHubConnection::UpdateMembership"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateMembership(request)); } @@ -116,7 +116,7 @@ future> GkeHubTracingConnection::UpdateFeature( google::cloud::gkehub::v1::UpdateFeatureRequest const& request) { auto span = internal::MakeSpan("gkehub_v1::GkeHubConnection::UpdateFeature"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateFeature(request)); } diff --git a/google/cloud/gkehub/v1/internal/gke_hub_tracing_stub.cc b/google/cloud/gkehub/v1/internal/gke_hub_tracing_stub.cc index 3d1a14ce1ed6..66d66c5e375f 100644 --- a/google/cloud/gkehub/v1/internal/gke_hub_tracing_stub.cc +++ b/google/cloud/gkehub/v1/internal/gke_hub_tracing_stub.cc @@ -83,10 +83,8 @@ GkeHubTracingStub::AsyncCreateMembership( google::cloud::gkehub::v1::CreateMembershipRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.gkehub.v1.GkeHub", "CreateMembership"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateMembership(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -98,10 +96,8 @@ GkeHubTracingStub::AsyncCreateFeature( google::cloud::gkehub::v1::CreateFeatureRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.gkehub.v1.GkeHub", "CreateFeature"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateFeature(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -113,10 +109,8 @@ GkeHubTracingStub::AsyncDeleteMembership( google::cloud::gkehub::v1::DeleteMembershipRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.gkehub.v1.GkeHub", "DeleteMembership"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteMembership(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -128,10 +122,8 @@ GkeHubTracingStub::AsyncDeleteFeature( google::cloud::gkehub::v1::DeleteFeatureRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.gkehub.v1.GkeHub", "DeleteFeature"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteFeature(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -143,10 +135,8 @@ GkeHubTracingStub::AsyncUpdateMembership( google::cloud::gkehub::v1::UpdateMembershipRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.gkehub.v1.GkeHub", "UpdateMembership"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateMembership(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -158,10 +148,8 @@ GkeHubTracingStub::AsyncUpdateFeature( google::cloud::gkehub::v1::UpdateFeatureRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.gkehub.v1.GkeHub", "UpdateFeature"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateFeature(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -185,10 +173,8 @@ GkeHubTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -199,10 +185,8 @@ future GkeHubTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/gkemulticloud/v1/internal/attached_clusters_tracing_connection.cc b/google/cloud/gkemulticloud/v1/internal/attached_clusters_tracing_connection.cc index f1da2019b8cc..c6651f377a2f 100644 --- a/google/cloud/gkemulticloud/v1/internal/attached_clusters_tracing_connection.cc +++ b/google/cloud/gkemulticloud/v1/internal/attached_clusters_tracing_connection.cc @@ -38,7 +38,7 @@ AttachedClustersTracingConnection::CreateAttachedCluster( request) { auto span = internal::MakeSpan( "gkemulticloud_v1::AttachedClustersConnection::CreateAttachedCluster"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateAttachedCluster(request)); } @@ -49,7 +49,7 @@ AttachedClustersTracingConnection::UpdateAttachedCluster( request) { auto span = internal::MakeSpan( "gkemulticloud_v1::AttachedClustersConnection::UpdateAttachedCluster"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateAttachedCluster(request)); } @@ -60,7 +60,7 @@ AttachedClustersTracingConnection::ImportAttachedCluster( request) { auto span = internal::MakeSpan( "gkemulticloud_v1::AttachedClustersConnection::ImportAttachedCluster"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ImportAttachedCluster(request)); } @@ -80,7 +80,7 @@ AttachedClustersTracingConnection::ListAttachedClusters( google::cloud::gkemulticloud::v1::ListAttachedClustersRequest request) { auto span = internal::MakeSpan( "gkemulticloud_v1::AttachedClustersConnection::ListAttachedClusters"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListAttachedClusters(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::gkemulticloud::v1::AttachedCluster>(std::move(span), @@ -93,7 +93,7 @@ AttachedClustersTracingConnection::DeleteAttachedCluster( request) { auto span = internal::MakeSpan( "gkemulticloud_v1::AttachedClustersConnection::DeleteAttachedCluster"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteAttachedCluster(request)); } diff --git a/google/cloud/gkemulticloud/v1/internal/attached_clusters_tracing_stub.cc b/google/cloud/gkemulticloud/v1/internal/attached_clusters_tracing_stub.cc index f449c3131828..ceb6f43cabee 100644 --- a/google/cloud/gkemulticloud/v1/internal/attached_clusters_tracing_stub.cc +++ b/google/cloud/gkemulticloud/v1/internal/attached_clusters_tracing_stub.cc @@ -39,10 +39,8 @@ AttachedClustersTracingStub::AsyncCreateAttachedCluster( auto span = internal::MakeSpanGrpc("google.cloud.gkemulticloud.v1.AttachedClusters", "CreateAttachedCluster"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateAttachedCluster(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -56,10 +54,8 @@ AttachedClustersTracingStub::AsyncUpdateAttachedCluster( auto span = internal::MakeSpanGrpc("google.cloud.gkemulticloud.v1.AttachedClusters", "UpdateAttachedCluster"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateAttachedCluster(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -73,10 +69,8 @@ AttachedClustersTracingStub::AsyncImportAttachedCluster( auto span = internal::MakeSpanGrpc("google.cloud.gkemulticloud.v1.AttachedClusters", "ImportAttachedCluster"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncImportAttachedCluster(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -116,10 +110,8 @@ AttachedClustersTracingStub::AsyncDeleteAttachedCluster( auto span = internal::MakeSpanGrpc("google.cloud.gkemulticloud.v1.AttachedClusters", "DeleteAttachedCluster"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteAttachedCluster(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -161,10 +153,8 @@ AttachedClustersTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -175,10 +165,8 @@ future AttachedClustersTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/gkemulticloud/v1/internal/aws_clusters_tracing_connection.cc b/google/cloud/gkemulticloud/v1/internal/aws_clusters_tracing_connection.cc index 6627a42982f3..9e0272ccfd48 100644 --- a/google/cloud/gkemulticloud/v1/internal/aws_clusters_tracing_connection.cc +++ b/google/cloud/gkemulticloud/v1/internal/aws_clusters_tracing_connection.cc @@ -37,7 +37,7 @@ AwsClustersTracingConnection::CreateAwsCluster( google::cloud::gkemulticloud::v1::CreateAwsClusterRequest const& request) { auto span = internal::MakeSpan( "gkemulticloud_v1::AwsClustersConnection::CreateAwsCluster"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateAwsCluster(request)); } @@ -46,7 +46,7 @@ AwsClustersTracingConnection::UpdateAwsCluster( google::cloud::gkemulticloud::v1::UpdateAwsClusterRequest const& request) { auto span = internal::MakeSpan( "gkemulticloud_v1::AwsClustersConnection::UpdateAwsCluster"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateAwsCluster(request)); } @@ -64,7 +64,7 @@ AwsClustersTracingConnection::ListAwsClusters( google::cloud::gkemulticloud::v1::ListAwsClustersRequest request) { auto span = internal::MakeSpan( "gkemulticloud_v1::AwsClustersConnection::ListAwsClusters"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListAwsClusters(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::gkemulticloud::v1::AwsCluster>(std::move(span), @@ -76,7 +76,7 @@ AwsClustersTracingConnection::DeleteAwsCluster( google::cloud::gkemulticloud::v1::DeleteAwsClusterRequest const& request) { auto span = internal::MakeSpan( "gkemulticloud_v1::AwsClustersConnection::DeleteAwsCluster"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteAwsCluster(request)); } @@ -95,7 +95,7 @@ AwsClustersTracingConnection::CreateAwsNodePool( google::cloud::gkemulticloud::v1::CreateAwsNodePoolRequest const& request) { auto span = internal::MakeSpan( "gkemulticloud_v1::AwsClustersConnection::CreateAwsNodePool"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateAwsNodePool(request)); } @@ -104,7 +104,7 @@ AwsClustersTracingConnection::UpdateAwsNodePool( google::cloud::gkemulticloud::v1::UpdateAwsNodePoolRequest const& request) { auto span = internal::MakeSpan( "gkemulticloud_v1::AwsClustersConnection::UpdateAwsNodePool"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateAwsNodePool(request)); } @@ -122,7 +122,7 @@ AwsClustersTracingConnection::ListAwsNodePools( google::cloud::gkemulticloud::v1::ListAwsNodePoolsRequest request) { auto span = internal::MakeSpan( "gkemulticloud_v1::AwsClustersConnection::ListAwsNodePools"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListAwsNodePools(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::gkemulticloud::v1::AwsNodePool>(std::move(span), @@ -134,7 +134,7 @@ AwsClustersTracingConnection::DeleteAwsNodePool( google::cloud::gkemulticloud::v1::DeleteAwsNodePoolRequest const& request) { auto span = internal::MakeSpan( "gkemulticloud_v1::AwsClustersConnection::DeleteAwsNodePool"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteAwsNodePool(request)); } diff --git a/google/cloud/gkemulticloud/v1/internal/aws_clusters_tracing_stub.cc b/google/cloud/gkemulticloud/v1/internal/aws_clusters_tracing_stub.cc index bac78a5439e7..7d006d9dcf40 100644 --- a/google/cloud/gkemulticloud/v1/internal/aws_clusters_tracing_stub.cc +++ b/google/cloud/gkemulticloud/v1/internal/aws_clusters_tracing_stub.cc @@ -37,10 +37,8 @@ AwsClustersTracingStub::AsyncCreateAwsCluster( google::cloud::gkemulticloud::v1::CreateAwsClusterRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.gkemulticloud.v1.AwsClusters", "CreateAwsCluster"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateAwsCluster(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -52,10 +50,8 @@ AwsClustersTracingStub::AsyncUpdateAwsCluster( google::cloud::gkemulticloud::v1::UpdateAwsClusterRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.gkemulticloud.v1.AwsClusters", "UpdateAwsCluster"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateAwsCluster(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -91,10 +87,8 @@ AwsClustersTracingStub::AsyncDeleteAwsCluster( google::cloud::gkemulticloud::v1::DeleteAwsClusterRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.gkemulticloud.v1.AwsClusters", "DeleteAwsCluster"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteAwsCluster(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -119,10 +113,8 @@ AwsClustersTracingStub::AsyncCreateAwsNodePool( google::cloud::gkemulticloud::v1::CreateAwsNodePoolRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.gkemulticloud.v1.AwsClusters", "CreateAwsNodePool"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateAwsNodePool(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -134,10 +126,8 @@ AwsClustersTracingStub::AsyncUpdateAwsNodePool( google::cloud::gkemulticloud::v1::UpdateAwsNodePoolRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.gkemulticloud.v1.AwsClusters", "UpdateAwsNodePool"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateAwsNodePool(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -173,10 +163,8 @@ AwsClustersTracingStub::AsyncDeleteAwsNodePool( google::cloud::gkemulticloud::v1::DeleteAwsNodePoolRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.gkemulticloud.v1.AwsClusters", "DeleteAwsNodePool"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteAwsNodePool(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -201,10 +189,8 @@ AwsClustersTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -215,10 +201,8 @@ future AwsClustersTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/gkemulticloud/v1/internal/azure_clusters_tracing_connection.cc b/google/cloud/gkemulticloud/v1/internal/azure_clusters_tracing_connection.cc index 28da94f66542..de2a2c7a441b 100644 --- a/google/cloud/gkemulticloud/v1/internal/azure_clusters_tracing_connection.cc +++ b/google/cloud/gkemulticloud/v1/internal/azure_clusters_tracing_connection.cc @@ -37,7 +37,7 @@ AzureClustersTracingConnection::CreateAzureClient( google::cloud::gkemulticloud::v1::CreateAzureClientRequest const& request) { auto span = internal::MakeSpan( "gkemulticloud_v1::AzureClustersConnection::CreateAzureClient"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateAzureClient(request)); } @@ -55,7 +55,7 @@ AzureClustersTracingConnection::ListAzureClients( google::cloud::gkemulticloud::v1::ListAzureClientsRequest request) { auto span = internal::MakeSpan( "gkemulticloud_v1::AzureClustersConnection::ListAzureClients"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListAzureClients(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::gkemulticloud::v1::AzureClient>(std::move(span), @@ -67,7 +67,7 @@ AzureClustersTracingConnection::DeleteAzureClient( google::cloud::gkemulticloud::v1::DeleteAzureClientRequest const& request) { auto span = internal::MakeSpan( "gkemulticloud_v1::AzureClustersConnection::DeleteAzureClient"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteAzureClient(request)); } @@ -77,7 +77,7 @@ AzureClustersTracingConnection::CreateAzureCluster( request) { auto span = internal::MakeSpan( "gkemulticloud_v1::AzureClustersConnection::CreateAzureCluster"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateAzureCluster(request)); } @@ -88,7 +88,7 @@ AzureClustersTracingConnection::UpdateAzureCluster( request) { auto span = internal::MakeSpan( "gkemulticloud_v1::AzureClustersConnection::UpdateAzureCluster"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateAzureCluster(request)); } @@ -107,7 +107,7 @@ AzureClustersTracingConnection::ListAzureClusters( google::cloud::gkemulticloud::v1::ListAzureClustersRequest request) { auto span = internal::MakeSpan( "gkemulticloud_v1::AzureClustersConnection::ListAzureClusters"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListAzureClusters(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::gkemulticloud::v1::AzureCluster>(std::move(span), @@ -120,7 +120,7 @@ AzureClustersTracingConnection::DeleteAzureCluster( request) { auto span = internal::MakeSpan( "gkemulticloud_v1::AzureClustersConnection::DeleteAzureCluster"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteAzureCluster(request)); } @@ -141,7 +141,7 @@ AzureClustersTracingConnection::CreateAzureNodePool( request) { auto span = internal::MakeSpan( "gkemulticloud_v1::AzureClustersConnection::CreateAzureNodePool"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateAzureNodePool(request)); } @@ -152,7 +152,7 @@ AzureClustersTracingConnection::UpdateAzureNodePool( request) { auto span = internal::MakeSpan( "gkemulticloud_v1::AzureClustersConnection::UpdateAzureNodePool"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateAzureNodePool(request)); } @@ -171,7 +171,7 @@ AzureClustersTracingConnection::ListAzureNodePools( google::cloud::gkemulticloud::v1::ListAzureNodePoolsRequest request) { auto span = internal::MakeSpan( "gkemulticloud_v1::AzureClustersConnection::ListAzureNodePools"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListAzureNodePools(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::gkemulticloud::v1::AzureNodePool>(std::move(span), @@ -184,7 +184,7 @@ AzureClustersTracingConnection::DeleteAzureNodePool( request) { auto span = internal::MakeSpan( "gkemulticloud_v1::AzureClustersConnection::DeleteAzureNodePool"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteAzureNodePool(request)); } diff --git a/google/cloud/gkemulticloud/v1/internal/azure_clusters_tracing_stub.cc b/google/cloud/gkemulticloud/v1/internal/azure_clusters_tracing_stub.cc index 5900f130b716..c6bf50e4c4aa 100644 --- a/google/cloud/gkemulticloud/v1/internal/azure_clusters_tracing_stub.cc +++ b/google/cloud/gkemulticloud/v1/internal/azure_clusters_tracing_stub.cc @@ -37,10 +37,8 @@ AzureClustersTracingStub::AsyncCreateAzureClient( google::cloud::gkemulticloud::v1::CreateAzureClientRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.gkemulticloud.v1.AzureClusters", "CreateAzureClient"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateAzureClient(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -76,10 +74,8 @@ AzureClustersTracingStub::AsyncDeleteAzureClient( google::cloud::gkemulticloud::v1::DeleteAzureClientRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.gkemulticloud.v1.AzureClusters", "DeleteAzureClient"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteAzureClient(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -92,10 +88,8 @@ AzureClustersTracingStub::AsyncCreateAzureCluster( request) { auto span = internal::MakeSpanGrpc( "google.cloud.gkemulticloud.v1.AzureClusters", "CreateAzureCluster"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateAzureCluster(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -108,10 +102,8 @@ AzureClustersTracingStub::AsyncUpdateAzureCluster( request) { auto span = internal::MakeSpanGrpc( "google.cloud.gkemulticloud.v1.AzureClusters", "UpdateAzureCluster"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateAzureCluster(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -148,10 +140,8 @@ AzureClustersTracingStub::AsyncDeleteAzureCluster( request) { auto span = internal::MakeSpanGrpc( "google.cloud.gkemulticloud.v1.AzureClusters", "DeleteAzureCluster"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteAzureCluster(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -178,10 +168,8 @@ AzureClustersTracingStub::AsyncCreateAzureNodePool( request) { auto span = internal::MakeSpanGrpc( "google.cloud.gkemulticloud.v1.AzureClusters", "CreateAzureNodePool"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateAzureNodePool(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -194,10 +182,8 @@ AzureClustersTracingStub::AsyncUpdateAzureNodePool( request) { auto span = internal::MakeSpanGrpc( "google.cloud.gkemulticloud.v1.AzureClusters", "UpdateAzureNodePool"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateAzureNodePool(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -235,10 +221,8 @@ AzureClustersTracingStub::AsyncDeleteAzureNodePool( request) { auto span = internal::MakeSpanGrpc( "google.cloud.gkemulticloud.v1.AzureClusters", "DeleteAzureNodePool"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteAzureNodePool(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -263,10 +247,8 @@ AzureClustersTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -277,10 +259,8 @@ future AzureClustersTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/iam/admin/v1/internal/iam_tracing_connection.cc b/google/cloud/iam/admin/v1/internal/iam_tracing_connection.cc index 462281133577..df6b6cde4711 100644 --- a/google/cloud/iam/admin/v1/internal/iam_tracing_connection.cc +++ b/google/cloud/iam/admin/v1/internal/iam_tracing_connection.cc @@ -37,7 +37,7 @@ IAMTracingConnection::ListServiceAccounts( google::iam::admin::v1::ListServiceAccountsRequest request) { auto span = internal::MakeSpan("iam_admin_v1::IAMConnection::ListServiceAccounts"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListServiceAccounts(std::move(request)); return internal::MakeTracedStreamRange< google::iam::admin::v1::ServiceAccount>(std::move(span), std::move(sr)); @@ -191,7 +191,7 @@ IAMTracingConnection::QueryGrantableRoles( google::iam::admin::v1::QueryGrantableRolesRequest request) { auto span = internal::MakeSpan("iam_admin_v1::IAMConnection::QueryGrantableRoles"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->QueryGrantableRoles(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -200,7 +200,7 @@ IAMTracingConnection::QueryGrantableRoles( StreamRange IAMTracingConnection::ListRoles( google::iam::admin::v1::ListRolesRequest request) { auto span = internal::MakeSpan("iam_admin_v1::IAMConnection::ListRoles"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListRoles(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -246,7 +246,7 @@ IAMTracingConnection::QueryTestablePermissions( google::iam::admin::v1::QueryTestablePermissionsRequest request) { auto span = internal::MakeSpan( "iam_admin_v1::IAMConnection::QueryTestablePermissions"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->QueryTestablePermissions(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); diff --git a/google/cloud/iam/v2/internal/policies_tracing_connection.cc b/google/cloud/iam/v2/internal/policies_tracing_connection.cc index c9fef04c68d5..9fcf7ea4f7c6 100644 --- a/google/cloud/iam/v2/internal/policies_tracing_connection.cc +++ b/google/cloud/iam/v2/internal/policies_tracing_connection.cc @@ -35,7 +35,7 @@ PoliciesTracingConnection::PoliciesTracingConnection( StreamRange PoliciesTracingConnection::ListPolicies( google::iam::v2::ListPoliciesRequest request) { auto span = internal::MakeSpan("iam_v2::PoliciesConnection::ListPolicies"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListPolicies(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -52,7 +52,7 @@ future> PoliciesTracingConnection::CreatePolicy( google::iam::v2::CreatePolicyRequest const& request) { auto span = internal::MakeSpan("iam_v2::PoliciesConnection::CreatePolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreatePolicy(request)); } @@ -60,7 +60,7 @@ future> PoliciesTracingConnection::UpdatePolicy( google::iam::v2::UpdatePolicyRequest const& request) { auto span = internal::MakeSpan("iam_v2::PoliciesConnection::UpdatePolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdatePolicy(request)); } @@ -68,7 +68,7 @@ future> PoliciesTracingConnection::DeletePolicy( google::iam::v2::DeletePolicyRequest const& request) { auto span = internal::MakeSpan("iam_v2::PoliciesConnection::DeletePolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeletePolicy(request)); } diff --git a/google/cloud/iam/v2/internal/policies_tracing_stub.cc b/google/cloud/iam/v2/internal/policies_tracing_stub.cc index 8be9c68e008c..4038bb5083a0 100644 --- a/google/cloud/iam/v2/internal/policies_tracing_stub.cc +++ b/google/cloud/iam/v2/internal/policies_tracing_stub.cc @@ -55,10 +55,8 @@ PoliciesTracingStub::AsyncCreatePolicy( std::shared_ptr context, google::iam::v2::CreatePolicyRequest const& request) { auto span = internal::MakeSpanGrpc("google.iam.v2.Policies", "CreatePolicy"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreatePolicy(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -69,10 +67,8 @@ PoliciesTracingStub::AsyncUpdatePolicy( std::shared_ptr context, google::iam::v2::UpdatePolicyRequest const& request) { auto span = internal::MakeSpanGrpc("google.iam.v2.Policies", "UpdatePolicy"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdatePolicy(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -83,10 +79,8 @@ PoliciesTracingStub::AsyncDeletePolicy( std::shared_ptr context, google::iam::v2::DeletePolicyRequest const& request) { auto span = internal::MakeSpanGrpc("google.iam.v2.Policies", "DeletePolicy"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeletePolicy(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -98,10 +92,8 @@ PoliciesTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -112,10 +104,8 @@ future PoliciesTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/iap/v1/internal/identity_aware_proxy_admin_tracing_connection.cc b/google/cloud/iap/v1/internal/identity_aware_proxy_admin_tracing_connection.cc index 08996a9041be..c1eebd551e1e 100644 --- a/google/cloud/iap/v1/internal/identity_aware_proxy_admin_tracing_connection.cc +++ b/google/cloud/iap/v1/internal/identity_aware_proxy_admin_tracing_connection.cc @@ -83,7 +83,7 @@ IdentityAwareProxyAdminServiceTracingConnection::ListTunnelDestGroups( google::cloud::iap::v1::ListTunnelDestGroupsRequest request) { auto span = internal::MakeSpan( "iap_v1::IdentityAwareProxyAdminServiceConnection::ListTunnelDestGroups"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListTunnelDestGroups(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::iap::v1::TunnelDestGroup>(std::move(span), std::move(sr)); diff --git a/google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_tracing_connection.cc b/google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_tracing_connection.cc index 2b953f7b1abc..4111a56bf4a4 100644 --- a/google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_tracing_connection.cc +++ b/google/cloud/iap/v1/internal/identity_aware_proxy_o_auth_tracing_connection.cc @@ -78,7 +78,7 @@ IdentityAwareProxyOAuthServiceTracingConnection::ListIdentityAwareProxyClients( auto span = internal::MakeSpan( "iap_v1::IdentityAwareProxyOAuthServiceConnection::" "ListIdentityAwareProxyClients"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListIdentityAwareProxyClients(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::iap::v1::IdentityAwareProxyClient>(std::move(span), diff --git a/google/cloud/ids/v1/internal/ids_tracing_connection.cc b/google/cloud/ids/v1/internal/ids_tracing_connection.cc index 4688f5e3da07..cdb1f9ad75da 100644 --- a/google/cloud/ids/v1/internal/ids_tracing_connection.cc +++ b/google/cloud/ids/v1/internal/ids_tracing_connection.cc @@ -36,7 +36,7 @@ StreamRange IDSTracingConnection::ListEndpoints( google::cloud::ids::v1::ListEndpointsRequest request) { auto span = internal::MakeSpan("ids_v1::IDSConnection::ListEndpoints"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListEndpoints(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -53,7 +53,7 @@ future> IDSTracingConnection::CreateEndpoint( google::cloud::ids::v1::CreateEndpointRequest const& request) { auto span = internal::MakeSpan("ids_v1::IDSConnection::CreateEndpoint"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateEndpoint(request)); } @@ -61,7 +61,7 @@ future> IDSTracingConnection::DeleteEndpoint( google::cloud::ids::v1::DeleteEndpointRequest const& request) { auto span = internal::MakeSpan("ids_v1::IDSConnection::DeleteEndpoint"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteEndpoint(request)); } diff --git a/google/cloud/ids/v1/internal/ids_tracing_stub.cc b/google/cloud/ids/v1/internal/ids_tracing_stub.cc index e06826408a7c..d179e4bd7b35 100644 --- a/google/cloud/ids/v1/internal/ids_tracing_stub.cc +++ b/google/cloud/ids/v1/internal/ids_tracing_stub.cc @@ -58,10 +58,8 @@ IDSTracingStub::AsyncCreateEndpoint( google::cloud::ids::v1::CreateEndpointRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.ids.v1.IDS", "CreateEndpoint"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateEndpoint(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -73,10 +71,8 @@ IDSTracingStub::AsyncDeleteEndpoint( google::cloud::ids::v1::DeleteEndpointRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.ids.v1.IDS", "DeleteEndpoint"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteEndpoint(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -88,10 +84,8 @@ IDSTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -102,10 +96,8 @@ future IDSTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/kms/inventory/v1/internal/key_dashboard_tracing_connection.cc b/google/cloud/kms/inventory/v1/internal/key_dashboard_tracing_connection.cc index baada7a8a56c..1980cc0c2ff8 100644 --- a/google/cloud/kms/inventory/v1/internal/key_dashboard_tracing_connection.cc +++ b/google/cloud/kms/inventory/v1/internal/key_dashboard_tracing_connection.cc @@ -37,7 +37,7 @@ KeyDashboardServiceTracingConnection::ListCryptoKeys( google::cloud::kms::inventory::v1::ListCryptoKeysRequest request) { auto span = internal::MakeSpan( "kms_inventory_v1::KeyDashboardServiceConnection::ListCryptoKeys"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListCryptoKeys(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); diff --git a/google/cloud/kms/inventory/v1/internal/key_tracking_tracing_connection.cc b/google/cloud/kms/inventory/v1/internal/key_tracking_tracing_connection.cc index bfa542f042f2..d85ce7fee067 100644 --- a/google/cloud/kms/inventory/v1/internal/key_tracking_tracing_connection.cc +++ b/google/cloud/kms/inventory/v1/internal/key_tracking_tracing_connection.cc @@ -51,7 +51,7 @@ KeyTrackingServiceTracingConnection::SearchProtectedResources( auto span = internal::MakeSpan( "kms_inventory_v1::KeyTrackingServiceConnection::" "SearchProtectedResources"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->SearchProtectedResources(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::kms::inventory::v1::ProtectedResource>(std::move(span), diff --git a/google/cloud/kms/v1/internal/ekm_tracing_connection.cc b/google/cloud/kms/v1/internal/ekm_tracing_connection.cc index 07780fa03dd7..6083c4e9c265 100644 --- a/google/cloud/kms/v1/internal/ekm_tracing_connection.cc +++ b/google/cloud/kms/v1/internal/ekm_tracing_connection.cc @@ -37,7 +37,7 @@ EkmServiceTracingConnection::ListEkmConnections( google::cloud::kms::v1::ListEkmConnectionsRequest request) { auto span = internal::MakeSpan("kms_v1::EkmServiceConnection::ListEkmConnections"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListEkmConnections(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); diff --git a/google/cloud/kms/v1/internal/key_management_tracing_connection.cc b/google/cloud/kms/v1/internal/key_management_tracing_connection.cc index 1ebab84d3de2..2c380c1638af 100644 --- a/google/cloud/kms/v1/internal/key_management_tracing_connection.cc +++ b/google/cloud/kms/v1/internal/key_management_tracing_connection.cc @@ -37,7 +37,7 @@ KeyManagementServiceTracingConnection::ListKeyRings( google::cloud::kms::v1::ListKeyRingsRequest request) { auto span = internal::MakeSpan( "kms_v1::KeyManagementServiceConnection::ListKeyRings"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListKeyRings(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -48,7 +48,7 @@ KeyManagementServiceTracingConnection::ListCryptoKeys( google::cloud::kms::v1::ListCryptoKeysRequest request) { auto span = internal::MakeSpan( "kms_v1::KeyManagementServiceConnection::ListCryptoKeys"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListCryptoKeys(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -59,7 +59,7 @@ KeyManagementServiceTracingConnection::ListCryptoKeyVersions( google::cloud::kms::v1::ListCryptoKeyVersionsRequest request) { auto span = internal::MakeSpan( "kms_v1::KeyManagementServiceConnection::ListCryptoKeyVersions"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListCryptoKeyVersions(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::kms::v1::CryptoKeyVersion>(std::move(span), std::move(sr)); @@ -70,7 +70,7 @@ KeyManagementServiceTracingConnection::ListImportJobs( google::cloud::kms::v1::ListImportJobsRequest request) { auto span = internal::MakeSpan( "kms_v1::KeyManagementServiceConnection::ListImportJobs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListImportJobs(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); diff --git a/google/cloud/logging/v2/internal/config_service_v2_tracing_connection.cc b/google/cloud/logging/v2/internal/config_service_v2_tracing_connection.cc index 1937ef6390be..b9162f377e41 100644 --- a/google/cloud/logging/v2/internal/config_service_v2_tracing_connection.cc +++ b/google/cloud/logging/v2/internal/config_service_v2_tracing_connection.cc @@ -37,7 +37,7 @@ ConfigServiceV2TracingConnection::ListBuckets( google::logging::v2::ListBucketsRequest request) { auto span = internal::MakeSpan("logging_v2::ConfigServiceV2Connection::ListBuckets"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListBuckets(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -57,7 +57,7 @@ ConfigServiceV2TracingConnection::CreateBucketAsync( google::logging::v2::CreateBucketRequest const& request) { auto span = internal::MakeSpan( "logging_v2::ConfigServiceV2Connection::CreateBucketAsync"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateBucketAsync(request)); } @@ -66,7 +66,7 @@ ConfigServiceV2TracingConnection::UpdateBucketAsync( google::logging::v2::UpdateBucketRequest const& request) { auto span = internal::MakeSpan( "logging_v2::ConfigServiceV2Connection::UpdateBucketAsync"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateBucketAsync(request)); } @@ -109,7 +109,7 @@ ConfigServiceV2TracingConnection::ListViews( google::logging::v2::ListViewsRequest request) { auto span = internal::MakeSpan("logging_v2::ConfigServiceV2Connection::ListViews"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListViews(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -155,7 +155,7 @@ ConfigServiceV2TracingConnection::ListSinks( google::logging::v2::ListSinksRequest request) { auto span = internal::MakeSpan("logging_v2::ConfigServiceV2Connection::ListSinks"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListSinks(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -201,7 +201,7 @@ ConfigServiceV2TracingConnection::CreateLink( google::logging::v2::CreateLinkRequest const& request) { auto span = internal::MakeSpan("logging_v2::ConfigServiceV2Connection::CreateLink"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateLink(request)); } @@ -210,7 +210,7 @@ ConfigServiceV2TracingConnection::DeleteLink( google::logging::v2::DeleteLinkRequest const& request) { auto span = internal::MakeSpan("logging_v2::ConfigServiceV2Connection::DeleteLink"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteLink(request)); } @@ -219,7 +219,7 @@ ConfigServiceV2TracingConnection::ListLinks( google::logging::v2::ListLinksRequest request) { auto span = internal::MakeSpan("logging_v2::ConfigServiceV2Connection::ListLinks"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListLinks(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -238,7 +238,7 @@ ConfigServiceV2TracingConnection::ListExclusions( google::logging::v2::ListExclusionsRequest request) { auto span = internal::MakeSpan( "logging_v2::ConfigServiceV2Connection::ListExclusions"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListExclusions(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -320,7 +320,7 @@ ConfigServiceV2TracingConnection::CopyLogEntries( google::logging::v2::CopyLogEntriesRequest const& request) { auto span = internal::MakeSpan( "logging_v2::ConfigServiceV2Connection::CopyLogEntries"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CopyLogEntries(request)); } diff --git a/google/cloud/logging/v2/internal/config_service_v2_tracing_stub.cc b/google/cloud/logging/v2/internal/config_service_v2_tracing_stub.cc index 4033b3a88a8b..05d740c7cc69 100644 --- a/google/cloud/logging/v2/internal/config_service_v2_tracing_stub.cc +++ b/google/cloud/logging/v2/internal/config_service_v2_tracing_stub.cc @@ -59,10 +59,8 @@ ConfigServiceV2TracingStub::AsyncCreateBucketAsync( google::logging::v2::CreateBucketRequest const& request) { auto span = internal::MakeSpanGrpc("google.logging.v2.ConfigServiceV2", "CreateBucketAsync"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateBucketAsync(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -74,10 +72,8 @@ ConfigServiceV2TracingStub::AsyncUpdateBucketAsync( google::logging::v2::UpdateBucketRequest const& request) { auto span = internal::MakeSpanGrpc("google.logging.v2.ConfigServiceV2", "UpdateBucketAsync"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateBucketAsync(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -243,10 +239,8 @@ ConfigServiceV2TracingStub::AsyncCreateLink( google::logging::v2::CreateLinkRequest const& request) { auto span = internal::MakeSpanGrpc("google.logging.v2.ConfigServiceV2", "CreateLink"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateLink(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -258,10 +252,8 @@ ConfigServiceV2TracingStub::AsyncDeleteLink( google::logging::v2::DeleteLinkRequest const& request) { auto span = internal::MakeSpanGrpc("google.logging.v2.ConfigServiceV2", "DeleteLink"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteLink(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -400,10 +392,8 @@ ConfigServiceV2TracingStub::AsyncCopyLogEntries( google::logging::v2::CopyLogEntriesRequest const& request) { auto span = internal::MakeSpanGrpc("google.logging.v2.ConfigServiceV2", "CopyLogEntries"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCopyLogEntries(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -415,10 +405,8 @@ ConfigServiceV2TracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -429,10 +417,8 @@ future ConfigServiceV2TracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/logging/v2/internal/logging_service_v2_tracing_connection.cc b/google/cloud/logging/v2/internal/logging_service_v2_tracing_connection.cc index 6d4ea8b56f3f..9101746013d9 100644 --- a/google/cloud/logging/v2/internal/logging_service_v2_tracing_connection.cc +++ b/google/cloud/logging/v2/internal/logging_service_v2_tracing_connection.cc @@ -54,7 +54,7 @@ LoggingServiceV2TracingConnection::ListLogEntries( google::logging::v2::ListLogEntriesRequest request) { auto span = internal::MakeSpan( "logging_v2::LoggingServiceV2Connection::ListLogEntries"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListLogEntries(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -66,7 +66,7 @@ LoggingServiceV2TracingConnection::ListMonitoredResourceDescriptors( auto span = internal::MakeSpan( "logging_v2::LoggingServiceV2Connection::" "ListMonitoredResourceDescriptors"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListMonitoredResourceDescriptors(std::move(request)); return internal::MakeTracedStreamRange< google::api::MonitoredResourceDescriptor>(std::move(span), std::move(sr)); @@ -76,7 +76,7 @@ StreamRange LoggingServiceV2TracingConnection::ListLogs( google::logging::v2::ListLogsRequest request) { auto span = internal::MakeSpan("logging_v2::LoggingServiceV2Connection::ListLogs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListLogs(std::move(request)); return internal::MakeTracedStreamRange(std::move(span), std::move(sr)); @@ -94,7 +94,7 @@ LoggingServiceV2TracingConnection::AsyncWriteLogEntries( google::logging::v2::WriteLogEntriesRequest const& request) { auto span = internal::MakeSpan( "logging_v2::LoggingServiceV2Connection::AsyncWriteLogEntries"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->AsyncWriteLogEntries(request)); } diff --git a/google/cloud/logging/v2/internal/logging_service_v2_tracing_stub.cc b/google/cloud/logging/v2/internal/logging_service_v2_tracing_stub.cc index 323997ad1728..5ee99a0f74a3 100644 --- a/google/cloud/logging/v2/internal/logging_service_v2_tracing_stub.cc +++ b/google/cloud/logging/v2/internal/logging_service_v2_tracing_stub.cc @@ -97,7 +97,7 @@ LoggingServiceV2TracingStub::AsyncTailLogEntries( CompletionQueue const& cq, std::shared_ptr context) { auto span = internal::MakeSpanGrpc("google.logging.v2.LoggingServiceV2", "TailLogEntries"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); internal::InjectTraceContext(*context, *propagator_); auto stream = child_->AsyncTailLogEntries(cq, context); return std::make_uniqueAsyncWriteLogEntries(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/logging/v2/internal/metrics_service_v2_tracing_connection.cc b/google/cloud/logging/v2/internal/metrics_service_v2_tracing_connection.cc index 20d4a42de878..abce7026356a 100644 --- a/google/cloud/logging/v2/internal/metrics_service_v2_tracing_connection.cc +++ b/google/cloud/logging/v2/internal/metrics_service_v2_tracing_connection.cc @@ -37,7 +37,7 @@ MetricsServiceV2TracingConnection::ListLogMetrics( google::logging::v2::ListLogMetricsRequest request) { auto span = internal::MakeSpan( "logging_v2::MetricsServiceV2Connection::ListLogMetrics"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListLogMetrics(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); diff --git a/google/cloud/managedidentities/v1/internal/managed_identities_tracing_connection.cc b/google/cloud/managedidentities/v1/internal/managed_identities_tracing_connection.cc index 2399d0493b26..2c4462f50381 100644 --- a/google/cloud/managedidentities/v1/internal/managed_identities_tracing_connection.cc +++ b/google/cloud/managedidentities/v1/internal/managed_identities_tracing_connection.cc @@ -42,7 +42,7 @@ ManagedIdentitiesServiceTracingConnection::CreateMicrosoftAdDomain( auto span = internal::MakeSpan( "managedidentities_v1::ManagedIdentitiesServiceConnection::" "CreateMicrosoftAdDomain"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateMicrosoftAdDomain(request)); } @@ -63,7 +63,7 @@ ManagedIdentitiesServiceTracingConnection::ListDomains( google::cloud::managedidentities::v1::ListDomainsRequest request) { auto span = internal::MakeSpan( "managedidentities_v1::ManagedIdentitiesServiceConnection::ListDomains"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListDomains(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::managedidentities::v1::Domain>(std::move(span), @@ -84,7 +84,7 @@ ManagedIdentitiesServiceTracingConnection::UpdateDomain( google::cloud::managedidentities::v1::UpdateDomainRequest const& request) { auto span = internal::MakeSpan( "managedidentities_v1::ManagedIdentitiesServiceConnection::UpdateDomain"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateDomain(request)); } @@ -93,7 +93,7 @@ ManagedIdentitiesServiceTracingConnection::DeleteDomain( google::cloud::managedidentities::v1::DeleteDomainRequest const& request) { auto span = internal::MakeSpan( "managedidentities_v1::ManagedIdentitiesServiceConnection::DeleteDomain"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteDomain(request)); } @@ -102,7 +102,7 @@ ManagedIdentitiesServiceTracingConnection::AttachTrust( google::cloud::managedidentities::v1::AttachTrustRequest const& request) { auto span = internal::MakeSpan( "managedidentities_v1::ManagedIdentitiesServiceConnection::AttachTrust"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->AttachTrust(request)); } @@ -113,7 +113,7 @@ ManagedIdentitiesServiceTracingConnection::ReconfigureTrust( auto span = internal::MakeSpan( "managedidentities_v1::ManagedIdentitiesServiceConnection::" "ReconfigureTrust"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ReconfigureTrust(request)); } @@ -122,7 +122,7 @@ ManagedIdentitiesServiceTracingConnection::DetachTrust( google::cloud::managedidentities::v1::DetachTrustRequest const& request) { auto span = internal::MakeSpan( "managedidentities_v1::ManagedIdentitiesServiceConnection::DetachTrust"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DetachTrust(request)); } @@ -132,7 +132,7 @@ ManagedIdentitiesServiceTracingConnection::ValidateTrust( auto span = internal::MakeSpan( "managedidentities_v1::ManagedIdentitiesServiceConnection::" "ValidateTrust"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ValidateTrust(request)); } diff --git a/google/cloud/managedidentities/v1/internal/managed_identities_tracing_stub.cc b/google/cloud/managedidentities/v1/internal/managed_identities_tracing_stub.cc index e2bfd786f22b..338f96d61167 100644 --- a/google/cloud/managedidentities/v1/internal/managed_identities_tracing_stub.cc +++ b/google/cloud/managedidentities/v1/internal/managed_identities_tracing_stub.cc @@ -39,10 +39,8 @@ ManagedIdentitiesServiceTracingStub::AsyncCreateMicrosoftAdDomain( auto span = internal::MakeSpanGrpc( "google.cloud.managedidentities.v1.ManagedIdentitiesService", "CreateMicrosoftAdDomain"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateMicrosoftAdDomain(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -94,10 +92,8 @@ ManagedIdentitiesServiceTracingStub::AsyncUpdateDomain( auto span = internal::MakeSpanGrpc( "google.cloud.managedidentities.v1.ManagedIdentitiesService", "UpdateDomain"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateDomain(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -110,10 +106,8 @@ ManagedIdentitiesServiceTracingStub::AsyncDeleteDomain( auto span = internal::MakeSpanGrpc( "google.cloud.managedidentities.v1.ManagedIdentitiesService", "DeleteDomain"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteDomain(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -126,10 +120,8 @@ ManagedIdentitiesServiceTracingStub::AsyncAttachTrust( auto span = internal::MakeSpanGrpc( "google.cloud.managedidentities.v1.ManagedIdentitiesService", "AttachTrust"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncAttachTrust(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -143,10 +135,8 @@ ManagedIdentitiesServiceTracingStub::AsyncReconfigureTrust( auto span = internal::MakeSpanGrpc( "google.cloud.managedidentities.v1.ManagedIdentitiesService", "ReconfigureTrust"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncReconfigureTrust(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -159,10 +149,8 @@ ManagedIdentitiesServiceTracingStub::AsyncDetachTrust( auto span = internal::MakeSpanGrpc( "google.cloud.managedidentities.v1.ManagedIdentitiesService", "DetachTrust"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDetachTrust(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -175,10 +163,8 @@ ManagedIdentitiesServiceTracingStub::AsyncValidateTrust( auto span = internal::MakeSpanGrpc( "google.cloud.managedidentities.v1.ManagedIdentitiesService", "ValidateTrust"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncValidateTrust(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -190,10 +176,8 @@ ManagedIdentitiesServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -204,10 +188,8 @@ future ManagedIdentitiesServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/memcache/v1/internal/cloud_memcache_tracing_connection.cc b/google/cloud/memcache/v1/internal/cloud_memcache_tracing_connection.cc index 2a6aab3e1dab..fa34b6e908d4 100644 --- a/google/cloud/memcache/v1/internal/cloud_memcache_tracing_connection.cc +++ b/google/cloud/memcache/v1/internal/cloud_memcache_tracing_connection.cc @@ -37,7 +37,7 @@ CloudMemcacheTracingConnection::ListInstances( google::cloud::memcache::v1::ListInstancesRequest request) { auto span = internal::MakeSpan("memcache_v1::CloudMemcacheConnection::ListInstances"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListInstances(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -57,7 +57,7 @@ CloudMemcacheTracingConnection::CreateInstance( google::cloud::memcache::v1::CreateInstanceRequest const& request) { auto span = internal::MakeSpan( "memcache_v1::CloudMemcacheConnection::CreateInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateInstance(request)); } @@ -66,7 +66,7 @@ CloudMemcacheTracingConnection::UpdateInstance( google::cloud::memcache::v1::UpdateInstanceRequest const& request) { auto span = internal::MakeSpan( "memcache_v1::CloudMemcacheConnection::UpdateInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateInstance(request)); } @@ -75,7 +75,7 @@ CloudMemcacheTracingConnection::UpdateParameters( google::cloud::memcache::v1::UpdateParametersRequest const& request) { auto span = internal::MakeSpan( "memcache_v1::CloudMemcacheConnection::UpdateParameters"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateParameters(request)); } @@ -84,7 +84,7 @@ CloudMemcacheTracingConnection::DeleteInstance( google::cloud::memcache::v1::DeleteInstanceRequest const& request) { auto span = internal::MakeSpan( "memcache_v1::CloudMemcacheConnection::DeleteInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteInstance(request)); } @@ -93,7 +93,7 @@ CloudMemcacheTracingConnection::ApplyParameters( google::cloud::memcache::v1::ApplyParametersRequest const& request) { auto span = internal::MakeSpan( "memcache_v1::CloudMemcacheConnection::ApplyParameters"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ApplyParameters(request)); } @@ -102,7 +102,7 @@ CloudMemcacheTracingConnection::RescheduleMaintenance( google::cloud::memcache::v1::RescheduleMaintenanceRequest const& request) { auto span = internal::MakeSpan( "memcache_v1::CloudMemcacheConnection::RescheduleMaintenance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RescheduleMaintenance(request)); } diff --git a/google/cloud/memcache/v1/internal/cloud_memcache_tracing_stub.cc b/google/cloud/memcache/v1/internal/cloud_memcache_tracing_stub.cc index e375f20308e1..d9866d47e413 100644 --- a/google/cloud/memcache/v1/internal/cloud_memcache_tracing_stub.cc +++ b/google/cloud/memcache/v1/internal/cloud_memcache_tracing_stub.cc @@ -61,10 +61,8 @@ CloudMemcacheTracingStub::AsyncCreateInstance( google::cloud::memcache::v1::CreateInstanceRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.memcache.v1.CloudMemcache", "CreateInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -76,10 +74,8 @@ CloudMemcacheTracingStub::AsyncUpdateInstance( google::cloud::memcache::v1::UpdateInstanceRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.memcache.v1.CloudMemcache", "UpdateInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -91,10 +87,8 @@ CloudMemcacheTracingStub::AsyncUpdateParameters( google::cloud::memcache::v1::UpdateParametersRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.memcache.v1.CloudMemcache", "UpdateParameters"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateParameters(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -106,10 +100,8 @@ CloudMemcacheTracingStub::AsyncDeleteInstance( google::cloud::memcache::v1::DeleteInstanceRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.memcache.v1.CloudMemcache", "DeleteInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -121,10 +113,8 @@ CloudMemcacheTracingStub::AsyncApplyParameters( google::cloud::memcache::v1::ApplyParametersRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.memcache.v1.CloudMemcache", "ApplyParameters"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncApplyParameters(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -136,10 +126,8 @@ CloudMemcacheTracingStub::AsyncRescheduleMaintenance( google::cloud::memcache::v1::RescheduleMaintenanceRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.memcache.v1.CloudMemcache", "RescheduleMaintenance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncRescheduleMaintenance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -151,10 +139,8 @@ CloudMemcacheTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -165,10 +151,8 @@ future CloudMemcacheTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/metastore/v1/internal/dataproc_metastore_federation_tracing_connection.cc b/google/cloud/metastore/v1/internal/dataproc_metastore_federation_tracing_connection.cc index 8082759bb9e6..3bd8f93c7b93 100644 --- a/google/cloud/metastore/v1/internal/dataproc_metastore_federation_tracing_connection.cc +++ b/google/cloud/metastore/v1/internal/dataproc_metastore_federation_tracing_connection.cc @@ -39,7 +39,7 @@ DataprocMetastoreFederationTracingConnection::ListFederations( google::cloud::metastore::v1::ListFederationsRequest request) { auto span = internal::MakeSpan( "metastore_v1::DataprocMetastoreFederationConnection::ListFederations"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListFederations(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::metastore::v1::Federation>(std::move(span), std::move(sr)); @@ -59,7 +59,7 @@ DataprocMetastoreFederationTracingConnection::CreateFederation( google::cloud::metastore::v1::CreateFederationRequest const& request) { auto span = internal::MakeSpan( "metastore_v1::DataprocMetastoreFederationConnection::CreateFederation"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateFederation(request)); } @@ -68,7 +68,7 @@ DataprocMetastoreFederationTracingConnection::UpdateFederation( google::cloud::metastore::v1::UpdateFederationRequest const& request) { auto span = internal::MakeSpan( "metastore_v1::DataprocMetastoreFederationConnection::UpdateFederation"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateFederation(request)); } @@ -77,7 +77,7 @@ DataprocMetastoreFederationTracingConnection::DeleteFederation( google::cloud::metastore::v1::DeleteFederationRequest const& request) { auto span = internal::MakeSpan( "metastore_v1::DataprocMetastoreFederationConnection::DeleteFederation"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteFederation(request)); } diff --git a/google/cloud/metastore/v1/internal/dataproc_metastore_federation_tracing_stub.cc b/google/cloud/metastore/v1/internal/dataproc_metastore_federation_tracing_stub.cc index 67d84c3fd41a..04720a936bb2 100644 --- a/google/cloud/metastore/v1/internal/dataproc_metastore_federation_tracing_stub.cc +++ b/google/cloud/metastore/v1/internal/dataproc_metastore_federation_tracing_stub.cc @@ -63,10 +63,8 @@ DataprocMetastoreFederationTracingStub::AsyncCreateFederation( auto span = internal::MakeSpanGrpc( "google.cloud.metastore.v1.DataprocMetastoreFederation", "CreateFederation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateFederation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -79,10 +77,8 @@ DataprocMetastoreFederationTracingStub::AsyncUpdateFederation( auto span = internal::MakeSpanGrpc( "google.cloud.metastore.v1.DataprocMetastoreFederation", "UpdateFederation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateFederation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -95,10 +91,8 @@ DataprocMetastoreFederationTracingStub::AsyncDeleteFederation( auto span = internal::MakeSpanGrpc( "google.cloud.metastore.v1.DataprocMetastoreFederation", "DeleteFederation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteFederation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -110,10 +104,8 @@ DataprocMetastoreFederationTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -124,10 +116,8 @@ future DataprocMetastoreFederationTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/metastore/v1/internal/dataproc_metastore_tracing_connection.cc b/google/cloud/metastore/v1/internal/dataproc_metastore_tracing_connection.cc index 49a7fcacfd14..d2305a9da96b 100644 --- a/google/cloud/metastore/v1/internal/dataproc_metastore_tracing_connection.cc +++ b/google/cloud/metastore/v1/internal/dataproc_metastore_tracing_connection.cc @@ -37,7 +37,7 @@ DataprocMetastoreTracingConnection::ListServices( google::cloud::metastore::v1::ListServicesRequest request) { auto span = internal::MakeSpan( "metastore_v1::DataprocMetastoreConnection::ListServices"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListServices(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -57,7 +57,7 @@ DataprocMetastoreTracingConnection::CreateService( google::cloud::metastore::v1::CreateServiceRequest const& request) { auto span = internal::MakeSpan( "metastore_v1::DataprocMetastoreConnection::CreateService"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateService(request)); } @@ -66,7 +66,7 @@ DataprocMetastoreTracingConnection::UpdateService( google::cloud::metastore::v1::UpdateServiceRequest const& request) { auto span = internal::MakeSpan( "metastore_v1::DataprocMetastoreConnection::UpdateService"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateService(request)); } @@ -75,7 +75,7 @@ DataprocMetastoreTracingConnection::DeleteService( google::cloud::metastore::v1::DeleteServiceRequest const& request) { auto span = internal::MakeSpan( "metastore_v1::DataprocMetastoreConnection::DeleteService"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteService(request)); } @@ -84,7 +84,7 @@ DataprocMetastoreTracingConnection::ListMetadataImports( google::cloud::metastore::v1::ListMetadataImportsRequest request) { auto span = internal::MakeSpan( "metastore_v1::DataprocMetastoreConnection::ListMetadataImports"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListMetadataImports(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::metastore::v1::MetadataImport>(std::move(span), @@ -105,7 +105,7 @@ DataprocMetastoreTracingConnection::CreateMetadataImport( google::cloud::metastore::v1::CreateMetadataImportRequest const& request) { auto span = internal::MakeSpan( "metastore_v1::DataprocMetastoreConnection::CreateMetadataImport"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateMetadataImport(request)); } @@ -115,7 +115,7 @@ DataprocMetastoreTracingConnection::UpdateMetadataImport( google::cloud::metastore::v1::UpdateMetadataImportRequest const& request) { auto span = internal::MakeSpan( "metastore_v1::DataprocMetastoreConnection::UpdateMetadataImport"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateMetadataImport(request)); } @@ -125,7 +125,7 @@ DataprocMetastoreTracingConnection::ExportMetadata( google::cloud::metastore::v1::ExportMetadataRequest const& request) { auto span = internal::MakeSpan( "metastore_v1::DataprocMetastoreConnection::ExportMetadata"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ExportMetadata(request)); } @@ -134,7 +134,7 @@ DataprocMetastoreTracingConnection::RestoreService( google::cloud::metastore::v1::RestoreServiceRequest const& request) { auto span = internal::MakeSpan( "metastore_v1::DataprocMetastoreConnection::RestoreService"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RestoreService(request)); } @@ -143,7 +143,7 @@ DataprocMetastoreTracingConnection::ListBackups( google::cloud::metastore::v1::ListBackupsRequest request) { auto span = internal::MakeSpan( "metastore_v1::DataprocMetastoreConnection::ListBackups"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListBackups(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -163,7 +163,7 @@ DataprocMetastoreTracingConnection::CreateBackup( google::cloud::metastore::v1::CreateBackupRequest const& request) { auto span = internal::MakeSpan( "metastore_v1::DataprocMetastoreConnection::CreateBackup"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateBackup(request)); } @@ -172,7 +172,7 @@ DataprocMetastoreTracingConnection::DeleteBackup( google::cloud::metastore::v1::DeleteBackupRequest const& request) { auto span = internal::MakeSpan( "metastore_v1::DataprocMetastoreConnection::DeleteBackup"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteBackup(request)); } @@ -181,7 +181,7 @@ DataprocMetastoreTracingConnection::QueryMetadata( google::cloud::metastore::v1::QueryMetadataRequest const& request) { auto span = internal::MakeSpan( "metastore_v1::DataprocMetastoreConnection::QueryMetadata"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->QueryMetadata(request)); } @@ -190,7 +190,7 @@ DataprocMetastoreTracingConnection::MoveTableToDatabase( google::cloud::metastore::v1::MoveTableToDatabaseRequest const& request) { auto span = internal::MakeSpan( "metastore_v1::DataprocMetastoreConnection::MoveTableToDatabase"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->MoveTableToDatabase(request)); } @@ -203,7 +203,7 @@ DataprocMetastoreTracingConnection::AlterMetadataResourceLocation( auto span = internal::MakeSpan( "metastore_v1::DataprocMetastoreConnection::" "AlterMetadataResourceLocation"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->AlterMetadataResourceLocation(request)); } diff --git a/google/cloud/metastore/v1/internal/dataproc_metastore_tracing_stub.cc b/google/cloud/metastore/v1/internal/dataproc_metastore_tracing_stub.cc index 638ebbe7adcf..ad90d90110a8 100644 --- a/google/cloud/metastore/v1/internal/dataproc_metastore_tracing_stub.cc +++ b/google/cloud/metastore/v1/internal/dataproc_metastore_tracing_stub.cc @@ -61,10 +61,8 @@ DataprocMetastoreTracingStub::AsyncCreateService( google::cloud::metastore::v1::CreateServiceRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.metastore.v1.DataprocMetastore", "CreateService"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateService(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -76,10 +74,8 @@ DataprocMetastoreTracingStub::AsyncUpdateService( google::cloud::metastore::v1::UpdateServiceRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.metastore.v1.DataprocMetastore", "UpdateService"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateService(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -91,10 +87,8 @@ DataprocMetastoreTracingStub::AsyncDeleteService( google::cloud::metastore::v1::DeleteServiceRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.metastore.v1.DataprocMetastore", "DeleteService"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteService(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -130,10 +124,8 @@ DataprocMetastoreTracingStub::AsyncCreateMetadataImport( google::cloud::metastore::v1::CreateMetadataImportRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.metastore.v1.DataprocMetastore", "CreateMetadataImport"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateMetadataImport(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -145,10 +137,8 @@ DataprocMetastoreTracingStub::AsyncUpdateMetadataImport( google::cloud::metastore::v1::UpdateMetadataImportRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.metastore.v1.DataprocMetastore", "UpdateMetadataImport"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateMetadataImport(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -160,10 +150,8 @@ DataprocMetastoreTracingStub::AsyncExportMetadata( google::cloud::metastore::v1::ExportMetadataRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.metastore.v1.DataprocMetastore", "ExportMetadata"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncExportMetadata(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -175,10 +163,8 @@ DataprocMetastoreTracingStub::AsyncRestoreService( google::cloud::metastore::v1::RestoreServiceRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.metastore.v1.DataprocMetastore", "RestoreService"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncRestoreService(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -213,10 +199,8 @@ DataprocMetastoreTracingStub::AsyncCreateBackup( google::cloud::metastore::v1::CreateBackupRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.metastore.v1.DataprocMetastore", "CreateBackup"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateBackup(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -228,10 +212,8 @@ DataprocMetastoreTracingStub::AsyncDeleteBackup( google::cloud::metastore::v1::DeleteBackupRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.metastore.v1.DataprocMetastore", "DeleteBackup"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteBackup(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -243,10 +225,8 @@ DataprocMetastoreTracingStub::AsyncQueryMetadata( google::cloud::metastore::v1::QueryMetadataRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.metastore.v1.DataprocMetastore", "QueryMetadata"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncQueryMetadata(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -258,10 +238,8 @@ DataprocMetastoreTracingStub::AsyncMoveTableToDatabase( google::cloud::metastore::v1::MoveTableToDatabaseRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.metastore.v1.DataprocMetastore", "MoveTableToDatabase"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncMoveTableToDatabase(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -275,10 +253,8 @@ DataprocMetastoreTracingStub::AsyncAlterMetadataResourceLocation( auto span = internal::MakeSpanGrpc("google.cloud.metastore.v1.DataprocMetastore", "AlterMetadataResourceLocation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncAlterMetadataResourceLocation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -290,10 +266,8 @@ DataprocMetastoreTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -304,10 +278,8 @@ future DataprocMetastoreTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/migrationcenter/v1/internal/migration_center_tracing_connection.cc b/google/cloud/migrationcenter/v1/internal/migration_center_tracing_connection.cc index 4415948d7ff3..3e1a8a48ee67 100644 --- a/google/cloud/migrationcenter/v1/internal/migration_center_tracing_connection.cc +++ b/google/cloud/migrationcenter/v1/internal/migration_center_tracing_connection.cc @@ -37,7 +37,7 @@ MigrationCenterTracingConnection::ListAssets( google::cloud::migrationcenter::v1::ListAssetsRequest request) { auto span = internal::MakeSpan( "migrationcenter_v1::MigrationCenterConnection::ListAssets"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListAssets(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::migrationcenter::v1::Asset>(std::move(span), @@ -114,7 +114,7 @@ MigrationCenterTracingConnection::CreateImportJob( google::cloud::migrationcenter::v1::CreateImportJobRequest const& request) { auto span = internal::MakeSpan( "migrationcenter_v1::MigrationCenterConnection::CreateImportJob"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateImportJob(request)); } @@ -123,7 +123,7 @@ MigrationCenterTracingConnection::ListImportJobs( google::cloud::migrationcenter::v1::ListImportJobsRequest request) { auto span = internal::MakeSpan( "migrationcenter_v1::MigrationCenterConnection::ListImportJobs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListImportJobs(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::migrationcenter::v1::ImportJob>(std::move(span), @@ -144,7 +144,7 @@ MigrationCenterTracingConnection::DeleteImportJob( google::cloud::migrationcenter::v1::DeleteImportJobRequest const& request) { auto span = internal::MakeSpan( "migrationcenter_v1::MigrationCenterConnection::DeleteImportJob"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteImportJob(request)); } @@ -153,7 +153,7 @@ MigrationCenterTracingConnection::UpdateImportJob( google::cloud::migrationcenter::v1::UpdateImportJobRequest const& request) { auto span = internal::MakeSpan( "migrationcenter_v1::MigrationCenterConnection::UpdateImportJob"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateImportJob(request)); } @@ -163,7 +163,7 @@ MigrationCenterTracingConnection::ValidateImportJob( request) { auto span = internal::MakeSpan( "migrationcenter_v1::MigrationCenterConnection::ValidateImportJob"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ValidateImportJob(request)); } @@ -172,7 +172,7 @@ MigrationCenterTracingConnection::RunImportJob( google::cloud::migrationcenter::v1::RunImportJobRequest const& request) { auto span = internal::MakeSpan( "migrationcenter_v1::MigrationCenterConnection::RunImportJob"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RunImportJob(request)); } @@ -191,7 +191,7 @@ MigrationCenterTracingConnection::ListImportDataFiles( google::cloud::migrationcenter::v1::ListImportDataFilesRequest request) { auto span = internal::MakeSpan( "migrationcenter_v1::MigrationCenterConnection::ListImportDataFiles"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListImportDataFiles(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::migrationcenter::v1::ImportDataFile>(std::move(span), @@ -204,7 +204,7 @@ MigrationCenterTracingConnection::CreateImportDataFile( request) { auto span = internal::MakeSpan( "migrationcenter_v1::MigrationCenterConnection::CreateImportDataFile"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateImportDataFile(request)); } @@ -215,7 +215,7 @@ MigrationCenterTracingConnection::DeleteImportDataFile( request) { auto span = internal::MakeSpan( "migrationcenter_v1::MigrationCenterConnection::DeleteImportDataFile"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteImportDataFile(request)); } @@ -225,7 +225,7 @@ MigrationCenterTracingConnection::ListGroups( google::cloud::migrationcenter::v1::ListGroupsRequest request) { auto span = internal::MakeSpan( "migrationcenter_v1::MigrationCenterConnection::ListGroups"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListGroups(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::migrationcenter::v1::Group>(std::move(span), @@ -246,7 +246,7 @@ MigrationCenterTracingConnection::CreateGroup( google::cloud::migrationcenter::v1::CreateGroupRequest const& request) { auto span = internal::MakeSpan( "migrationcenter_v1::MigrationCenterConnection::CreateGroup"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateGroup(request)); } @@ -255,7 +255,7 @@ MigrationCenterTracingConnection::UpdateGroup( google::cloud::migrationcenter::v1::UpdateGroupRequest const& request) { auto span = internal::MakeSpan( "migrationcenter_v1::MigrationCenterConnection::UpdateGroup"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateGroup(request)); } @@ -264,7 +264,7 @@ MigrationCenterTracingConnection::DeleteGroup( google::cloud::migrationcenter::v1::DeleteGroupRequest const& request) { auto span = internal::MakeSpan( "migrationcenter_v1::MigrationCenterConnection::DeleteGroup"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteGroup(request)); } @@ -274,7 +274,7 @@ MigrationCenterTracingConnection::AddAssetsToGroup( request) { auto span = internal::MakeSpan( "migrationcenter_v1::MigrationCenterConnection::AddAssetsToGroup"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->AddAssetsToGroup(request)); } @@ -284,7 +284,7 @@ MigrationCenterTracingConnection::RemoveAssetsFromGroup( request) { auto span = internal::MakeSpan( "migrationcenter_v1::MigrationCenterConnection::RemoveAssetsFromGroup"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RemoveAssetsFromGroup(request)); } @@ -294,7 +294,7 @@ MigrationCenterTracingConnection::ListErrorFrames( google::cloud::migrationcenter::v1::ListErrorFramesRequest request) { auto span = internal::MakeSpan( "migrationcenter_v1::MigrationCenterConnection::ListErrorFrames"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListErrorFrames(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::migrationcenter::v1::ErrorFrame>(std::move(span), @@ -315,7 +315,7 @@ MigrationCenterTracingConnection::ListSources( google::cloud::migrationcenter::v1::ListSourcesRequest request) { auto span = internal::MakeSpan( "migrationcenter_v1::MigrationCenterConnection::ListSources"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListSources(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::migrationcenter::v1::Source>(std::move(span), @@ -336,7 +336,7 @@ MigrationCenterTracingConnection::CreateSource( google::cloud::migrationcenter::v1::CreateSourceRequest const& request) { auto span = internal::MakeSpan( "migrationcenter_v1::MigrationCenterConnection::CreateSource"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateSource(request)); } @@ -345,7 +345,7 @@ MigrationCenterTracingConnection::UpdateSource( google::cloud::migrationcenter::v1::UpdateSourceRequest const& request) { auto span = internal::MakeSpan( "migrationcenter_v1::MigrationCenterConnection::UpdateSource"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateSource(request)); } @@ -354,7 +354,7 @@ MigrationCenterTracingConnection::DeleteSource( google::cloud::migrationcenter::v1::DeleteSourceRequest const& request) { auto span = internal::MakeSpan( "migrationcenter_v1::MigrationCenterConnection::DeleteSource"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteSource(request)); } @@ -363,7 +363,7 @@ MigrationCenterTracingConnection::ListPreferenceSets( google::cloud::migrationcenter::v1::ListPreferenceSetsRequest request) { auto span = internal::MakeSpan( "migrationcenter_v1::MigrationCenterConnection::ListPreferenceSets"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListPreferenceSets(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::migrationcenter::v1::PreferenceSet>(std::move(span), @@ -386,7 +386,7 @@ MigrationCenterTracingConnection::CreatePreferenceSet( request) { auto span = internal::MakeSpan( "migrationcenter_v1::MigrationCenterConnection::CreatePreferenceSet"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreatePreferenceSet(request)); } @@ -397,7 +397,7 @@ MigrationCenterTracingConnection::UpdatePreferenceSet( request) { auto span = internal::MakeSpan( "migrationcenter_v1::MigrationCenterConnection::UpdatePreferenceSet"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdatePreferenceSet(request)); } @@ -408,7 +408,7 @@ MigrationCenterTracingConnection::DeletePreferenceSet( request) { auto span = internal::MakeSpan( "migrationcenter_v1::MigrationCenterConnection::DeletePreferenceSet"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeletePreferenceSet(request)); } @@ -427,7 +427,7 @@ MigrationCenterTracingConnection::UpdateSettings( google::cloud::migrationcenter::v1::UpdateSettingsRequest const& request) { auto span = internal::MakeSpan( "migrationcenter_v1::MigrationCenterConnection::UpdateSettings"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateSettings(request)); } @@ -437,7 +437,7 @@ MigrationCenterTracingConnection::CreateReportConfig( request) { auto span = internal::MakeSpan( "migrationcenter_v1::MigrationCenterConnection::CreateReportConfig"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateReportConfig(request)); } @@ -456,7 +456,7 @@ MigrationCenterTracingConnection::ListReportConfigs( google::cloud::migrationcenter::v1::ListReportConfigsRequest request) { auto span = internal::MakeSpan( "migrationcenter_v1::MigrationCenterConnection::ListReportConfigs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListReportConfigs(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::migrationcenter::v1::ReportConfig>(std::move(span), @@ -469,7 +469,7 @@ MigrationCenterTracingConnection::DeleteReportConfig( request) { auto span = internal::MakeSpan( "migrationcenter_v1::MigrationCenterConnection::DeleteReportConfig"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteReportConfig(request)); } @@ -479,7 +479,7 @@ MigrationCenterTracingConnection::CreateReport( google::cloud::migrationcenter::v1::CreateReportRequest const& request) { auto span = internal::MakeSpan( "migrationcenter_v1::MigrationCenterConnection::CreateReport"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateReport(request)); } @@ -497,7 +497,7 @@ MigrationCenterTracingConnection::ListReports( google::cloud::migrationcenter::v1::ListReportsRequest request) { auto span = internal::MakeSpan( "migrationcenter_v1::MigrationCenterConnection::ListReports"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListReports(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::migrationcenter::v1::Report>(std::move(span), @@ -509,7 +509,7 @@ MigrationCenterTracingConnection::DeleteReport( google::cloud::migrationcenter::v1::DeleteReportRequest const& request) { auto span = internal::MakeSpan( "migrationcenter_v1::MigrationCenterConnection::DeleteReport"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteReport(request)); } diff --git a/google/cloud/migrationcenter/v1/internal/migration_center_tracing_stub.cc b/google/cloud/migrationcenter/v1/internal/migration_center_tracing_stub.cc index cb743890a0c7..9a44a804cc9f 100644 --- a/google/cloud/migrationcenter/v1/internal/migration_center_tracing_stub.cc +++ b/google/cloud/migrationcenter/v1/internal/migration_center_tracing_stub.cc @@ -135,10 +135,8 @@ MigrationCenterTracingStub::AsyncCreateImportJob( google::cloud::migrationcenter::v1::CreateImportJobRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.migrationcenter.v1.MigrationCenter", "CreateImportJob"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateImportJob(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -174,10 +172,8 @@ MigrationCenterTracingStub::AsyncDeleteImportJob( google::cloud::migrationcenter::v1::DeleteImportJobRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.migrationcenter.v1.MigrationCenter", "DeleteImportJob"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteImportJob(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -189,10 +185,8 @@ MigrationCenterTracingStub::AsyncUpdateImportJob( google::cloud::migrationcenter::v1::UpdateImportJobRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.migrationcenter.v1.MigrationCenter", "UpdateImportJob"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateImportJob(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -205,10 +199,8 @@ MigrationCenterTracingStub::AsyncValidateImportJob( request) { auto span = internal::MakeSpanGrpc( "google.cloud.migrationcenter.v1.MigrationCenter", "ValidateImportJob"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncValidateImportJob(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -220,10 +212,8 @@ MigrationCenterTracingStub::AsyncRunImportJob( google::cloud::migrationcenter::v1::RunImportJobRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.migrationcenter.v1.MigrationCenter", "RunImportJob"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncRunImportJob(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -263,10 +253,8 @@ MigrationCenterTracingStub::AsyncCreateImportDataFile( auto span = internal::MakeSpanGrpc("google.cloud.migrationcenter.v1.MigrationCenter", "CreateImportDataFile"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateImportDataFile(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -280,10 +268,8 @@ MigrationCenterTracingStub::AsyncDeleteImportDataFile( auto span = internal::MakeSpanGrpc("google.cloud.migrationcenter.v1.MigrationCenter", "DeleteImportDataFile"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteImportDataFile(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -318,10 +304,8 @@ MigrationCenterTracingStub::AsyncCreateGroup( google::cloud::migrationcenter::v1::CreateGroupRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.migrationcenter.v1.MigrationCenter", "CreateGroup"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateGroup(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -333,10 +317,8 @@ MigrationCenterTracingStub::AsyncUpdateGroup( google::cloud::migrationcenter::v1::UpdateGroupRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.migrationcenter.v1.MigrationCenter", "UpdateGroup"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateGroup(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -348,10 +330,8 @@ MigrationCenterTracingStub::AsyncDeleteGroup( google::cloud::migrationcenter::v1::DeleteGroupRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.migrationcenter.v1.MigrationCenter", "DeleteGroup"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteGroup(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -364,10 +344,8 @@ MigrationCenterTracingStub::AsyncAddAssetsToGroup( request) { auto span = internal::MakeSpanGrpc( "google.cloud.migrationcenter.v1.MigrationCenter", "AddAssetsToGroup"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncAddAssetsToGroup(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -381,10 +359,8 @@ MigrationCenterTracingStub::AsyncRemoveAssetsFromGroup( auto span = internal::MakeSpanGrpc("google.cloud.migrationcenter.v1.MigrationCenter", "RemoveAssetsFromGroup"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncRemoveAssetsFromGroup(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -443,10 +419,8 @@ MigrationCenterTracingStub::AsyncCreateSource( google::cloud::migrationcenter::v1::CreateSourceRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.migrationcenter.v1.MigrationCenter", "CreateSource"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateSource(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -458,10 +432,8 @@ MigrationCenterTracingStub::AsyncUpdateSource( google::cloud::migrationcenter::v1::UpdateSourceRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.migrationcenter.v1.MigrationCenter", "UpdateSource"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateSource(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -473,10 +445,8 @@ MigrationCenterTracingStub::AsyncDeleteSource( google::cloud::migrationcenter::v1::DeleteSourceRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.migrationcenter.v1.MigrationCenter", "DeleteSource"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteSource(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -515,10 +485,8 @@ MigrationCenterTracingStub::AsyncCreatePreferenceSet( request) { auto span = internal::MakeSpanGrpc( "google.cloud.migrationcenter.v1.MigrationCenter", "CreatePreferenceSet"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreatePreferenceSet(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -531,10 +499,8 @@ MigrationCenterTracingStub::AsyncUpdatePreferenceSet( request) { auto span = internal::MakeSpanGrpc( "google.cloud.migrationcenter.v1.MigrationCenter", "UpdatePreferenceSet"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdatePreferenceSet(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -547,10 +513,8 @@ MigrationCenterTracingStub::AsyncDeletePreferenceSet( request) { auto span = internal::MakeSpanGrpc( "google.cloud.migrationcenter.v1.MigrationCenter", "DeletePreferenceSet"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeletePreferenceSet(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -574,10 +538,8 @@ MigrationCenterTracingStub::AsyncUpdateSettings( google::cloud::migrationcenter::v1::UpdateSettingsRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.migrationcenter.v1.MigrationCenter", "UpdateSettings"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateSettings(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -590,10 +552,8 @@ MigrationCenterTracingStub::AsyncCreateReportConfig( request) { auto span = internal::MakeSpanGrpc( "google.cloud.migrationcenter.v1.MigrationCenter", "CreateReportConfig"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateReportConfig(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -631,10 +591,8 @@ MigrationCenterTracingStub::AsyncDeleteReportConfig( request) { auto span = internal::MakeSpanGrpc( "google.cloud.migrationcenter.v1.MigrationCenter", "DeleteReportConfig"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteReportConfig(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -646,10 +604,8 @@ MigrationCenterTracingStub::AsyncCreateReport( google::cloud::migrationcenter::v1::CreateReportRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.migrationcenter.v1.MigrationCenter", "CreateReport"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateReport(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -684,10 +640,8 @@ MigrationCenterTracingStub::AsyncDeleteReport( google::cloud::migrationcenter::v1::DeleteReportRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.migrationcenter.v1.MigrationCenter", "DeleteReport"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteReport(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -699,10 +653,8 @@ MigrationCenterTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -713,10 +665,8 @@ future MigrationCenterTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/monitoring/dashboard/v1/internal/dashboards_tracing_connection.cc b/google/cloud/monitoring/dashboard/v1/internal/dashboards_tracing_connection.cc index e2b0140aadb5..cd91260731c8 100644 --- a/google/cloud/monitoring/dashboard/v1/internal/dashboards_tracing_connection.cc +++ b/google/cloud/monitoring/dashboard/v1/internal/dashboards_tracing_connection.cc @@ -46,7 +46,7 @@ DashboardsServiceTracingConnection::ListDashboards( google::monitoring::dashboard::v1::ListDashboardsRequest request) { auto span = internal::MakeSpan( "monitoring_dashboard_v1::DashboardsServiceConnection::ListDashboards"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListDashboards(std::move(request)); return internal::MakeTracedStreamRange< google::monitoring::dashboard::v1::Dashboard>(std::move(span), diff --git a/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_tracing_connection.cc b/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_tracing_connection.cc index 7aef11765137..6b90cd1a5ee5 100644 --- a/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_tracing_connection.cc +++ b/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_tracing_connection.cc @@ -61,7 +61,7 @@ MetricsScopesTracingConnection::CreateMonitoredProject( auto span = internal::MakeSpan( "monitoring_metricsscope_v1::MetricsScopesConnection::" "CreateMonitoredProject"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateMonitoredProject(request)); } @@ -73,7 +73,7 @@ MetricsScopesTracingConnection::DeleteMonitoredProject( auto span = internal::MakeSpan( "monitoring_metricsscope_v1::MetricsScopesConnection::" "DeleteMonitoredProject"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteMonitoredProject(request)); } diff --git a/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_tracing_stub.cc b/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_tracing_stub.cc index 713ff76d4514..6b67393f9a9a 100644 --- a/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_tracing_stub.cc +++ b/google/cloud/monitoring/metricsscope/v1/internal/metrics_scopes_tracing_stub.cc @@ -68,10 +68,8 @@ MetricsScopesTracingStub::AsyncCreateMonitoredProject( auto span = internal::MakeSpanGrpc("google.monitoring.metricsscope.v1.MetricsScopes", "CreateMonitoredProject"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateMonitoredProject(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -85,10 +83,8 @@ MetricsScopesTracingStub::AsyncDeleteMonitoredProject( auto span = internal::MakeSpanGrpc("google.monitoring.metricsscope.v1.MetricsScopes", "DeleteMonitoredProject"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteMonitoredProject(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -100,10 +96,8 @@ MetricsScopesTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -114,10 +108,8 @@ future MetricsScopesTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/monitoring/v3/internal/alert_policy_tracing_connection.cc b/google/cloud/monitoring/v3/internal/alert_policy_tracing_connection.cc index ab05a8fb5df2..3f1668076f57 100644 --- a/google/cloud/monitoring/v3/internal/alert_policy_tracing_connection.cc +++ b/google/cloud/monitoring/v3/internal/alert_policy_tracing_connection.cc @@ -37,7 +37,7 @@ AlertPolicyServiceTracingConnection::ListAlertPolicies( google::monitoring::v3::ListAlertPoliciesRequest request) { auto span = internal::MakeSpan( "monitoring_v3::AlertPolicyServiceConnection::ListAlertPolicies"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListAlertPolicies(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); diff --git a/google/cloud/monitoring/v3/internal/group_tracing_connection.cc b/google/cloud/monitoring/v3/internal/group_tracing_connection.cc index a8e79ae75af5..3fe58625f0d1 100644 --- a/google/cloud/monitoring/v3/internal/group_tracing_connection.cc +++ b/google/cloud/monitoring/v3/internal/group_tracing_connection.cc @@ -37,7 +37,7 @@ GroupServiceTracingConnection::ListGroups( google::monitoring::v3::ListGroupsRequest request) { auto span = internal::MakeSpan("monitoring_v3::GroupServiceConnection::ListGroups"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListGroups(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -82,7 +82,7 @@ GroupServiceTracingConnection::ListGroupMembers( google::monitoring::v3::ListGroupMembersRequest request) { auto span = internal::MakeSpan( "monitoring_v3::GroupServiceConnection::ListGroupMembers"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListGroupMembers(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); diff --git a/google/cloud/monitoring/v3/internal/metric_tracing_connection.cc b/google/cloud/monitoring/v3/internal/metric_tracing_connection.cc index bffe664fba95..64fedfcebe94 100644 --- a/google/cloud/monitoring/v3/internal/metric_tracing_connection.cc +++ b/google/cloud/monitoring/v3/internal/metric_tracing_connection.cc @@ -38,7 +38,7 @@ MetricServiceTracingConnection::ListMonitoredResourceDescriptors( auto span = internal::MakeSpan( "monitoring_v3::MetricServiceConnection::" "ListMonitoredResourceDescriptors"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListMonitoredResourceDescriptors(std::move(request)); return internal::MakeTracedStreamRange< google::api::MonitoredResourceDescriptor>(std::move(span), std::move(sr)); @@ -60,7 +60,7 @@ MetricServiceTracingConnection::ListMetricDescriptors( google::monitoring::v3::ListMetricDescriptorsRequest request) { auto span = internal::MakeSpan( "monitoring_v3::MetricServiceConnection::ListMetricDescriptors"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListMetricDescriptors(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -97,7 +97,7 @@ MetricServiceTracingConnection::ListTimeSeries( google::monitoring::v3::ListTimeSeriesRequest request) { auto span = internal::MakeSpan( "monitoring_v3::MetricServiceConnection::ListTimeSeries"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListTimeSeries(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -123,7 +123,7 @@ future MetricServiceTracingConnection::AsyncCreateTimeSeries( google::monitoring::v3::CreateTimeSeriesRequest const& request) { auto span = internal::MakeSpan( "monitoring_v3::MetricServiceConnection::AsyncCreateTimeSeries"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->AsyncCreateTimeSeries(request)); } diff --git a/google/cloud/monitoring/v3/internal/metric_tracing_stub.cc b/google/cloud/monitoring/v3/internal/metric_tracing_stub.cc index 358d96b96b19..1fd57a9812eb 100644 --- a/google/cloud/monitoring/v3/internal/metric_tracing_stub.cc +++ b/google/cloud/monitoring/v3/internal/metric_tracing_stub.cc @@ -144,10 +144,8 @@ future MetricServiceTracingStub::AsyncCreateTimeSeries( google::monitoring::v3::CreateTimeSeriesRequest const& request) { auto span = internal::MakeSpanGrpc("google.monitoring.v3.MetricService", "CreateTimeSeries"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateTimeSeries(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/monitoring/v3/internal/notification_channel_tracing_connection.cc b/google/cloud/monitoring/v3/internal/notification_channel_tracing_connection.cc index 317cd717aecf..ce8e5cbb47a0 100644 --- a/google/cloud/monitoring/v3/internal/notification_channel_tracing_connection.cc +++ b/google/cloud/monitoring/v3/internal/notification_channel_tracing_connection.cc @@ -40,7 +40,7 @@ NotificationChannelServiceTracingConnection::ListNotificationChannelDescriptors( auto span = internal::MakeSpan( "monitoring_v3::NotificationChannelServiceConnection::" "ListNotificationChannelDescriptors"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListNotificationChannelDescriptors(std::move(request)); return internal::MakeTracedStreamRange< google::monitoring::v3::NotificationChannelDescriptor>(std::move(span), @@ -65,7 +65,7 @@ NotificationChannelServiceTracingConnection::ListNotificationChannels( auto span = internal::MakeSpan( "monitoring_v3::NotificationChannelServiceConnection::" "ListNotificationChannels"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListNotificationChannels(std::move(request)); return internal::MakeTracedStreamRange< google::monitoring::v3::NotificationChannel>(std::move(span), diff --git a/google/cloud/monitoring/v3/internal/query_tracing_connection.cc b/google/cloud/monitoring/v3/internal/query_tracing_connection.cc index 961eed57e2f7..58ae0f4f6b1c 100644 --- a/google/cloud/monitoring/v3/internal/query_tracing_connection.cc +++ b/google/cloud/monitoring/v3/internal/query_tracing_connection.cc @@ -37,7 +37,7 @@ QueryServiceTracingConnection::QueryTimeSeries( google::monitoring::v3::QueryTimeSeriesRequest request) { auto span = internal::MakeSpan( "monitoring_v3::QueryServiceConnection::QueryTimeSeries"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->QueryTimeSeries(std::move(request)); return internal::MakeTracedStreamRange< google::monitoring::v3::TimeSeriesData>(std::move(span), std::move(sr)); diff --git a/google/cloud/monitoring/v3/internal/service_monitoring_tracing_connection.cc b/google/cloud/monitoring/v3/internal/service_monitoring_tracing_connection.cc index 587fad24a778..539789d9dfc6 100644 --- a/google/cloud/monitoring/v3/internal/service_monitoring_tracing_connection.cc +++ b/google/cloud/monitoring/v3/internal/service_monitoring_tracing_connection.cc @@ -57,7 +57,7 @@ ServiceMonitoringServiceTracingConnection::ListServices( google::monitoring::v3::ListServicesRequest request) { auto span = internal::MakeSpan( "monitoring_v3::ServiceMonitoringServiceConnection::ListServices"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListServices(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -106,7 +106,7 @@ ServiceMonitoringServiceTracingConnection::ListServiceLevelObjectives( auto span = internal::MakeSpan( "monitoring_v3::ServiceMonitoringServiceConnection::" "ListServiceLevelObjectives"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListServiceLevelObjectives(std::move(request)); return internal::MakeTracedStreamRange< google::monitoring::v3::ServiceLevelObjective>(std::move(span), diff --git a/google/cloud/monitoring/v3/internal/snooze_tracing_connection.cc b/google/cloud/monitoring/v3/internal/snooze_tracing_connection.cc index 0e6964a9cd6a..53aa0b26ad33 100644 --- a/google/cloud/monitoring/v3/internal/snooze_tracing_connection.cc +++ b/google/cloud/monitoring/v3/internal/snooze_tracing_connection.cc @@ -46,7 +46,7 @@ SnoozeServiceTracingConnection::ListSnoozes( google::monitoring::v3::ListSnoozesRequest request) { auto span = internal::MakeSpan("monitoring_v3::SnoozeServiceConnection::ListSnoozes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListSnoozes(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); diff --git a/google/cloud/monitoring/v3/internal/uptime_check_tracing_connection.cc b/google/cloud/monitoring/v3/internal/uptime_check_tracing_connection.cc index c06292680270..4d659c7b6595 100644 --- a/google/cloud/monitoring/v3/internal/uptime_check_tracing_connection.cc +++ b/google/cloud/monitoring/v3/internal/uptime_check_tracing_connection.cc @@ -37,7 +37,7 @@ UptimeCheckServiceTracingConnection::ListUptimeCheckConfigs( google::monitoring::v3::ListUptimeCheckConfigsRequest request) { auto span = internal::MakeSpan( "monitoring_v3::UptimeCheckServiceConnection::ListUptimeCheckConfigs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListUptimeCheckConfigs(std::move(request)); return internal::MakeTracedStreamRange< google::monitoring::v3::UptimeCheckConfig>(std::move(span), @@ -84,7 +84,7 @@ UptimeCheckServiceTracingConnection::ListUptimeCheckIps( google::monitoring::v3::ListUptimeCheckIpsRequest request) { auto span = internal::MakeSpan( "monitoring_v3::UptimeCheckServiceConnection::ListUptimeCheckIps"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListUptimeCheckIps(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); diff --git a/google/cloud/netapp/v1/internal/net_app_tracing_connection.cc b/google/cloud/netapp/v1/internal/net_app_tracing_connection.cc index dc810c844a8f..ac49b0f3c3ab 100644 --- a/google/cloud/netapp/v1/internal/net_app_tracing_connection.cc +++ b/google/cloud/netapp/v1/internal/net_app_tracing_connection.cc @@ -37,7 +37,7 @@ NetAppTracingConnection::ListStoragePools( google::cloud::netapp::v1::ListStoragePoolsRequest request) { auto span = internal::MakeSpan("netapp_v1::NetAppConnection::ListStoragePools"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListStoragePools(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::netapp::v1::StoragePool>(std::move(span), std::move(sr)); @@ -48,7 +48,7 @@ NetAppTracingConnection::CreateStoragePool( google::cloud::netapp::v1::CreateStoragePoolRequest const& request) { auto span = internal::MakeSpan("netapp_v1::NetAppConnection::CreateStoragePool"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateStoragePool(request)); } @@ -65,7 +65,7 @@ NetAppTracingConnection::UpdateStoragePool( google::cloud::netapp::v1::UpdateStoragePoolRequest const& request) { auto span = internal::MakeSpan("netapp_v1::NetAppConnection::UpdateStoragePool"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateStoragePool(request)); } @@ -74,7 +74,7 @@ NetAppTracingConnection::DeleteStoragePool( google::cloud::netapp::v1::DeleteStoragePoolRequest const& request) { auto span = internal::MakeSpan("netapp_v1::NetAppConnection::DeleteStoragePool"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteStoragePool(request)); } @@ -82,7 +82,7 @@ StreamRange NetAppTracingConnection::ListVolumes( google::cloud::netapp::v1::ListVolumesRequest request) { auto span = internal::MakeSpan("netapp_v1::NetAppConnection::ListVolumes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListVolumes(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -99,7 +99,7 @@ future> NetAppTracingConnection::CreateVolume( google::cloud::netapp::v1::CreateVolumeRequest const& request) { auto span = internal::MakeSpan("netapp_v1::NetAppConnection::CreateVolume"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateVolume(request)); } @@ -107,7 +107,7 @@ future> NetAppTracingConnection::UpdateVolume( google::cloud::netapp::v1::UpdateVolumeRequest const& request) { auto span = internal::MakeSpan("netapp_v1::NetAppConnection::UpdateVolume"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateVolume(request)); } @@ -115,7 +115,7 @@ future> NetAppTracingConnection::DeleteVolume( google::cloud::netapp::v1::DeleteVolumeRequest const& request) { auto span = internal::MakeSpan("netapp_v1::NetAppConnection::DeleteVolume"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteVolume(request)); } @@ -123,7 +123,7 @@ future> NetAppTracingConnection::RevertVolume( google::cloud::netapp::v1::RevertVolumeRequest const& request) { auto span = internal::MakeSpan("netapp_v1::NetAppConnection::RevertVolume"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RevertVolume(request)); } @@ -131,7 +131,7 @@ StreamRange NetAppTracingConnection::ListSnapshots( google::cloud::netapp::v1::ListSnapshotsRequest request) { auto span = internal::MakeSpan("netapp_v1::NetAppConnection::ListSnapshots"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListSnapshots(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -149,7 +149,7 @@ future> NetAppTracingConnection::CreateSnapshot( google::cloud::netapp::v1::CreateSnapshotRequest const& request) { auto span = internal::MakeSpan("netapp_v1::NetAppConnection::CreateSnapshot"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateSnapshot(request)); } @@ -157,7 +157,7 @@ future> NetAppTracingConnection::DeleteSnapshot( google::cloud::netapp::v1::DeleteSnapshotRequest const& request) { auto span = internal::MakeSpan("netapp_v1::NetAppConnection::DeleteSnapshot"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteSnapshot(request)); } @@ -165,7 +165,7 @@ future> NetAppTracingConnection::UpdateSnapshot( google::cloud::netapp::v1::UpdateSnapshotRequest const& request) { auto span = internal::MakeSpan("netapp_v1::NetAppConnection::UpdateSnapshot"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateSnapshot(request)); } @@ -174,7 +174,7 @@ NetAppTracingConnection::ListActiveDirectories( google::cloud::netapp::v1::ListActiveDirectoriesRequest request) { auto span = internal::MakeSpan("netapp_v1::NetAppConnection::ListActiveDirectories"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListActiveDirectories(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::netapp::v1::ActiveDirectory>(std::move(span), @@ -195,7 +195,7 @@ NetAppTracingConnection::CreateActiveDirectory( google::cloud::netapp::v1::CreateActiveDirectoryRequest const& request) { auto span = internal::MakeSpan("netapp_v1::NetAppConnection::CreateActiveDirectory"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateActiveDirectory(request)); } @@ -205,7 +205,7 @@ NetAppTracingConnection::UpdateActiveDirectory( google::cloud::netapp::v1::UpdateActiveDirectoryRequest const& request) { auto span = internal::MakeSpan("netapp_v1::NetAppConnection::UpdateActiveDirectory"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateActiveDirectory(request)); } @@ -215,7 +215,7 @@ NetAppTracingConnection::DeleteActiveDirectory( google::cloud::netapp::v1::DeleteActiveDirectoryRequest const& request) { auto span = internal::MakeSpan("netapp_v1::NetAppConnection::DeleteActiveDirectory"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteActiveDirectory(request)); } @@ -224,7 +224,7 @@ StreamRange NetAppTracingConnection::ListKmsConfigs( google::cloud::netapp::v1::ListKmsConfigsRequest request) { auto span = internal::MakeSpan("netapp_v1::NetAppConnection::ListKmsConfigs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListKmsConfigs(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -235,7 +235,7 @@ NetAppTracingConnection::CreateKmsConfig( google::cloud::netapp::v1::CreateKmsConfigRequest const& request) { auto span = internal::MakeSpan("netapp_v1::NetAppConnection::CreateKmsConfig"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateKmsConfig(request)); } @@ -252,7 +252,7 @@ NetAppTracingConnection::UpdateKmsConfig( google::cloud::netapp::v1::UpdateKmsConfigRequest const& request) { auto span = internal::MakeSpan("netapp_v1::NetAppConnection::UpdateKmsConfig"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateKmsConfig(request)); } @@ -260,7 +260,7 @@ future> NetAppTracingConnection::EncryptVolumes( google::cloud::netapp::v1::EncryptVolumesRequest const& request) { auto span = internal::MakeSpan("netapp_v1::NetAppConnection::EncryptVolumes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->EncryptVolumes(request)); } @@ -278,7 +278,7 @@ NetAppTracingConnection::DeleteKmsConfig( google::cloud::netapp::v1::DeleteKmsConfigRequest const& request) { auto span = internal::MakeSpan("netapp_v1::NetAppConnection::DeleteKmsConfig"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteKmsConfig(request)); } @@ -287,7 +287,7 @@ NetAppTracingConnection::ListReplications( google::cloud::netapp::v1::ListReplicationsRequest request) { auto span = internal::MakeSpan("netapp_v1::NetAppConnection::ListReplications"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListReplications(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::netapp::v1::Replication>(std::move(span), std::move(sr)); @@ -306,7 +306,7 @@ NetAppTracingConnection::CreateReplication( google::cloud::netapp::v1::CreateReplicationRequest const& request) { auto span = internal::MakeSpan("netapp_v1::NetAppConnection::CreateReplication"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateReplication(request)); } @@ -315,7 +315,7 @@ NetAppTracingConnection::DeleteReplication( google::cloud::netapp::v1::DeleteReplicationRequest const& request) { auto span = internal::MakeSpan("netapp_v1::NetAppConnection::DeleteReplication"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteReplication(request)); } @@ -324,7 +324,7 @@ NetAppTracingConnection::UpdateReplication( google::cloud::netapp::v1::UpdateReplicationRequest const& request) { auto span = internal::MakeSpan("netapp_v1::NetAppConnection::UpdateReplication"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateReplication(request)); } @@ -333,7 +333,7 @@ NetAppTracingConnection::StopReplication( google::cloud::netapp::v1::StopReplicationRequest const& request) { auto span = internal::MakeSpan("netapp_v1::NetAppConnection::StopReplication"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->StopReplication(request)); } @@ -342,7 +342,7 @@ NetAppTracingConnection::ResumeReplication( google::cloud::netapp::v1::ResumeReplicationRequest const& request) { auto span = internal::MakeSpan("netapp_v1::NetAppConnection::ResumeReplication"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ResumeReplication(request)); } @@ -352,7 +352,7 @@ NetAppTracingConnection::ReverseReplicationDirection( request) { auto span = internal::MakeSpan( "netapp_v1::NetAppConnection::ReverseReplicationDirection"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ReverseReplicationDirection(request)); } diff --git a/google/cloud/netapp/v1/internal/net_app_tracing_stub.cc b/google/cloud/netapp/v1/internal/net_app_tracing_stub.cc index 65833ae54c67..501115e80c60 100644 --- a/google/cloud/netapp/v1/internal/net_app_tracing_stub.cc +++ b/google/cloud/netapp/v1/internal/net_app_tracing_stub.cc @@ -48,10 +48,8 @@ NetAppTracingStub::AsyncCreateStoragePool( google::cloud::netapp::v1::CreateStoragePoolRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.netapp.v1.NetApp", "CreateStoragePool"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateStoragePool(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -75,10 +73,8 @@ NetAppTracingStub::AsyncUpdateStoragePool( google::cloud::netapp::v1::UpdateStoragePoolRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.netapp.v1.NetApp", "UpdateStoragePool"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateStoragePool(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -90,10 +86,8 @@ NetAppTracingStub::AsyncDeleteStoragePool( google::cloud::netapp::v1::DeleteStoragePoolRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.netapp.v1.NetApp", "DeleteStoragePool"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteStoragePool(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -127,10 +121,8 @@ NetAppTracingStub::AsyncCreateVolume( google::cloud::netapp::v1::CreateVolumeRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.netapp.v1.NetApp", "CreateVolume"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateVolume(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -142,10 +134,8 @@ NetAppTracingStub::AsyncUpdateVolume( google::cloud::netapp::v1::UpdateVolumeRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.netapp.v1.NetApp", "UpdateVolume"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateVolume(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -157,10 +147,8 @@ NetAppTracingStub::AsyncDeleteVolume( google::cloud::netapp::v1::DeleteVolumeRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.netapp.v1.NetApp", "DeleteVolume"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteVolume(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -172,10 +160,8 @@ NetAppTracingStub::AsyncRevertVolume( google::cloud::netapp::v1::RevertVolumeRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.netapp.v1.NetApp", "RevertVolume"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncRevertVolume(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -210,10 +196,8 @@ NetAppTracingStub::AsyncCreateSnapshot( google::cloud::netapp::v1::CreateSnapshotRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.netapp.v1.NetApp", "CreateSnapshot"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateSnapshot(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -225,10 +209,8 @@ NetAppTracingStub::AsyncDeleteSnapshot( google::cloud::netapp::v1::DeleteSnapshotRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.netapp.v1.NetApp", "DeleteSnapshot"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteSnapshot(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -240,10 +222,8 @@ NetAppTracingStub::AsyncUpdateSnapshot( google::cloud::netapp::v1::UpdateSnapshotRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.netapp.v1.NetApp", "UpdateSnapshot"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateSnapshot(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -279,10 +259,8 @@ NetAppTracingStub::AsyncCreateActiveDirectory( google::cloud::netapp::v1::CreateActiveDirectoryRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.netapp.v1.NetApp", "CreateActiveDirectory"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateActiveDirectory(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -294,10 +272,8 @@ NetAppTracingStub::AsyncUpdateActiveDirectory( google::cloud::netapp::v1::UpdateActiveDirectoryRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.netapp.v1.NetApp", "UpdateActiveDirectory"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateActiveDirectory(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -309,10 +285,8 @@ NetAppTracingStub::AsyncDeleteActiveDirectory( google::cloud::netapp::v1::DeleteActiveDirectoryRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.netapp.v1.NetApp", "DeleteActiveDirectory"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteActiveDirectory(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -336,10 +310,8 @@ NetAppTracingStub::AsyncCreateKmsConfig( google::cloud::netapp::v1::CreateKmsConfigRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.netapp.v1.NetApp", "CreateKmsConfig"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateKmsConfig(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -362,10 +334,8 @@ NetAppTracingStub::AsyncUpdateKmsConfig( google::cloud::netapp::v1::UpdateKmsConfigRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.netapp.v1.NetApp", "UpdateKmsConfig"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateKmsConfig(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -377,10 +347,8 @@ NetAppTracingStub::AsyncEncryptVolumes( google::cloud::netapp::v1::EncryptVolumesRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.netapp.v1.NetApp", "EncryptVolumes"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncEncryptVolumes(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -404,10 +372,8 @@ NetAppTracingStub::AsyncDeleteKmsConfig( google::cloud::netapp::v1::DeleteKmsConfigRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.netapp.v1.NetApp", "DeleteKmsConfig"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteKmsConfig(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -443,10 +409,8 @@ NetAppTracingStub::AsyncCreateReplication( google::cloud::netapp::v1::CreateReplicationRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.netapp.v1.NetApp", "CreateReplication"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateReplication(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -458,10 +422,8 @@ NetAppTracingStub::AsyncDeleteReplication( google::cloud::netapp::v1::DeleteReplicationRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.netapp.v1.NetApp", "DeleteReplication"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteReplication(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -473,10 +435,8 @@ NetAppTracingStub::AsyncUpdateReplication( google::cloud::netapp::v1::UpdateReplicationRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.netapp.v1.NetApp", "UpdateReplication"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateReplication(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -488,10 +448,8 @@ NetAppTracingStub::AsyncStopReplication( google::cloud::netapp::v1::StopReplicationRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.netapp.v1.NetApp", "StopReplication"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncStopReplication(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -503,10 +461,8 @@ NetAppTracingStub::AsyncResumeReplication( google::cloud::netapp::v1::ResumeReplicationRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.netapp.v1.NetApp", "ResumeReplication"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncResumeReplication(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -519,10 +475,8 @@ NetAppTracingStub::AsyncReverseReplicationDirection( request) { auto span = internal::MakeSpanGrpc("google.cloud.netapp.v1.NetApp", "ReverseReplicationDirection"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncReverseReplicationDirection(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -534,10 +488,8 @@ NetAppTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -548,10 +500,8 @@ future NetAppTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/networkconnectivity/v1/internal/hub_tracing_connection.cc b/google/cloud/networkconnectivity/v1/internal/hub_tracing_connection.cc index 399fdfbdcdd8..4e2b457c1323 100644 --- a/google/cloud/networkconnectivity/v1/internal/hub_tracing_connection.cc +++ b/google/cloud/networkconnectivity/v1/internal/hub_tracing_connection.cc @@ -37,7 +37,7 @@ HubServiceTracingConnection::ListHubs( google::cloud::networkconnectivity::v1::ListHubsRequest request) { auto span = internal::MakeSpan( "networkconnectivity_v1::HubServiceConnection::ListHubs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListHubs(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::networkconnectivity::v1::Hub>(std::move(span), @@ -58,7 +58,7 @@ HubServiceTracingConnection::CreateHub( google::cloud::networkconnectivity::v1::CreateHubRequest const& request) { auto span = internal::MakeSpan( "networkconnectivity_v1::HubServiceConnection::CreateHub"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateHub(request)); } @@ -67,7 +67,7 @@ HubServiceTracingConnection::UpdateHub( google::cloud::networkconnectivity::v1::UpdateHubRequest const& request) { auto span = internal::MakeSpan( "networkconnectivity_v1::HubServiceConnection::UpdateHub"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateHub(request)); } @@ -76,7 +76,7 @@ HubServiceTracingConnection::DeleteHub( google::cloud::networkconnectivity::v1::DeleteHubRequest const& request) { auto span = internal::MakeSpan( "networkconnectivity_v1::HubServiceConnection::DeleteHub"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteHub(request)); } @@ -85,7 +85,7 @@ HubServiceTracingConnection::ListHubSpokes( google::cloud::networkconnectivity::v1::ListHubSpokesRequest request) { auto span = internal::MakeSpan( "networkconnectivity_v1::HubServiceConnection::ListHubSpokes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListHubSpokes(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::networkconnectivity::v1::Spoke>(std::move(span), @@ -97,7 +97,7 @@ HubServiceTracingConnection::ListSpokes( google::cloud::networkconnectivity::v1::ListSpokesRequest request) { auto span = internal::MakeSpan( "networkconnectivity_v1::HubServiceConnection::ListSpokes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListSpokes(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::networkconnectivity::v1::Spoke>(std::move(span), @@ -118,7 +118,7 @@ HubServiceTracingConnection::CreateSpoke( google::cloud::networkconnectivity::v1::CreateSpokeRequest const& request) { auto span = internal::MakeSpan( "networkconnectivity_v1::HubServiceConnection::CreateSpoke"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateSpoke(request)); } @@ -127,7 +127,7 @@ HubServiceTracingConnection::UpdateSpoke( google::cloud::networkconnectivity::v1::UpdateSpokeRequest const& request) { auto span = internal::MakeSpan( "networkconnectivity_v1::HubServiceConnection::UpdateSpoke"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateSpoke(request)); } @@ -137,7 +137,7 @@ HubServiceTracingConnection::RejectHubSpoke( request) { auto span = internal::MakeSpan( "networkconnectivity_v1::HubServiceConnection::RejectHubSpoke"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RejectHubSpoke(request)); } @@ -147,7 +147,7 @@ HubServiceTracingConnection::AcceptHubSpoke( request) { auto span = internal::MakeSpan( "networkconnectivity_v1::HubServiceConnection::AcceptHubSpoke"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->AcceptHubSpoke(request)); } @@ -156,7 +156,7 @@ HubServiceTracingConnection::DeleteSpoke( google::cloud::networkconnectivity::v1::DeleteSpokeRequest const& request) { auto span = internal::MakeSpan( "networkconnectivity_v1::HubServiceConnection::DeleteSpoke"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteSpoke(request)); } @@ -184,7 +184,7 @@ HubServiceTracingConnection::ListRoutes( google::cloud::networkconnectivity::v1::ListRoutesRequest request) { auto span = internal::MakeSpan( "networkconnectivity_v1::HubServiceConnection::ListRoutes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListRoutes(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::networkconnectivity::v1::Route>(std::move(span), @@ -196,7 +196,7 @@ HubServiceTracingConnection::ListRouteTables( google::cloud::networkconnectivity::v1::ListRouteTablesRequest request) { auto span = internal::MakeSpan( "networkconnectivity_v1::HubServiceConnection::ListRouteTables"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListRouteTables(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::networkconnectivity::v1::RouteTable>(std::move(span), @@ -217,7 +217,7 @@ HubServiceTracingConnection::ListGroups( google::cloud::networkconnectivity::v1::ListGroupsRequest request) { auto span = internal::MakeSpan( "networkconnectivity_v1::HubServiceConnection::ListGroups"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListGroups(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::networkconnectivity::v1::Group>(std::move(span), diff --git a/google/cloud/networkconnectivity/v1/internal/hub_tracing_stub.cc b/google/cloud/networkconnectivity/v1/internal/hub_tracing_stub.cc index ef4ce23dedaa..dcb82bf82b20 100644 --- a/google/cloud/networkconnectivity/v1/internal/hub_tracing_stub.cc +++ b/google/cloud/networkconnectivity/v1/internal/hub_tracing_stub.cc @@ -59,10 +59,8 @@ HubServiceTracingStub::AsyncCreateHub( google::cloud::networkconnectivity::v1::CreateHubRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.networkconnectivity.v1.HubService", "CreateHub"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateHub(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -74,10 +72,8 @@ HubServiceTracingStub::AsyncUpdateHub( google::cloud::networkconnectivity::v1::UpdateHubRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.networkconnectivity.v1.HubService", "UpdateHub"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateHub(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -89,10 +85,8 @@ HubServiceTracingStub::AsyncDeleteHub( google::cloud::networkconnectivity::v1::DeleteHubRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.networkconnectivity.v1.HubService", "DeleteHub"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteHub(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -140,10 +134,8 @@ HubServiceTracingStub::AsyncCreateSpoke( google::cloud::networkconnectivity::v1::CreateSpokeRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.networkconnectivity.v1.HubService", "CreateSpoke"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateSpoke(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -155,10 +147,8 @@ HubServiceTracingStub::AsyncUpdateSpoke( google::cloud::networkconnectivity::v1::UpdateSpokeRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.networkconnectivity.v1.HubService", "UpdateSpoke"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateSpoke(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -171,10 +161,8 @@ HubServiceTracingStub::AsyncRejectHubSpoke( request) { auto span = internal::MakeSpanGrpc( "google.cloud.networkconnectivity.v1.HubService", "RejectHubSpoke"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncRejectHubSpoke(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -187,10 +175,8 @@ HubServiceTracingStub::AsyncAcceptHubSpoke( request) { auto span = internal::MakeSpanGrpc( "google.cloud.networkconnectivity.v1.HubService", "AcceptHubSpoke"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncAcceptHubSpoke(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -202,10 +188,8 @@ HubServiceTracingStub::AsyncDeleteSpoke( google::cloud::networkconnectivity::v1::DeleteSpokeRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.networkconnectivity.v1.HubService", "DeleteSpoke"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteSpoke(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -289,10 +273,8 @@ HubServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -303,10 +285,8 @@ future HubServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/networkmanagement/v1/internal/reachability_tracing_connection.cc b/google/cloud/networkmanagement/v1/internal/reachability_tracing_connection.cc index ff217bac80da..4b36af10d0cc 100644 --- a/google/cloud/networkmanagement/v1/internal/reachability_tracing_connection.cc +++ b/google/cloud/networkmanagement/v1/internal/reachability_tracing_connection.cc @@ -39,7 +39,7 @@ ReachabilityServiceTracingConnection::ListConnectivityTests( auto span = internal::MakeSpan( "networkmanagement_v1::ReachabilityServiceConnection::" "ListConnectivityTests"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListConnectivityTests(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::networkmanagement::v1::ConnectivityTest>(std::move(span), @@ -64,7 +64,7 @@ ReachabilityServiceTracingConnection::CreateConnectivityTest( auto span = internal::MakeSpan( "networkmanagement_v1::ReachabilityServiceConnection::" "CreateConnectivityTest"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateConnectivityTest(request)); } @@ -76,7 +76,7 @@ ReachabilityServiceTracingConnection::UpdateConnectivityTest( auto span = internal::MakeSpan( "networkmanagement_v1::ReachabilityServiceConnection::" "UpdateConnectivityTest"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateConnectivityTest(request)); } @@ -88,7 +88,7 @@ ReachabilityServiceTracingConnection::RerunConnectivityTest( auto span = internal::MakeSpan( "networkmanagement_v1::ReachabilityServiceConnection::" "RerunConnectivityTest"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RerunConnectivityTest(request)); } @@ -100,7 +100,7 @@ ReachabilityServiceTracingConnection::DeleteConnectivityTest( auto span = internal::MakeSpan( "networkmanagement_v1::ReachabilityServiceConnection::" "DeleteConnectivityTest"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteConnectivityTest(request)); } diff --git a/google/cloud/networkmanagement/v1/internal/reachability_tracing_stub.cc b/google/cloud/networkmanagement/v1/internal/reachability_tracing_stub.cc index be5f08372d30..e96977edafc8 100644 --- a/google/cloud/networkmanagement/v1/internal/reachability_tracing_stub.cc +++ b/google/cloud/networkmanagement/v1/internal/reachability_tracing_stub.cc @@ -67,10 +67,8 @@ ReachabilityServiceTracingStub::AsyncCreateConnectivityTest( auto span = internal::MakeSpanGrpc( "google.cloud.networkmanagement.v1.ReachabilityService", "CreateConnectivityTest"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateConnectivityTest(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -84,10 +82,8 @@ ReachabilityServiceTracingStub::AsyncUpdateConnectivityTest( auto span = internal::MakeSpanGrpc( "google.cloud.networkmanagement.v1.ReachabilityService", "UpdateConnectivityTest"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateConnectivityTest(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -101,10 +97,8 @@ ReachabilityServiceTracingStub::AsyncRerunConnectivityTest( auto span = internal::MakeSpanGrpc( "google.cloud.networkmanagement.v1.ReachabilityService", "RerunConnectivityTest"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncRerunConnectivityTest(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -118,10 +112,8 @@ ReachabilityServiceTracingStub::AsyncDeleteConnectivityTest( auto span = internal::MakeSpanGrpc( "google.cloud.networkmanagement.v1.ReachabilityService", "DeleteConnectivityTest"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteConnectivityTest(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -133,10 +125,8 @@ ReachabilityServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -147,10 +137,8 @@ future ReachabilityServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/networksecurity/v1/internal/network_security_tracing_connection.cc b/google/cloud/networksecurity/v1/internal/network_security_tracing_connection.cc index 190e113adcb6..f61d260968f3 100644 --- a/google/cloud/networksecurity/v1/internal/network_security_tracing_connection.cc +++ b/google/cloud/networksecurity/v1/internal/network_security_tracing_connection.cc @@ -39,7 +39,7 @@ NetworkSecurityTracingConnection::ListAuthorizationPolicies( auto span = internal::MakeSpan( "networksecurity_v1::NetworkSecurityConnection::" "ListAuthorizationPolicies"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListAuthorizationPolicies(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::networksecurity::v1::AuthorizationPolicy>(std::move(span), @@ -63,7 +63,7 @@ NetworkSecurityTracingConnection::CreateAuthorizationPolicy( auto span = internal::MakeSpan( "networksecurity_v1::NetworkSecurityConnection::" "CreateAuthorizationPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateAuthorizationPolicy(request)); } @@ -75,7 +75,7 @@ NetworkSecurityTracingConnection::UpdateAuthorizationPolicy( auto span = internal::MakeSpan( "networksecurity_v1::NetworkSecurityConnection::" "UpdateAuthorizationPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateAuthorizationPolicy(request)); } @@ -87,7 +87,7 @@ NetworkSecurityTracingConnection::DeleteAuthorizationPolicy( auto span = internal::MakeSpan( "networksecurity_v1::NetworkSecurityConnection::" "DeleteAuthorizationPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteAuthorizationPolicy(request)); } @@ -97,7 +97,7 @@ NetworkSecurityTracingConnection::ListServerTlsPolicies( google::cloud::networksecurity::v1::ListServerTlsPoliciesRequest request) { auto span = internal::MakeSpan( "networksecurity_v1::NetworkSecurityConnection::ListServerTlsPolicies"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListServerTlsPolicies(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::networksecurity::v1::ServerTlsPolicy>(std::move(span), @@ -120,7 +120,7 @@ NetworkSecurityTracingConnection::CreateServerTlsPolicy( request) { auto span = internal::MakeSpan( "networksecurity_v1::NetworkSecurityConnection::CreateServerTlsPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateServerTlsPolicy(request)); } @@ -131,7 +131,7 @@ NetworkSecurityTracingConnection::UpdateServerTlsPolicy( request) { auto span = internal::MakeSpan( "networksecurity_v1::NetworkSecurityConnection::UpdateServerTlsPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateServerTlsPolicy(request)); } @@ -142,7 +142,7 @@ NetworkSecurityTracingConnection::DeleteServerTlsPolicy( request) { auto span = internal::MakeSpan( "networksecurity_v1::NetworkSecurityConnection::DeleteServerTlsPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteServerTlsPolicy(request)); } @@ -152,7 +152,7 @@ NetworkSecurityTracingConnection::ListClientTlsPolicies( google::cloud::networksecurity::v1::ListClientTlsPoliciesRequest request) { auto span = internal::MakeSpan( "networksecurity_v1::NetworkSecurityConnection::ListClientTlsPolicies"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListClientTlsPolicies(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::networksecurity::v1::ClientTlsPolicy>(std::move(span), @@ -175,7 +175,7 @@ NetworkSecurityTracingConnection::CreateClientTlsPolicy( request) { auto span = internal::MakeSpan( "networksecurity_v1::NetworkSecurityConnection::CreateClientTlsPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateClientTlsPolicy(request)); } @@ -186,7 +186,7 @@ NetworkSecurityTracingConnection::UpdateClientTlsPolicy( request) { auto span = internal::MakeSpan( "networksecurity_v1::NetworkSecurityConnection::UpdateClientTlsPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateClientTlsPolicy(request)); } @@ -197,7 +197,7 @@ NetworkSecurityTracingConnection::DeleteClientTlsPolicy( request) { auto span = internal::MakeSpan( "networksecurity_v1::NetworkSecurityConnection::DeleteClientTlsPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteClientTlsPolicy(request)); } diff --git a/google/cloud/networksecurity/v1/internal/network_security_tracing_stub.cc b/google/cloud/networksecurity/v1/internal/network_security_tracing_stub.cc index ccb09d68ad22..1ec815011b49 100644 --- a/google/cloud/networksecurity/v1/internal/network_security_tracing_stub.cc +++ b/google/cloud/networksecurity/v1/internal/network_security_tracing_stub.cc @@ -67,10 +67,8 @@ NetworkSecurityTracingStub::AsyncCreateAuthorizationPolicy( auto span = internal::MakeSpanGrpc("google.cloud.networksecurity.v1.NetworkSecurity", "CreateAuthorizationPolicy"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateAuthorizationPolicy(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -84,10 +82,8 @@ NetworkSecurityTracingStub::AsyncUpdateAuthorizationPolicy( auto span = internal::MakeSpanGrpc("google.cloud.networksecurity.v1.NetworkSecurity", "UpdateAuthorizationPolicy"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateAuthorizationPolicy(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -101,10 +97,8 @@ NetworkSecurityTracingStub::AsyncDeleteAuthorizationPolicy( auto span = internal::MakeSpanGrpc("google.cloud.networksecurity.v1.NetworkSecurity", "DeleteAuthorizationPolicy"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteAuthorizationPolicy(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -145,10 +139,8 @@ NetworkSecurityTracingStub::AsyncCreateServerTlsPolicy( auto span = internal::MakeSpanGrpc("google.cloud.networksecurity.v1.NetworkSecurity", "CreateServerTlsPolicy"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateServerTlsPolicy(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -162,10 +154,8 @@ NetworkSecurityTracingStub::AsyncUpdateServerTlsPolicy( auto span = internal::MakeSpanGrpc("google.cloud.networksecurity.v1.NetworkSecurity", "UpdateServerTlsPolicy"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateServerTlsPolicy(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -179,10 +169,8 @@ NetworkSecurityTracingStub::AsyncDeleteServerTlsPolicy( auto span = internal::MakeSpanGrpc("google.cloud.networksecurity.v1.NetworkSecurity", "DeleteServerTlsPolicy"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteServerTlsPolicy(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -223,10 +211,8 @@ NetworkSecurityTracingStub::AsyncCreateClientTlsPolicy( auto span = internal::MakeSpanGrpc("google.cloud.networksecurity.v1.NetworkSecurity", "CreateClientTlsPolicy"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateClientTlsPolicy(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -240,10 +226,8 @@ NetworkSecurityTracingStub::AsyncUpdateClientTlsPolicy( auto span = internal::MakeSpanGrpc("google.cloud.networksecurity.v1.NetworkSecurity", "UpdateClientTlsPolicy"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateClientTlsPolicy(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -257,10 +241,8 @@ NetworkSecurityTracingStub::AsyncDeleteClientTlsPolicy( auto span = internal::MakeSpanGrpc("google.cloud.networksecurity.v1.NetworkSecurity", "DeleteClientTlsPolicy"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteClientTlsPolicy(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -272,10 +254,8 @@ NetworkSecurityTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -286,10 +266,8 @@ future NetworkSecurityTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/networkservices/v1/internal/network_services_tracing_connection.cc b/google/cloud/networkservices/v1/internal/network_services_tracing_connection.cc index a301b439578e..561e432b0370 100644 --- a/google/cloud/networkservices/v1/internal/network_services_tracing_connection.cc +++ b/google/cloud/networkservices/v1/internal/network_services_tracing_connection.cc @@ -37,7 +37,7 @@ NetworkServicesTracingConnection::ListEndpointPolicies( google::cloud::networkservices::v1::ListEndpointPoliciesRequest request) { auto span = internal::MakeSpan( "networkservices_v1::NetworkServicesConnection::ListEndpointPolicies"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListEndpointPolicies(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::networkservices::v1::EndpointPolicy>(std::move(span), @@ -60,7 +60,7 @@ NetworkServicesTracingConnection::CreateEndpointPolicy( request) { auto span = internal::MakeSpan( "networkservices_v1::NetworkServicesConnection::CreateEndpointPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateEndpointPolicy(request)); } @@ -71,7 +71,7 @@ NetworkServicesTracingConnection::UpdateEndpointPolicy( request) { auto span = internal::MakeSpan( "networkservices_v1::NetworkServicesConnection::UpdateEndpointPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateEndpointPolicy(request)); } @@ -82,7 +82,7 @@ NetworkServicesTracingConnection::DeleteEndpointPolicy( request) { auto span = internal::MakeSpan( "networkservices_v1::NetworkServicesConnection::DeleteEndpointPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteEndpointPolicy(request)); } @@ -92,7 +92,7 @@ NetworkServicesTracingConnection::ListGateways( google::cloud::networkservices::v1::ListGatewaysRequest request) { auto span = internal::MakeSpan( "networkservices_v1::NetworkServicesConnection::ListGateways"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListGateways(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::networkservices::v1::Gateway>(std::move(span), @@ -113,7 +113,7 @@ NetworkServicesTracingConnection::CreateGateway( google::cloud::networkservices::v1::CreateGatewayRequest const& request) { auto span = internal::MakeSpan( "networkservices_v1::NetworkServicesConnection::CreateGateway"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateGateway(request)); } @@ -122,7 +122,7 @@ NetworkServicesTracingConnection::UpdateGateway( google::cloud::networkservices::v1::UpdateGatewayRequest const& request) { auto span = internal::MakeSpan( "networkservices_v1::NetworkServicesConnection::UpdateGateway"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateGateway(request)); } @@ -131,7 +131,7 @@ NetworkServicesTracingConnection::DeleteGateway( google::cloud::networkservices::v1::DeleteGatewayRequest const& request) { auto span = internal::MakeSpan( "networkservices_v1::NetworkServicesConnection::DeleteGateway"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteGateway(request)); } @@ -140,7 +140,7 @@ NetworkServicesTracingConnection::ListGrpcRoutes( google::cloud::networkservices::v1::ListGrpcRoutesRequest request) { auto span = internal::MakeSpan( "networkservices_v1::NetworkServicesConnection::ListGrpcRoutes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListGrpcRoutes(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::networkservices::v1::GrpcRoute>(std::move(span), @@ -161,7 +161,7 @@ NetworkServicesTracingConnection::CreateGrpcRoute( google::cloud::networkservices::v1::CreateGrpcRouteRequest const& request) { auto span = internal::MakeSpan( "networkservices_v1::NetworkServicesConnection::CreateGrpcRoute"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateGrpcRoute(request)); } @@ -170,7 +170,7 @@ NetworkServicesTracingConnection::UpdateGrpcRoute( google::cloud::networkservices::v1::UpdateGrpcRouteRequest const& request) { auto span = internal::MakeSpan( "networkservices_v1::NetworkServicesConnection::UpdateGrpcRoute"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateGrpcRoute(request)); } @@ -179,7 +179,7 @@ NetworkServicesTracingConnection::DeleteGrpcRoute( google::cloud::networkservices::v1::DeleteGrpcRouteRequest const& request) { auto span = internal::MakeSpan( "networkservices_v1::NetworkServicesConnection::DeleteGrpcRoute"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteGrpcRoute(request)); } @@ -188,7 +188,7 @@ NetworkServicesTracingConnection::ListHttpRoutes( google::cloud::networkservices::v1::ListHttpRoutesRequest request) { auto span = internal::MakeSpan( "networkservices_v1::NetworkServicesConnection::ListHttpRoutes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListHttpRoutes(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::networkservices::v1::HttpRoute>(std::move(span), @@ -209,7 +209,7 @@ NetworkServicesTracingConnection::CreateHttpRoute( google::cloud::networkservices::v1::CreateHttpRouteRequest const& request) { auto span = internal::MakeSpan( "networkservices_v1::NetworkServicesConnection::CreateHttpRoute"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateHttpRoute(request)); } @@ -218,7 +218,7 @@ NetworkServicesTracingConnection::UpdateHttpRoute( google::cloud::networkservices::v1::UpdateHttpRouteRequest const& request) { auto span = internal::MakeSpan( "networkservices_v1::NetworkServicesConnection::UpdateHttpRoute"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateHttpRoute(request)); } @@ -227,7 +227,7 @@ NetworkServicesTracingConnection::DeleteHttpRoute( google::cloud::networkservices::v1::DeleteHttpRouteRequest const& request) { auto span = internal::MakeSpan( "networkservices_v1::NetworkServicesConnection::DeleteHttpRoute"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteHttpRoute(request)); } @@ -236,7 +236,7 @@ NetworkServicesTracingConnection::ListTcpRoutes( google::cloud::networkservices::v1::ListTcpRoutesRequest request) { auto span = internal::MakeSpan( "networkservices_v1::NetworkServicesConnection::ListTcpRoutes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListTcpRoutes(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::networkservices::v1::TcpRoute>(std::move(span), @@ -257,7 +257,7 @@ NetworkServicesTracingConnection::CreateTcpRoute( google::cloud::networkservices::v1::CreateTcpRouteRequest const& request) { auto span = internal::MakeSpan( "networkservices_v1::NetworkServicesConnection::CreateTcpRoute"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateTcpRoute(request)); } @@ -266,7 +266,7 @@ NetworkServicesTracingConnection::UpdateTcpRoute( google::cloud::networkservices::v1::UpdateTcpRouteRequest const& request) { auto span = internal::MakeSpan( "networkservices_v1::NetworkServicesConnection::UpdateTcpRoute"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateTcpRoute(request)); } @@ -275,7 +275,7 @@ NetworkServicesTracingConnection::DeleteTcpRoute( google::cloud::networkservices::v1::DeleteTcpRouteRequest const& request) { auto span = internal::MakeSpan( "networkservices_v1::NetworkServicesConnection::DeleteTcpRoute"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteTcpRoute(request)); } @@ -284,7 +284,7 @@ NetworkServicesTracingConnection::ListTlsRoutes( google::cloud::networkservices::v1::ListTlsRoutesRequest request) { auto span = internal::MakeSpan( "networkservices_v1::NetworkServicesConnection::ListTlsRoutes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListTlsRoutes(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::networkservices::v1::TlsRoute>(std::move(span), @@ -305,7 +305,7 @@ NetworkServicesTracingConnection::CreateTlsRoute( google::cloud::networkservices::v1::CreateTlsRouteRequest const& request) { auto span = internal::MakeSpan( "networkservices_v1::NetworkServicesConnection::CreateTlsRoute"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateTlsRoute(request)); } @@ -314,7 +314,7 @@ NetworkServicesTracingConnection::UpdateTlsRoute( google::cloud::networkservices::v1::UpdateTlsRouteRequest const& request) { auto span = internal::MakeSpan( "networkservices_v1::NetworkServicesConnection::UpdateTlsRoute"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateTlsRoute(request)); } @@ -323,7 +323,7 @@ NetworkServicesTracingConnection::DeleteTlsRoute( google::cloud::networkservices::v1::DeleteTlsRouteRequest const& request) { auto span = internal::MakeSpan( "networkservices_v1::NetworkServicesConnection::DeleteTlsRoute"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteTlsRoute(request)); } @@ -332,7 +332,7 @@ NetworkServicesTracingConnection::ListServiceBindings( google::cloud::networkservices::v1::ListServiceBindingsRequest request) { auto span = internal::MakeSpan( "networkservices_v1::NetworkServicesConnection::ListServiceBindings"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListServiceBindings(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::networkservices::v1::ServiceBinding>(std::move(span), @@ -355,7 +355,7 @@ NetworkServicesTracingConnection::CreateServiceBinding( request) { auto span = internal::MakeSpan( "networkservices_v1::NetworkServicesConnection::CreateServiceBinding"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateServiceBinding(request)); } @@ -366,7 +366,7 @@ NetworkServicesTracingConnection::DeleteServiceBinding( request) { auto span = internal::MakeSpan( "networkservices_v1::NetworkServicesConnection::DeleteServiceBinding"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteServiceBinding(request)); } @@ -376,7 +376,7 @@ NetworkServicesTracingConnection::ListMeshes( google::cloud::networkservices::v1::ListMeshesRequest request) { auto span = internal::MakeSpan( "networkservices_v1::NetworkServicesConnection::ListMeshes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListMeshes(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::networkservices::v1::Mesh>(std::move(span), std::move(sr)); @@ -396,7 +396,7 @@ NetworkServicesTracingConnection::CreateMesh( google::cloud::networkservices::v1::CreateMeshRequest const& request) { auto span = internal::MakeSpan( "networkservices_v1::NetworkServicesConnection::CreateMesh"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateMesh(request)); } @@ -405,7 +405,7 @@ NetworkServicesTracingConnection::UpdateMesh( google::cloud::networkservices::v1::UpdateMeshRequest const& request) { auto span = internal::MakeSpan( "networkservices_v1::NetworkServicesConnection::UpdateMesh"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateMesh(request)); } @@ -414,7 +414,7 @@ NetworkServicesTracingConnection::DeleteMesh( google::cloud::networkservices::v1::DeleteMeshRequest const& request) { auto span = internal::MakeSpan( "networkservices_v1::NetworkServicesConnection::DeleteMesh"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteMesh(request)); } diff --git a/google/cloud/networkservices/v1/internal/network_services_tracing_stub.cc b/google/cloud/networkservices/v1/internal/network_services_tracing_stub.cc index c363153f9a3c..48d66bc2b9e1 100644 --- a/google/cloud/networkservices/v1/internal/network_services_tracing_stub.cc +++ b/google/cloud/networkservices/v1/internal/network_services_tracing_stub.cc @@ -66,10 +66,8 @@ NetworkServicesTracingStub::AsyncCreateEndpointPolicy( auto span = internal::MakeSpanGrpc("google.cloud.networkservices.v1.NetworkServices", "CreateEndpointPolicy"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateEndpointPolicy(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -83,10 +81,8 @@ NetworkServicesTracingStub::AsyncUpdateEndpointPolicy( auto span = internal::MakeSpanGrpc("google.cloud.networkservices.v1.NetworkServices", "UpdateEndpointPolicy"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateEndpointPolicy(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -100,10 +96,8 @@ NetworkServicesTracingStub::AsyncDeleteEndpointPolicy( auto span = internal::MakeSpanGrpc("google.cloud.networkservices.v1.NetworkServices", "DeleteEndpointPolicy"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteEndpointPolicy(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -139,10 +133,8 @@ NetworkServicesTracingStub::AsyncCreateGateway( google::cloud::networkservices::v1::CreateGatewayRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.networkservices.v1.NetworkServices", "CreateGateway"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateGateway(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -154,10 +146,8 @@ NetworkServicesTracingStub::AsyncUpdateGateway( google::cloud::networkservices::v1::UpdateGatewayRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.networkservices.v1.NetworkServices", "UpdateGateway"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateGateway(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -169,10 +159,8 @@ NetworkServicesTracingStub::AsyncDeleteGateway( google::cloud::networkservices::v1::DeleteGatewayRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.networkservices.v1.NetworkServices", "DeleteGateway"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteGateway(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -208,10 +196,8 @@ NetworkServicesTracingStub::AsyncCreateGrpcRoute( google::cloud::networkservices::v1::CreateGrpcRouteRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.networkservices.v1.NetworkServices", "CreateGrpcRoute"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateGrpcRoute(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -223,10 +209,8 @@ NetworkServicesTracingStub::AsyncUpdateGrpcRoute( google::cloud::networkservices::v1::UpdateGrpcRouteRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.networkservices.v1.NetworkServices", "UpdateGrpcRoute"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateGrpcRoute(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -238,10 +222,8 @@ NetworkServicesTracingStub::AsyncDeleteGrpcRoute( google::cloud::networkservices::v1::DeleteGrpcRouteRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.networkservices.v1.NetworkServices", "DeleteGrpcRoute"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteGrpcRoute(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -277,10 +259,8 @@ NetworkServicesTracingStub::AsyncCreateHttpRoute( google::cloud::networkservices::v1::CreateHttpRouteRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.networkservices.v1.NetworkServices", "CreateHttpRoute"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateHttpRoute(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -292,10 +272,8 @@ NetworkServicesTracingStub::AsyncUpdateHttpRoute( google::cloud::networkservices::v1::UpdateHttpRouteRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.networkservices.v1.NetworkServices", "UpdateHttpRoute"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateHttpRoute(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -307,10 +285,8 @@ NetworkServicesTracingStub::AsyncDeleteHttpRoute( google::cloud::networkservices::v1::DeleteHttpRouteRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.networkservices.v1.NetworkServices", "DeleteHttpRoute"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteHttpRoute(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -346,10 +322,8 @@ NetworkServicesTracingStub::AsyncCreateTcpRoute( google::cloud::networkservices::v1::CreateTcpRouteRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.networkservices.v1.NetworkServices", "CreateTcpRoute"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateTcpRoute(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -361,10 +335,8 @@ NetworkServicesTracingStub::AsyncUpdateTcpRoute( google::cloud::networkservices::v1::UpdateTcpRouteRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.networkservices.v1.NetworkServices", "UpdateTcpRoute"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateTcpRoute(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -376,10 +348,8 @@ NetworkServicesTracingStub::AsyncDeleteTcpRoute( google::cloud::networkservices::v1::DeleteTcpRouteRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.networkservices.v1.NetworkServices", "DeleteTcpRoute"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteTcpRoute(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -415,10 +385,8 @@ NetworkServicesTracingStub::AsyncCreateTlsRoute( google::cloud::networkservices::v1::CreateTlsRouteRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.networkservices.v1.NetworkServices", "CreateTlsRoute"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateTlsRoute(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -430,10 +398,8 @@ NetworkServicesTracingStub::AsyncUpdateTlsRoute( google::cloud::networkservices::v1::UpdateTlsRouteRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.networkservices.v1.NetworkServices", "UpdateTlsRoute"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateTlsRoute(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -445,10 +411,8 @@ NetworkServicesTracingStub::AsyncDeleteTlsRoute( google::cloud::networkservices::v1::DeleteTlsRouteRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.networkservices.v1.NetworkServices", "DeleteTlsRoute"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteTlsRoute(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -488,10 +452,8 @@ NetworkServicesTracingStub::AsyncCreateServiceBinding( auto span = internal::MakeSpanGrpc("google.cloud.networkservices.v1.NetworkServices", "CreateServiceBinding"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateServiceBinding(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -505,10 +467,8 @@ NetworkServicesTracingStub::AsyncDeleteServiceBinding( auto span = internal::MakeSpanGrpc("google.cloud.networkservices.v1.NetworkServices", "DeleteServiceBinding"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteServiceBinding(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -543,10 +503,8 @@ NetworkServicesTracingStub::AsyncCreateMesh( google::cloud::networkservices::v1::CreateMeshRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.networkservices.v1.NetworkServices", "CreateMesh"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateMesh(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -558,10 +516,8 @@ NetworkServicesTracingStub::AsyncUpdateMesh( google::cloud::networkservices::v1::UpdateMeshRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.networkservices.v1.NetworkServices", "UpdateMesh"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateMesh(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -573,10 +529,8 @@ NetworkServicesTracingStub::AsyncDeleteMesh( google::cloud::networkservices::v1::DeleteMeshRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.networkservices.v1.NetworkServices", "DeleteMesh"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteMesh(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -588,10 +542,8 @@ NetworkServicesTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -602,10 +554,8 @@ future NetworkServicesTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/notebooks/v1/internal/managed_notebook_tracing_connection.cc b/google/cloud/notebooks/v1/internal/managed_notebook_tracing_connection.cc index 9b3ec28f685b..3289669b9fe3 100644 --- a/google/cloud/notebooks/v1/internal/managed_notebook_tracing_connection.cc +++ b/google/cloud/notebooks/v1/internal/managed_notebook_tracing_connection.cc @@ -38,7 +38,7 @@ ManagedNotebookServiceTracingConnection::ListRuntimes( google::cloud::notebooks::v1::ListRuntimesRequest request) { auto span = internal::MakeSpan( "notebooks_v1::ManagedNotebookServiceConnection::ListRuntimes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListRuntimes(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -58,7 +58,7 @@ ManagedNotebookServiceTracingConnection::CreateRuntime( google::cloud::notebooks::v1::CreateRuntimeRequest const& request) { auto span = internal::MakeSpan( "notebooks_v1::ManagedNotebookServiceConnection::CreateRuntime"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateRuntime(request)); } @@ -67,7 +67,7 @@ ManagedNotebookServiceTracingConnection::UpdateRuntime( google::cloud::notebooks::v1::UpdateRuntimeRequest const& request) { auto span = internal::MakeSpan( "notebooks_v1::ManagedNotebookServiceConnection::UpdateRuntime"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateRuntime(request)); } @@ -76,7 +76,7 @@ ManagedNotebookServiceTracingConnection::DeleteRuntime( google::cloud::notebooks::v1::DeleteRuntimeRequest const& request) { auto span = internal::MakeSpan( "notebooks_v1::ManagedNotebookServiceConnection::DeleteRuntime"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteRuntime(request)); } @@ -85,7 +85,7 @@ ManagedNotebookServiceTracingConnection::StartRuntime( google::cloud::notebooks::v1::StartRuntimeRequest const& request) { auto span = internal::MakeSpan( "notebooks_v1::ManagedNotebookServiceConnection::StartRuntime"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->StartRuntime(request)); } @@ -94,7 +94,7 @@ ManagedNotebookServiceTracingConnection::StopRuntime( google::cloud::notebooks::v1::StopRuntimeRequest const& request) { auto span = internal::MakeSpan( "notebooks_v1::ManagedNotebookServiceConnection::StopRuntime"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->StopRuntime(request)); } @@ -103,7 +103,7 @@ ManagedNotebookServiceTracingConnection::SwitchRuntime( google::cloud::notebooks::v1::SwitchRuntimeRequest const& request) { auto span = internal::MakeSpan( "notebooks_v1::ManagedNotebookServiceConnection::SwitchRuntime"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SwitchRuntime(request)); } @@ -112,7 +112,7 @@ ManagedNotebookServiceTracingConnection::ResetRuntime( google::cloud::notebooks::v1::ResetRuntimeRequest const& request) { auto span = internal::MakeSpan( "notebooks_v1::ManagedNotebookServiceConnection::ResetRuntime"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ResetRuntime(request)); } @@ -121,7 +121,7 @@ ManagedNotebookServiceTracingConnection::UpgradeRuntime( google::cloud::notebooks::v1::UpgradeRuntimeRequest const& request) { auto span = internal::MakeSpan( "notebooks_v1::ManagedNotebookServiceConnection::UpgradeRuntime"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpgradeRuntime(request)); } @@ -130,7 +130,7 @@ ManagedNotebookServiceTracingConnection::ReportRuntimeEvent( google::cloud::notebooks::v1::ReportRuntimeEventRequest const& request) { auto span = internal::MakeSpan( "notebooks_v1::ManagedNotebookServiceConnection::ReportRuntimeEvent"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ReportRuntimeEvent(request)); } @@ -151,7 +151,7 @@ ManagedNotebookServiceTracingConnection::DiagnoseRuntime( google::cloud::notebooks::v1::DiagnoseRuntimeRequest const& request) { auto span = internal::MakeSpan( "notebooks_v1::ManagedNotebookServiceConnection::DiagnoseRuntime"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DiagnoseRuntime(request)); } diff --git a/google/cloud/notebooks/v1/internal/managed_notebook_tracing_stub.cc b/google/cloud/notebooks/v1/internal/managed_notebook_tracing_stub.cc index 3efe10432555..1693a06d7674 100644 --- a/google/cloud/notebooks/v1/internal/managed_notebook_tracing_stub.cc +++ b/google/cloud/notebooks/v1/internal/managed_notebook_tracing_stub.cc @@ -61,10 +61,8 @@ ManagedNotebookServiceTracingStub::AsyncCreateRuntime( google::cloud::notebooks::v1::CreateRuntimeRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.notebooks.v1.ManagedNotebookService", "CreateRuntime"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateRuntime(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -76,10 +74,8 @@ ManagedNotebookServiceTracingStub::AsyncUpdateRuntime( google::cloud::notebooks::v1::UpdateRuntimeRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.notebooks.v1.ManagedNotebookService", "UpdateRuntime"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateRuntime(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -91,10 +87,8 @@ ManagedNotebookServiceTracingStub::AsyncDeleteRuntime( google::cloud::notebooks::v1::DeleteRuntimeRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.notebooks.v1.ManagedNotebookService", "DeleteRuntime"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteRuntime(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -106,10 +100,8 @@ ManagedNotebookServiceTracingStub::AsyncStartRuntime( google::cloud::notebooks::v1::StartRuntimeRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.notebooks.v1.ManagedNotebookService", "StartRuntime"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncStartRuntime(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -121,10 +113,8 @@ ManagedNotebookServiceTracingStub::AsyncStopRuntime( google::cloud::notebooks::v1::StopRuntimeRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.notebooks.v1.ManagedNotebookService", "StopRuntime"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncStopRuntime(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -136,10 +126,8 @@ ManagedNotebookServiceTracingStub::AsyncSwitchRuntime( google::cloud::notebooks::v1::SwitchRuntimeRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.notebooks.v1.ManagedNotebookService", "SwitchRuntime"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncSwitchRuntime(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -151,10 +139,8 @@ ManagedNotebookServiceTracingStub::AsyncResetRuntime( google::cloud::notebooks::v1::ResetRuntimeRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.notebooks.v1.ManagedNotebookService", "ResetRuntime"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncResetRuntime(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -166,10 +152,8 @@ ManagedNotebookServiceTracingStub::AsyncUpgradeRuntime( google::cloud::notebooks::v1::UpgradeRuntimeRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.notebooks.v1.ManagedNotebookService", "UpgradeRuntime"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpgradeRuntime(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -181,10 +165,8 @@ ManagedNotebookServiceTracingStub::AsyncReportRuntimeEvent( google::cloud::notebooks::v1::ReportRuntimeEventRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.notebooks.v1.ManagedNotebookService", "ReportRuntimeEvent"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncReportRuntimeEvent(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -210,10 +192,8 @@ ManagedNotebookServiceTracingStub::AsyncDiagnoseRuntime( google::cloud::notebooks::v1::DiagnoseRuntimeRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.notebooks.v1.ManagedNotebookService", "DiagnoseRuntime"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDiagnoseRuntime(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -225,10 +205,8 @@ ManagedNotebookServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -239,10 +217,8 @@ future ManagedNotebookServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/notebooks/v1/internal/notebook_tracing_connection.cc b/google/cloud/notebooks/v1/internal/notebook_tracing_connection.cc index 8e9974756915..64af06de7902 100644 --- a/google/cloud/notebooks/v1/internal/notebook_tracing_connection.cc +++ b/google/cloud/notebooks/v1/internal/notebook_tracing_connection.cc @@ -37,7 +37,7 @@ NotebookServiceTracingConnection::ListInstances( google::cloud::notebooks::v1::ListInstancesRequest request) { auto span = internal::MakeSpan( "notebooks_v1::NotebookServiceConnection::ListInstances"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListInstances(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::notebooks::v1::Instance>(std::move(span), std::move(sr)); @@ -57,7 +57,7 @@ NotebookServiceTracingConnection::CreateInstance( google::cloud::notebooks::v1::CreateInstanceRequest const& request) { auto span = internal::MakeSpan( "notebooks_v1::NotebookServiceConnection::CreateInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateInstance(request)); } @@ -66,7 +66,7 @@ NotebookServiceTracingConnection::RegisterInstance( google::cloud::notebooks::v1::RegisterInstanceRequest const& request) { auto span = internal::MakeSpan( "notebooks_v1::NotebookServiceConnection::RegisterInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RegisterInstance(request)); } @@ -76,7 +76,7 @@ NotebookServiceTracingConnection::SetInstanceAccelerator( request) { auto span = internal::MakeSpan( "notebooks_v1::NotebookServiceConnection::SetInstanceAccelerator"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetInstanceAccelerator(request)); } @@ -87,7 +87,7 @@ NotebookServiceTracingConnection::SetInstanceMachineType( request) { auto span = internal::MakeSpan( "notebooks_v1::NotebookServiceConnection::SetInstanceMachineType"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetInstanceMachineType(request)); } @@ -97,7 +97,7 @@ NotebookServiceTracingConnection::UpdateInstanceConfig( google::cloud::notebooks::v1::UpdateInstanceConfigRequest const& request) { auto span = internal::MakeSpan( "notebooks_v1::NotebookServiceConnection::UpdateInstanceConfig"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateInstanceConfig(request)); } @@ -108,7 +108,7 @@ NotebookServiceTracingConnection::UpdateShieldedInstanceConfig( request) { auto span = internal::MakeSpan( "notebooks_v1::NotebookServiceConnection::UpdateShieldedInstanceConfig"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateShieldedInstanceConfig(request)); } @@ -118,7 +118,7 @@ NotebookServiceTracingConnection::SetInstanceLabels( google::cloud::notebooks::v1::SetInstanceLabelsRequest const& request) { auto span = internal::MakeSpan( "notebooks_v1::NotebookServiceConnection::SetInstanceLabels"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetInstanceLabels(request)); } @@ -137,7 +137,7 @@ NotebookServiceTracingConnection::DeleteInstance( google::cloud::notebooks::v1::DeleteInstanceRequest const& request) { auto span = internal::MakeSpan( "notebooks_v1::NotebookServiceConnection::DeleteInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteInstance(request)); } @@ -146,7 +146,7 @@ NotebookServiceTracingConnection::StartInstance( google::cloud::notebooks::v1::StartInstanceRequest const& request) { auto span = internal::MakeSpan( "notebooks_v1::NotebookServiceConnection::StartInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->StartInstance(request)); } @@ -155,7 +155,7 @@ NotebookServiceTracingConnection::StopInstance( google::cloud::notebooks::v1::StopInstanceRequest const& request) { auto span = internal::MakeSpan( "notebooks_v1::NotebookServiceConnection::StopInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->StopInstance(request)); } @@ -164,7 +164,7 @@ NotebookServiceTracingConnection::ResetInstance( google::cloud::notebooks::v1::ResetInstanceRequest const& request) { auto span = internal::MakeSpan( "notebooks_v1::NotebookServiceConnection::ResetInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ResetInstance(request)); } @@ -173,7 +173,7 @@ NotebookServiceTracingConnection::ReportInstanceInfo( google::cloud::notebooks::v1::ReportInstanceInfoRequest const& request) { auto span = internal::MakeSpan( "notebooks_v1::NotebookServiceConnection::ReportInstanceInfo"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ReportInstanceInfo(request)); } @@ -201,7 +201,7 @@ NotebookServiceTracingConnection::UpgradeInstance( google::cloud::notebooks::v1::UpgradeInstanceRequest const& request) { auto span = internal::MakeSpan( "notebooks_v1::NotebookServiceConnection::UpgradeInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpgradeInstance(request)); } @@ -210,7 +210,7 @@ NotebookServiceTracingConnection::RollbackInstance( google::cloud::notebooks::v1::RollbackInstanceRequest const& request) { auto span = internal::MakeSpan( "notebooks_v1::NotebookServiceConnection::RollbackInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RollbackInstance(request)); } @@ -219,7 +219,7 @@ NotebookServiceTracingConnection::DiagnoseInstance( google::cloud::notebooks::v1::DiagnoseInstanceRequest const& request) { auto span = internal::MakeSpan( "notebooks_v1::NotebookServiceConnection::DiagnoseInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DiagnoseInstance(request)); } @@ -229,7 +229,7 @@ NotebookServiceTracingConnection::UpgradeInstanceInternal( request) { auto span = internal::MakeSpan( "notebooks_v1::NotebookServiceConnection::UpgradeInstanceInternal"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpgradeInstanceInternal(request)); } @@ -239,7 +239,7 @@ NotebookServiceTracingConnection::ListEnvironments( google::cloud::notebooks::v1::ListEnvironmentsRequest request) { auto span = internal::MakeSpan( "notebooks_v1::NotebookServiceConnection::ListEnvironments"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListEnvironments(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::notebooks::v1::Environment>(std::move(span), @@ -260,7 +260,7 @@ NotebookServiceTracingConnection::CreateEnvironment( google::cloud::notebooks::v1::CreateEnvironmentRequest const& request) { auto span = internal::MakeSpan( "notebooks_v1::NotebookServiceConnection::CreateEnvironment"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateEnvironment(request)); } @@ -269,7 +269,7 @@ NotebookServiceTracingConnection::DeleteEnvironment( google::cloud::notebooks::v1::DeleteEnvironmentRequest const& request) { auto span = internal::MakeSpan( "notebooks_v1::NotebookServiceConnection::DeleteEnvironment"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteEnvironment(request)); } @@ -278,7 +278,7 @@ NotebookServiceTracingConnection::ListSchedules( google::cloud::notebooks::v1::ListSchedulesRequest request) { auto span = internal::MakeSpan( "notebooks_v1::NotebookServiceConnection::ListSchedules"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListSchedules(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::notebooks::v1::Schedule>(std::move(span), std::move(sr)); @@ -298,7 +298,7 @@ NotebookServiceTracingConnection::DeleteSchedule( google::cloud::notebooks::v1::DeleteScheduleRequest const& request) { auto span = internal::MakeSpan( "notebooks_v1::NotebookServiceConnection::DeleteSchedule"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteSchedule(request)); } @@ -307,7 +307,7 @@ NotebookServiceTracingConnection::CreateSchedule( google::cloud::notebooks::v1::CreateScheduleRequest const& request) { auto span = internal::MakeSpan( "notebooks_v1::NotebookServiceConnection::CreateSchedule"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateSchedule(request)); } @@ -316,7 +316,7 @@ NotebookServiceTracingConnection::TriggerSchedule( google::cloud::notebooks::v1::TriggerScheduleRequest const& request) { auto span = internal::MakeSpan( "notebooks_v1::NotebookServiceConnection::TriggerSchedule"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->TriggerSchedule(request)); } @@ -325,7 +325,7 @@ NotebookServiceTracingConnection::ListExecutions( google::cloud::notebooks::v1::ListExecutionsRequest request) { auto span = internal::MakeSpan( "notebooks_v1::NotebookServiceConnection::ListExecutions"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListExecutions(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::notebooks::v1::Execution>(std::move(span), std::move(sr)); @@ -345,7 +345,7 @@ NotebookServiceTracingConnection::DeleteExecution( google::cloud::notebooks::v1::DeleteExecutionRequest const& request) { auto span = internal::MakeSpan( "notebooks_v1::NotebookServiceConnection::DeleteExecution"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteExecution(request)); } @@ -354,7 +354,7 @@ NotebookServiceTracingConnection::CreateExecution( google::cloud::notebooks::v1::CreateExecutionRequest const& request) { auto span = internal::MakeSpan( "notebooks_v1::NotebookServiceConnection::CreateExecution"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateExecution(request)); } diff --git a/google/cloud/notebooks/v1/internal/notebook_tracing_stub.cc b/google/cloud/notebooks/v1/internal/notebook_tracing_stub.cc index e4c796b473db..719ddefbdc9e 100644 --- a/google/cloud/notebooks/v1/internal/notebook_tracing_stub.cc +++ b/google/cloud/notebooks/v1/internal/notebook_tracing_stub.cc @@ -61,10 +61,8 @@ NotebookServiceTracingStub::AsyncCreateInstance( google::cloud::notebooks::v1::CreateInstanceRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.notebooks.v1.NotebookService", "CreateInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -76,10 +74,8 @@ NotebookServiceTracingStub::AsyncRegisterInstance( google::cloud::notebooks::v1::RegisterInstanceRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.notebooks.v1.NotebookService", "RegisterInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncRegisterInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -92,10 +88,8 @@ NotebookServiceTracingStub::AsyncSetInstanceAccelerator( request) { auto span = internal::MakeSpanGrpc( "google.cloud.notebooks.v1.NotebookService", "SetInstanceAccelerator"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncSetInstanceAccelerator(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -108,10 +102,8 @@ NotebookServiceTracingStub::AsyncSetInstanceMachineType( request) { auto span = internal::MakeSpanGrpc( "google.cloud.notebooks.v1.NotebookService", "SetInstanceMachineType"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncSetInstanceMachineType(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -123,10 +115,8 @@ NotebookServiceTracingStub::AsyncUpdateInstanceConfig( google::cloud::notebooks::v1::UpdateInstanceConfigRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.notebooks.v1.NotebookService", "UpdateInstanceConfig"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateInstanceConfig(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -140,10 +130,8 @@ NotebookServiceTracingStub::AsyncUpdateShieldedInstanceConfig( auto span = internal::MakeSpanGrpc("google.cloud.notebooks.v1.NotebookService", "UpdateShieldedInstanceConfig"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateShieldedInstanceConfig(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -155,10 +143,8 @@ NotebookServiceTracingStub::AsyncSetInstanceLabels( google::cloud::notebooks::v1::SetInstanceLabelsRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.notebooks.v1.NotebookService", "SetInstanceLabels"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncSetInstanceLabels(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -184,10 +170,8 @@ NotebookServiceTracingStub::AsyncDeleteInstance( google::cloud::notebooks::v1::DeleteInstanceRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.notebooks.v1.NotebookService", "DeleteInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -199,10 +183,8 @@ NotebookServiceTracingStub::AsyncStartInstance( google::cloud::notebooks::v1::StartInstanceRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.notebooks.v1.NotebookService", "StartInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncStartInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -214,10 +196,8 @@ NotebookServiceTracingStub::AsyncStopInstance( google::cloud::notebooks::v1::StopInstanceRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.notebooks.v1.NotebookService", "StopInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncStopInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -229,10 +209,8 @@ NotebookServiceTracingStub::AsyncResetInstance( google::cloud::notebooks::v1::ResetInstanceRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.notebooks.v1.NotebookService", "ResetInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncResetInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -244,10 +222,8 @@ NotebookServiceTracingStub::AsyncReportInstanceInfo( google::cloud::notebooks::v1::ReportInstanceInfoRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.notebooks.v1.NotebookService", "ReportInstanceInfo"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncReportInstanceInfo(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -283,10 +259,8 @@ NotebookServiceTracingStub::AsyncUpgradeInstance( google::cloud::notebooks::v1::UpgradeInstanceRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.notebooks.v1.NotebookService", "UpgradeInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpgradeInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -298,10 +272,8 @@ NotebookServiceTracingStub::AsyncRollbackInstance( google::cloud::notebooks::v1::RollbackInstanceRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.notebooks.v1.NotebookService", "RollbackInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncRollbackInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -313,10 +285,8 @@ NotebookServiceTracingStub::AsyncDiagnoseInstance( google::cloud::notebooks::v1::DiagnoseInstanceRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.notebooks.v1.NotebookService", "DiagnoseInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDiagnoseInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -329,10 +299,8 @@ NotebookServiceTracingStub::AsyncUpgradeInstanceInternal( request) { auto span = internal::MakeSpanGrpc( "google.cloud.notebooks.v1.NotebookService", "UpgradeInstanceInternal"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpgradeInstanceInternal(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -368,10 +336,8 @@ NotebookServiceTracingStub::AsyncCreateEnvironment( google::cloud::notebooks::v1::CreateEnvironmentRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.notebooks.v1.NotebookService", "CreateEnvironment"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateEnvironment(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -383,10 +349,8 @@ NotebookServiceTracingStub::AsyncDeleteEnvironment( google::cloud::notebooks::v1::DeleteEnvironmentRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.notebooks.v1.NotebookService", "DeleteEnvironment"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteEnvironment(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -422,10 +386,8 @@ NotebookServiceTracingStub::AsyncDeleteSchedule( google::cloud::notebooks::v1::DeleteScheduleRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.notebooks.v1.NotebookService", "DeleteSchedule"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteSchedule(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -437,10 +399,8 @@ NotebookServiceTracingStub::AsyncCreateSchedule( google::cloud::notebooks::v1::CreateScheduleRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.notebooks.v1.NotebookService", "CreateSchedule"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateSchedule(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -452,10 +412,8 @@ NotebookServiceTracingStub::AsyncTriggerSchedule( google::cloud::notebooks::v1::TriggerScheduleRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.notebooks.v1.NotebookService", "TriggerSchedule"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncTriggerSchedule(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -491,10 +449,8 @@ NotebookServiceTracingStub::AsyncDeleteExecution( google::cloud::notebooks::v1::DeleteExecutionRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.notebooks.v1.NotebookService", "DeleteExecution"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteExecution(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -506,10 +462,8 @@ NotebookServiceTracingStub::AsyncCreateExecution( google::cloud::notebooks::v1::CreateExecutionRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.notebooks.v1.NotebookService", "CreateExecution"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateExecution(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -521,10 +475,8 @@ NotebookServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -535,10 +487,8 @@ future NotebookServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/notebooks/v2/internal/notebook_tracing_connection.cc b/google/cloud/notebooks/v2/internal/notebook_tracing_connection.cc index 7c5ee3ac5fd0..499ef8bdc4a3 100644 --- a/google/cloud/notebooks/v2/internal/notebook_tracing_connection.cc +++ b/google/cloud/notebooks/v2/internal/notebook_tracing_connection.cc @@ -37,7 +37,7 @@ NotebookServiceTracingConnection::ListInstances( google::cloud::notebooks::v2::ListInstancesRequest request) { auto span = internal::MakeSpan( "notebooks_v2::NotebookServiceConnection::ListInstances"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListInstances(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::notebooks::v2::Instance>(std::move(span), std::move(sr)); @@ -57,7 +57,7 @@ NotebookServiceTracingConnection::CreateInstance( google::cloud::notebooks::v2::CreateInstanceRequest const& request) { auto span = internal::MakeSpan( "notebooks_v2::NotebookServiceConnection::CreateInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateInstance(request)); } @@ -66,7 +66,7 @@ NotebookServiceTracingConnection::UpdateInstance( google::cloud::notebooks::v2::UpdateInstanceRequest const& request) { auto span = internal::MakeSpan( "notebooks_v2::NotebookServiceConnection::UpdateInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateInstance(request)); } @@ -75,7 +75,7 @@ NotebookServiceTracingConnection::DeleteInstance( google::cloud::notebooks::v2::DeleteInstanceRequest const& request) { auto span = internal::MakeSpan( "notebooks_v2::NotebookServiceConnection::DeleteInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteInstance(request)); } @@ -84,7 +84,7 @@ NotebookServiceTracingConnection::StartInstance( google::cloud::notebooks::v2::StartInstanceRequest const& request) { auto span = internal::MakeSpan( "notebooks_v2::NotebookServiceConnection::StartInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->StartInstance(request)); } @@ -93,7 +93,7 @@ NotebookServiceTracingConnection::StopInstance( google::cloud::notebooks::v2::StopInstanceRequest const& request) { auto span = internal::MakeSpan( "notebooks_v2::NotebookServiceConnection::StopInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->StopInstance(request)); } @@ -102,7 +102,7 @@ NotebookServiceTracingConnection::ResetInstance( google::cloud::notebooks::v2::ResetInstanceRequest const& request) { auto span = internal::MakeSpan( "notebooks_v2::NotebookServiceConnection::ResetInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ResetInstance(request)); } @@ -121,7 +121,7 @@ NotebookServiceTracingConnection::UpgradeInstance( google::cloud::notebooks::v2::UpgradeInstanceRequest const& request) { auto span = internal::MakeSpan( "notebooks_v2::NotebookServiceConnection::UpgradeInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpgradeInstance(request)); } @@ -130,7 +130,7 @@ NotebookServiceTracingConnection::RollbackInstance( google::cloud::notebooks::v2::RollbackInstanceRequest const& request) { auto span = internal::MakeSpan( "notebooks_v2::NotebookServiceConnection::RollbackInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RollbackInstance(request)); } @@ -139,7 +139,7 @@ NotebookServiceTracingConnection::DiagnoseInstance( google::cloud::notebooks::v2::DiagnoseInstanceRequest const& request) { auto span = internal::MakeSpan( "notebooks_v2::NotebookServiceConnection::DiagnoseInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DiagnoseInstance(request)); } diff --git a/google/cloud/notebooks/v2/internal/notebook_tracing_stub.cc b/google/cloud/notebooks/v2/internal/notebook_tracing_stub.cc index e5b3c643ceac..eddca04194dc 100644 --- a/google/cloud/notebooks/v2/internal/notebook_tracing_stub.cc +++ b/google/cloud/notebooks/v2/internal/notebook_tracing_stub.cc @@ -61,10 +61,8 @@ NotebookServiceTracingStub::AsyncCreateInstance( google::cloud::notebooks::v2::CreateInstanceRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.notebooks.v2.NotebookService", "CreateInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -76,10 +74,8 @@ NotebookServiceTracingStub::AsyncUpdateInstance( google::cloud::notebooks::v2::UpdateInstanceRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.notebooks.v2.NotebookService", "UpdateInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -91,10 +87,8 @@ NotebookServiceTracingStub::AsyncDeleteInstance( google::cloud::notebooks::v2::DeleteInstanceRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.notebooks.v2.NotebookService", "DeleteInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -106,10 +100,8 @@ NotebookServiceTracingStub::AsyncStartInstance( google::cloud::notebooks::v2::StartInstanceRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.notebooks.v2.NotebookService", "StartInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncStartInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -121,10 +113,8 @@ NotebookServiceTracingStub::AsyncStopInstance( google::cloud::notebooks::v2::StopInstanceRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.notebooks.v2.NotebookService", "StopInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncStopInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -136,10 +126,8 @@ NotebookServiceTracingStub::AsyncResetInstance( google::cloud::notebooks::v2::ResetInstanceRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.notebooks.v2.NotebookService", "ResetInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncResetInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -165,10 +153,8 @@ NotebookServiceTracingStub::AsyncUpgradeInstance( google::cloud::notebooks::v2::UpgradeInstanceRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.notebooks.v2.NotebookService", "UpgradeInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpgradeInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -180,10 +166,8 @@ NotebookServiceTracingStub::AsyncRollbackInstance( google::cloud::notebooks::v2::RollbackInstanceRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.notebooks.v2.NotebookService", "RollbackInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncRollbackInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -195,10 +179,8 @@ NotebookServiceTracingStub::AsyncDiagnoseInstance( google::cloud::notebooks::v2::DiagnoseInstanceRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.notebooks.v2.NotebookService", "DiagnoseInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDiagnoseInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -210,10 +192,8 @@ NotebookServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -224,10 +204,8 @@ future NotebookServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/optimization/v1/internal/fleet_routing_tracing_connection.cc b/google/cloud/optimization/v1/internal/fleet_routing_tracing_connection.cc index 6f333ece58e7..4cff6f9a292b 100644 --- a/google/cloud/optimization/v1/internal/fleet_routing_tracing_connection.cc +++ b/google/cloud/optimization/v1/internal/fleet_routing_tracing_connection.cc @@ -45,7 +45,7 @@ FleetRoutingTracingConnection::BatchOptimizeTours( google::cloud::optimization::v1::BatchOptimizeToursRequest const& request) { auto span = internal::MakeSpan( "optimization_v1::FleetRoutingConnection::BatchOptimizeTours"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->BatchOptimizeTours(request)); } diff --git a/google/cloud/optimization/v1/internal/fleet_routing_tracing_stub.cc b/google/cloud/optimization/v1/internal/fleet_routing_tracing_stub.cc index 626b33f67e25..81ab8be6feac 100644 --- a/google/cloud/optimization/v1/internal/fleet_routing_tracing_stub.cc +++ b/google/cloud/optimization/v1/internal/fleet_routing_tracing_stub.cc @@ -49,10 +49,8 @@ FleetRoutingTracingStub::AsyncBatchOptimizeTours( google::cloud::optimization::v1::BatchOptimizeToursRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.optimization.v1.FleetRouting", "BatchOptimizeTours"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncBatchOptimizeTours(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -64,10 +62,8 @@ FleetRoutingTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -78,10 +74,8 @@ future FleetRoutingTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/orgpolicy/v2/internal/org_policy_tracing_connection.cc b/google/cloud/orgpolicy/v2/internal/org_policy_tracing_connection.cc index faae4badf954..3b93dd337fd5 100644 --- a/google/cloud/orgpolicy/v2/internal/org_policy_tracing_connection.cc +++ b/google/cloud/orgpolicy/v2/internal/org_policy_tracing_connection.cc @@ -37,7 +37,7 @@ OrgPolicyTracingConnection::ListConstraints( google::cloud::orgpolicy::v2::ListConstraintsRequest request) { auto span = internal::MakeSpan("orgpolicy_v2::OrgPolicyConnection::ListConstraints"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListConstraints(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::orgpolicy::v2::Constraint>(std::move(span), std::move(sr)); @@ -48,7 +48,7 @@ OrgPolicyTracingConnection::ListPolicies( google::cloud::orgpolicy::v2::ListPoliciesRequest request) { auto span = internal::MakeSpan("orgpolicy_v2::OrgPolicyConnection::ListPolicies"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListPolicies(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); diff --git a/google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_tracing_connection.cc b/google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_tracing_connection.cc index 4ae8a4bcd6cc..945d3dda745f 100644 --- a/google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_tracing_connection.cc +++ b/google/cloud/osconfig/agentendpoint/v1/internal/agent_endpoint_tracing_connection.cc @@ -41,7 +41,7 @@ AgentEndpointServiceTracingConnection::ReceiveTaskNotification( auto span = internal::MakeSpan( "osconfig_agentendpoint_v1::AgentEndpointServiceConnection::" "ReceiveTaskNotification"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ReceiveTaskNotification(request); return internal::MakeTracedStreamRange< google::cloud::osconfig::agentendpoint::v1:: diff --git a/google/cloud/osconfig/v1/internal/os_config_tracing_connection.cc b/google/cloud/osconfig/v1/internal/os_config_tracing_connection.cc index 8c330f4cd204..32c0748a850a 100644 --- a/google/cloud/osconfig/v1/internal/os_config_tracing_connection.cc +++ b/google/cloud/osconfig/v1/internal/os_config_tracing_connection.cc @@ -64,7 +64,7 @@ OsConfigServiceTracingConnection::ListPatchJobs( google::cloud::osconfig::v1::ListPatchJobsRequest request) { auto span = internal::MakeSpan( "osconfig_v1::OsConfigServiceConnection::ListPatchJobs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListPatchJobs(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -75,7 +75,7 @@ OsConfigServiceTracingConnection::ListPatchJobInstanceDetails( google::cloud::osconfig::v1::ListPatchJobInstanceDetailsRequest request) { auto span = internal::MakeSpan( "osconfig_v1::OsConfigServiceConnection::ListPatchJobInstanceDetails"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListPatchJobInstanceDetails(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::osconfig::v1::PatchJobInstanceDetails>(std::move(span), @@ -105,7 +105,7 @@ OsConfigServiceTracingConnection::ListPatchDeployments( google::cloud::osconfig::v1::ListPatchDeploymentsRequest request) { auto span = internal::MakeSpan( "osconfig_v1::OsConfigServiceConnection::ListPatchDeployments"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListPatchDeployments(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::osconfig::v1::PatchDeployment>(std::move(span), diff --git a/google/cloud/osconfig/v1/internal/os_config_zonal_tracing_connection.cc b/google/cloud/osconfig/v1/internal/os_config_zonal_tracing_connection.cc index da160b495fc3..b8d1c284db82 100644 --- a/google/cloud/osconfig/v1/internal/os_config_zonal_tracing_connection.cc +++ b/google/cloud/osconfig/v1/internal/os_config_zonal_tracing_connection.cc @@ -38,7 +38,7 @@ OsConfigZonalServiceTracingConnection::CreateOSPolicyAssignment( request) { auto span = internal::MakeSpan( "osconfig_v1::OsConfigZonalServiceConnection::CreateOSPolicyAssignment"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateOSPolicyAssignment(request)); } @@ -49,7 +49,7 @@ OsConfigZonalServiceTracingConnection::UpdateOSPolicyAssignment( request) { auto span = internal::MakeSpan( "osconfig_v1::OsConfigZonalServiceConnection::UpdateOSPolicyAssignment"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateOSPolicyAssignment(request)); } @@ -68,7 +68,7 @@ OsConfigZonalServiceTracingConnection::ListOSPolicyAssignments( google::cloud::osconfig::v1::ListOSPolicyAssignmentsRequest request) { auto span = internal::MakeSpan( "osconfig_v1::OsConfigZonalServiceConnection::ListOSPolicyAssignments"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListOSPolicyAssignments(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::osconfig::v1::OSPolicyAssignment>(std::move(span), @@ -82,7 +82,7 @@ OsConfigZonalServiceTracingConnection::ListOSPolicyAssignmentRevisions( auto span = internal::MakeSpan( "osconfig_v1::OsConfigZonalServiceConnection::" "ListOSPolicyAssignmentRevisions"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListOSPolicyAssignmentRevisions(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::osconfig::v1::OSPolicyAssignment>(std::move(span), @@ -96,7 +96,7 @@ OsConfigZonalServiceTracingConnection::DeleteOSPolicyAssignment( request) { auto span = internal::MakeSpan( "osconfig_v1::OsConfigZonalServiceConnection::DeleteOSPolicyAssignment"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteOSPolicyAssignment(request)); } @@ -118,7 +118,7 @@ OsConfigZonalServiceTracingConnection::ListOSPolicyAssignmentReports( auto span = internal::MakeSpan( "osconfig_v1::OsConfigZonalServiceConnection::" "ListOSPolicyAssignmentReports"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListOSPolicyAssignmentReports(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::osconfig::v1::OSPolicyAssignmentReport>(std::move(span), @@ -139,7 +139,7 @@ OsConfigZonalServiceTracingConnection::ListInventories( google::cloud::osconfig::v1::ListInventoriesRequest request) { auto span = internal::MakeSpan( "osconfig_v1::OsConfigZonalServiceConnection::ListInventories"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListInventories(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::osconfig::v1::Inventory>(std::move(span), std::move(sr)); @@ -159,7 +159,7 @@ OsConfigZonalServiceTracingConnection::ListVulnerabilityReports( google::cloud::osconfig::v1::ListVulnerabilityReportsRequest request) { auto span = internal::MakeSpan( "osconfig_v1::OsConfigZonalServiceConnection::ListVulnerabilityReports"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListVulnerabilityReports(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::osconfig::v1::VulnerabilityReport>(std::move(span), diff --git a/google/cloud/osconfig/v1/internal/os_config_zonal_tracing_stub.cc b/google/cloud/osconfig/v1/internal/os_config_zonal_tracing_stub.cc index c9e212be92e9..ffd65af60847 100644 --- a/google/cloud/osconfig/v1/internal/os_config_zonal_tracing_stub.cc +++ b/google/cloud/osconfig/v1/internal/os_config_zonal_tracing_stub.cc @@ -39,10 +39,8 @@ OsConfigZonalServiceTracingStub::AsyncCreateOSPolicyAssignment( auto span = internal::MakeSpanGrpc("google.cloud.osconfig.v1.OsConfigZonalService", "CreateOSPolicyAssignment"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateOSPolicyAssignment(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -56,10 +54,8 @@ OsConfigZonalServiceTracingStub::AsyncUpdateOSPolicyAssignment( auto span = internal::MakeSpanGrpc("google.cloud.osconfig.v1.OsConfigZonalService", "UpdateOSPolicyAssignment"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateOSPolicyAssignment(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -114,10 +110,8 @@ OsConfigZonalServiceTracingStub::AsyncDeleteOSPolicyAssignment( auto span = internal::MakeSpanGrpc("google.cloud.osconfig.v1.OsConfigZonalService", "DeleteOSPolicyAssignment"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteOSPolicyAssignment(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -208,10 +202,8 @@ OsConfigZonalServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -222,10 +214,8 @@ future OsConfigZonalServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/policysimulator/v1/internal/simulator_tracing_connection.cc b/google/cloud/policysimulator/v1/internal/simulator_tracing_connection.cc index 928e847f34e4..37bde1764f34 100644 --- a/google/cloud/policysimulator/v1/internal/simulator_tracing_connection.cc +++ b/google/cloud/policysimulator/v1/internal/simulator_tracing_connection.cc @@ -46,7 +46,7 @@ SimulatorTracingConnection::CreateReplay( google::cloud::policysimulator::v1::CreateReplayRequest const& request) { auto span = internal::MakeSpan( "policysimulator_v1::SimulatorConnection::CreateReplay"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateReplay(request)); } @@ -55,7 +55,7 @@ SimulatorTracingConnection::ListReplayResults( google::cloud::policysimulator::v1::ListReplayResultsRequest request) { auto span = internal::MakeSpan( "policysimulator_v1::SimulatorConnection::ListReplayResults"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListReplayResults(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::policysimulator::v1::ReplayResult>(std::move(span), diff --git a/google/cloud/policysimulator/v1/internal/simulator_tracing_stub.cc b/google/cloud/policysimulator/v1/internal/simulator_tracing_stub.cc index 0d8149c87d07..e824a1f5c12f 100644 --- a/google/cloud/policysimulator/v1/internal/simulator_tracing_stub.cc +++ b/google/cloud/policysimulator/v1/internal/simulator_tracing_stub.cc @@ -47,10 +47,8 @@ SimulatorTracingStub::AsyncCreateReplay( google::cloud::policysimulator::v1::CreateReplayRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.policysimulator.v1.Simulator", "CreateReplay"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateReplay(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -75,10 +73,8 @@ SimulatorTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -89,10 +85,8 @@ future SimulatorTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/privateca/v1/internal/certificate_authority_tracing_connection.cc b/google/cloud/privateca/v1/internal/certificate_authority_tracing_connection.cc index 26042e2d70ad..06bbd71e4d94 100644 --- a/google/cloud/privateca/v1/internal/certificate_authority_tracing_connection.cc +++ b/google/cloud/privateca/v1/internal/certificate_authority_tracing_connection.cc @@ -59,7 +59,7 @@ CertificateAuthorityServiceTracingConnection::ListCertificates( google::cloud::security::privateca::v1::ListCertificatesRequest request) { auto span = internal::MakeSpan( "privateca_v1::CertificateAuthorityServiceConnection::ListCertificates"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListCertificates(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::security::privateca::v1::Certificate>(std::move(span), @@ -93,7 +93,7 @@ CertificateAuthorityServiceTracingConnection::ActivateCertificateAuthority( auto span = internal::MakeSpan( "privateca_v1::CertificateAuthorityServiceConnection::" "ActivateCertificateAuthority"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ActivateCertificateAuthority(request)); } @@ -105,7 +105,7 @@ CertificateAuthorityServiceTracingConnection::CreateCertificateAuthority( auto span = internal::MakeSpan( "privateca_v1::CertificateAuthorityServiceConnection::" "CreateCertificateAuthority"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateCertificateAuthority(request)); } @@ -117,7 +117,7 @@ CertificateAuthorityServiceTracingConnection::DisableCertificateAuthority( auto span = internal::MakeSpan( "privateca_v1::CertificateAuthorityServiceConnection::" "DisableCertificateAuthority"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DisableCertificateAuthority(request)); } @@ -129,7 +129,7 @@ CertificateAuthorityServiceTracingConnection::EnableCertificateAuthority( auto span = internal::MakeSpan( "privateca_v1::CertificateAuthorityServiceConnection::" "EnableCertificateAuthority"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->EnableCertificateAuthority(request)); } @@ -165,7 +165,7 @@ CertificateAuthorityServiceTracingConnection::ListCertificateAuthorities( auto span = internal::MakeSpan( "privateca_v1::CertificateAuthorityServiceConnection::" "ListCertificateAuthorities"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListCertificateAuthorities(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::security::privateca::v1::CertificateAuthority>( @@ -179,7 +179,7 @@ CertificateAuthorityServiceTracingConnection::UndeleteCertificateAuthority( auto span = internal::MakeSpan( "privateca_v1::CertificateAuthorityServiceConnection::" "UndeleteCertificateAuthority"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UndeleteCertificateAuthority(request)); } @@ -191,7 +191,7 @@ CertificateAuthorityServiceTracingConnection::DeleteCertificateAuthority( auto span = internal::MakeSpan( "privateca_v1::CertificateAuthorityServiceConnection::" "DeleteCertificateAuthority"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteCertificateAuthority(request)); } @@ -203,7 +203,7 @@ CertificateAuthorityServiceTracingConnection::UpdateCertificateAuthority( auto span = internal::MakeSpan( "privateca_v1::CertificateAuthorityServiceConnection::" "UpdateCertificateAuthority"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateCertificateAuthority(request)); } @@ -214,7 +214,7 @@ CertificateAuthorityServiceTracingConnection::CreateCaPool( request) { auto span = internal::MakeSpan( "privateca_v1::CertificateAuthorityServiceConnection::CreateCaPool"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateCaPool(request)); } @@ -224,7 +224,7 @@ CertificateAuthorityServiceTracingConnection::UpdateCaPool( request) { auto span = internal::MakeSpan( "privateca_v1::CertificateAuthorityServiceConnection::UpdateCaPool"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateCaPool(request)); } @@ -242,7 +242,7 @@ CertificateAuthorityServiceTracingConnection::ListCaPools( google::cloud::security::privateca::v1::ListCaPoolsRequest request) { auto span = internal::MakeSpan( "privateca_v1::CertificateAuthorityServiceConnection::ListCaPools"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListCaPools(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::security::privateca::v1::CaPool>(std::move(span), @@ -255,7 +255,7 @@ CertificateAuthorityServiceTracingConnection::DeleteCaPool( request) { auto span = internal::MakeSpan( "privateca_v1::CertificateAuthorityServiceConnection::DeleteCaPool"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteCaPool(request)); } @@ -288,7 +288,7 @@ CertificateAuthorityServiceTracingConnection::ListCertificateRevocationLists( auto span = internal::MakeSpan( "privateca_v1::CertificateAuthorityServiceConnection::" "ListCertificateRevocationLists"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListCertificateRevocationLists(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::security::privateca::v1::CertificateRevocationList>( @@ -303,7 +303,7 @@ CertificateAuthorityServiceTracingConnection::UpdateCertificateRevocationList( auto span = internal::MakeSpan( "privateca_v1::CertificateAuthorityServiceConnection::" "UpdateCertificateRevocationList"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateCertificateRevocationList(request)); } @@ -315,7 +315,7 @@ CertificateAuthorityServiceTracingConnection::CreateCertificateTemplate( auto span = internal::MakeSpan( "privateca_v1::CertificateAuthorityServiceConnection::" "CreateCertificateTemplate"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateCertificateTemplate(request)); } @@ -327,7 +327,7 @@ CertificateAuthorityServiceTracingConnection::DeleteCertificateTemplate( auto span = internal::MakeSpan( "privateca_v1::CertificateAuthorityServiceConnection::" "DeleteCertificateTemplate"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteCertificateTemplate(request)); } @@ -350,7 +350,7 @@ CertificateAuthorityServiceTracingConnection::ListCertificateTemplates( auto span = internal::MakeSpan( "privateca_v1::CertificateAuthorityServiceConnection::" "ListCertificateTemplates"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListCertificateTemplates(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::security::privateca::v1::CertificateTemplate>( @@ -364,7 +364,7 @@ CertificateAuthorityServiceTracingConnection::UpdateCertificateTemplate( auto span = internal::MakeSpan( "privateca_v1::CertificateAuthorityServiceConnection::" "UpdateCertificateTemplate"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateCertificateTemplate(request)); } diff --git a/google/cloud/privateca/v1/internal/certificate_authority_tracing_stub.cc b/google/cloud/privateca/v1/internal/certificate_authority_tracing_stub.cc index 5170b8821eee..07a6cc24c177 100644 --- a/google/cloud/privateca/v1/internal/certificate_authority_tracing_stub.cc +++ b/google/cloud/privateca/v1/internal/certificate_authority_tracing_stub.cc @@ -109,10 +109,8 @@ CertificateAuthorityServiceTracingStub::AsyncActivateCertificateAuthority( auto span = internal::MakeSpanGrpc( "google.cloud.security.privateca.v1.CertificateAuthorityService", "ActivateCertificateAuthority"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncActivateCertificateAuthority(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -126,10 +124,8 @@ CertificateAuthorityServiceTracingStub::AsyncCreateCertificateAuthority( auto span = internal::MakeSpanGrpc( "google.cloud.security.privateca.v1.CertificateAuthorityService", "CreateCertificateAuthority"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateCertificateAuthority(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -143,10 +139,8 @@ CertificateAuthorityServiceTracingStub::AsyncDisableCertificateAuthority( auto span = internal::MakeSpanGrpc( "google.cloud.security.privateca.v1.CertificateAuthorityService", "DisableCertificateAuthority"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDisableCertificateAuthority(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -160,10 +154,8 @@ CertificateAuthorityServiceTracingStub::AsyncEnableCertificateAuthority( auto span = internal::MakeSpanGrpc( "google.cloud.security.privateca.v1.CertificateAuthorityService", "EnableCertificateAuthority"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncEnableCertificateAuthority(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -221,10 +213,8 @@ CertificateAuthorityServiceTracingStub::AsyncUndeleteCertificateAuthority( auto span = internal::MakeSpanGrpc( "google.cloud.security.privateca.v1.CertificateAuthorityService", "UndeleteCertificateAuthority"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUndeleteCertificateAuthority(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -238,10 +228,8 @@ CertificateAuthorityServiceTracingStub::AsyncDeleteCertificateAuthority( auto span = internal::MakeSpanGrpc( "google.cloud.security.privateca.v1.CertificateAuthorityService", "DeleteCertificateAuthority"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteCertificateAuthority(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -255,10 +243,8 @@ CertificateAuthorityServiceTracingStub::AsyncUpdateCertificateAuthority( auto span = internal::MakeSpanGrpc( "google.cloud.security.privateca.v1.CertificateAuthorityService", "UpdateCertificateAuthority"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateCertificateAuthority(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -272,10 +258,8 @@ CertificateAuthorityServiceTracingStub::AsyncCreateCaPool( auto span = internal::MakeSpanGrpc( "google.cloud.security.privateca.v1.CertificateAuthorityService", "CreateCaPool"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateCaPool(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -289,10 +273,8 @@ CertificateAuthorityServiceTracingStub::AsyncUpdateCaPool( auto span = internal::MakeSpanGrpc( "google.cloud.security.privateca.v1.CertificateAuthorityService", "UpdateCaPool"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateCaPool(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -331,10 +313,8 @@ CertificateAuthorityServiceTracingStub::AsyncDeleteCaPool( auto span = internal::MakeSpanGrpc( "google.cloud.security.privateca.v1.CertificateAuthorityService", "DeleteCaPool"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteCaPool(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -391,10 +371,8 @@ CertificateAuthorityServiceTracingStub::AsyncUpdateCertificateRevocationList( auto span = internal::MakeSpanGrpc( "google.cloud.security.privateca.v1.CertificateAuthorityService", "UpdateCertificateRevocationList"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateCertificateRevocationList(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -408,10 +386,8 @@ CertificateAuthorityServiceTracingStub::AsyncCreateCertificateTemplate( auto span = internal::MakeSpanGrpc( "google.cloud.security.privateca.v1.CertificateAuthorityService", "CreateCertificateTemplate"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateCertificateTemplate(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -425,10 +401,8 @@ CertificateAuthorityServiceTracingStub::AsyncDeleteCertificateTemplate( auto span = internal::MakeSpanGrpc( "google.cloud.security.privateca.v1.CertificateAuthorityService", "DeleteCertificateTemplate"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteCertificateTemplate(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -471,10 +445,8 @@ CertificateAuthorityServiceTracingStub::AsyncUpdateCertificateTemplate( auto span = internal::MakeSpanGrpc( "google.cloud.security.privateca.v1.CertificateAuthorityService", "UpdateCertificateTemplate"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateCertificateTemplate(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -486,10 +458,8 @@ CertificateAuthorityServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -500,10 +470,8 @@ future CertificateAuthorityServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/pubsub/internal/publisher_tracing_stub.cc b/google/cloud/pubsub/internal/publisher_tracing_stub.cc index f9d24c71a1c1..b5599348d58e 100644 --- a/google/cloud/pubsub/internal/publisher_tracing_stub.cc +++ b/google/cloud/pubsub/internal/publisher_tracing_stub.cc @@ -133,10 +133,8 @@ PublisherTracingStub::AsyncPublish( std::shared_ptr context, google::pubsub::v1::PublishRequest const& request) { auto span = internal::MakeSpanGrpc("google.pubsub.v1.Publisher", "Publish"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncPublish(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/pubsub/internal/schema_tracing_connection.cc b/google/cloud/pubsub/internal/schema_tracing_connection.cc index 41f33a866e2c..e8a7e0c98fd2 100644 --- a/google/cloud/pubsub/internal/schema_tracing_connection.cc +++ b/google/cloud/pubsub/internal/schema_tracing_connection.cc @@ -53,7 +53,7 @@ SchemaServiceTracingConnection::ListSchemas( google::pubsub::v1::ListSchemasRequest request) { auto span = internal::MakeSpan("pubsub::SchemaServiceConnection::ListSchemas"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListSchemas(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -64,7 +64,7 @@ SchemaServiceTracingConnection::ListSchemaRevisions( google::pubsub::v1::ListSchemaRevisionsRequest request) { auto span = internal::MakeSpan( "pubsub::SchemaServiceConnection::ListSchemaRevisions"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListSchemaRevisions(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); diff --git a/google/cloud/pubsub/internal/subscriber_tracing_stub.cc b/google/cloud/pubsub/internal/subscriber_tracing_stub.cc index c6665dfdacec..17d03098ce59 100644 --- a/google/cloud/pubsub/internal/subscriber_tracing_stub.cc +++ b/google/cloud/pubsub/internal/subscriber_tracing_stub.cc @@ -106,7 +106,7 @@ SubscriberTracingStub::AsyncStreamingPull( CompletionQueue const& cq, std::shared_ptr context) { auto span = internal::MakeSpanGrpc("google.pubsub.v1.Subscriber", "StreamingPull"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); internal::InjectTraceContext(*context, *propagator_); auto stream = child_->AsyncStreamingPull(cq, context); return std::make_unique SubscriberTracingStub::AsyncModifyAckDeadline( google::pubsub::v1::ModifyAckDeadlineRequest const& request) { auto span = internal::MakeSpanGrpc("google.pubsub.v1.Subscriber", "ModifyAckDeadline"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncModifyAckDeadline(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -211,10 +209,8 @@ future SubscriberTracingStub::AsyncAcknowledge( google::pubsub::v1::AcknowledgeRequest const& request) { auto span = internal::MakeSpanGrpc("google.pubsub.v1.Subscriber", "Acknowledge"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncAcknowledge(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/pubsublite/internal/admin_tracing_connection.cc b/google/cloud/pubsublite/internal/admin_tracing_connection.cc index def8a30c9b21..7ad30b219f97 100644 --- a/google/cloud/pubsublite/internal/admin_tracing_connection.cc +++ b/google/cloud/pubsublite/internal/admin_tracing_connection.cc @@ -64,7 +64,7 @@ AdminServiceTracingConnection::ListTopics( google::cloud::pubsublite::v1::ListTopicsRequest request) { auto span = internal::MakeSpan("pubsublite::AdminServiceConnection::ListTopics"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListTopics(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -91,7 +91,7 @@ StreamRange AdminServiceTracingConnection::ListTopicSubscriptions( google::cloud::pubsublite::v1::ListTopicSubscriptionsRequest request) { auto span = internal::MakeSpan( "pubsublite::AdminServiceConnection::ListTopicSubscriptions"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListTopicSubscriptions(std::move(request)); return internal::MakeTracedStreamRange(std::move(span), std::move(sr)); @@ -120,7 +120,7 @@ AdminServiceTracingConnection::ListSubscriptions( google::cloud::pubsublite::v1::ListSubscriptionsRequest request) { auto span = internal::MakeSpan( "pubsublite::AdminServiceConnection::ListSubscriptions"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListSubscriptions(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::pubsublite::v1::Subscription>(std::move(span), @@ -149,7 +149,7 @@ AdminServiceTracingConnection::SeekSubscription( google::cloud::pubsublite::v1::SeekSubscriptionRequest const& request) { auto span = internal::MakeSpan( "pubsublite::AdminServiceConnection::SeekSubscription"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SeekSubscription(request)); } @@ -176,7 +176,7 @@ AdminServiceTracingConnection::ListReservations( google::cloud::pubsublite::v1::ListReservationsRequest request) { auto span = internal::MakeSpan( "pubsublite::AdminServiceConnection::ListReservations"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListReservations(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::pubsublite::v1::Reservation>(std::move(span), @@ -204,7 +204,7 @@ StreamRange AdminServiceTracingConnection::ListReservationTopics( google::cloud::pubsublite::v1::ListReservationTopicsRequest request) { auto span = internal::MakeSpan( "pubsublite::AdminServiceConnection::ListReservationTopics"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListReservationTopics(std::move(request)); return internal::MakeTracedStreamRange(std::move(span), std::move(sr)); @@ -215,7 +215,7 @@ AdminServiceTracingConnection::AsyncGetTopicPartitions( google::cloud::pubsublite::v1::GetTopicPartitionsRequest const& request) { auto span = internal::MakeSpan( "pubsublite::AdminServiceConnection::AsyncGetTopicPartitions"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->AsyncGetTopicPartitions(request)); } diff --git a/google/cloud/pubsublite/internal/admin_tracing_stub.cc b/google/cloud/pubsublite/internal/admin_tracing_stub.cc index 963ef704a94d..bfde2d7dbd5d 100644 --- a/google/cloud/pubsublite/internal/admin_tracing_stub.cc +++ b/google/cloud/pubsublite/internal/admin_tracing_stub.cc @@ -179,10 +179,8 @@ AdminServiceTracingStub::AsyncSeekSubscription( google::cloud::pubsublite::v1::SeekSubscriptionRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.pubsublite.v1.AdminService", "SeekSubscription"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncSeekSubscription(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -266,10 +264,8 @@ AdminServiceTracingStub::AsyncGetTopicPartitions( google::cloud::pubsublite::v1::GetTopicPartitionsRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.pubsublite.v1.AdminService", "GetTopicPartitions"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetTopicPartitions(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -281,10 +277,8 @@ AdminServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -295,10 +289,8 @@ future AdminServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/pubsublite/internal/cursor_tracing_stub.cc b/google/cloud/pubsublite/internal/cursor_tracing_stub.cc index 0ec87845db3d..0f4b11d3e0f5 100644 --- a/google/cloud/pubsublite/internal/cursor_tracing_stub.cc +++ b/google/cloud/pubsublite/internal/cursor_tracing_stub.cc @@ -38,7 +38,7 @@ CursorServiceTracingStub::AsyncStreamingCommitCursor( CompletionQueue const& cq, std::shared_ptr context) { auto span = internal::MakeSpanGrpc("google.cloud.pubsublite.v1.CursorService", "StreamingCommitCursor"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); internal::InjectTraceContext(*context, *propagator_); auto stream = child_->AsyncStreamingCommitCursor(cq, context); return std::make_uniqueAsyncAssignPartitions(cq, context); return std::make_unique context) { auto span = internal::MakeSpanGrpc( "google.cloud.pubsublite.v1.PublisherService", "Publish"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); internal::InjectTraceContext(*context, *propagator_); auto stream = child_->AsyncPublish(cq, context); return std::make_unique context) { auto span = internal::MakeSpanGrpc( "google.cloud.pubsublite.v1.SubscriberService", "Subscribe"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); internal::InjectTraceContext(*context, *propagator_); auto stream = child_->AsyncSubscribe(cq, context); return std::make_uniqueCreateCollector(request)); } @@ -54,7 +54,7 @@ RapidMigrationAssessmentTracingConnection::CreateAnnotation( auto span = internal::MakeSpan( "rapidmigrationassessment_v1::RapidMigrationAssessmentConnection::" "CreateAnnotation"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateAnnotation(request)); } @@ -76,7 +76,7 @@ RapidMigrationAssessmentTracingConnection::ListCollectors( auto span = internal::MakeSpan( "rapidmigrationassessment_v1::RapidMigrationAssessmentConnection::" "ListCollectors"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListCollectors(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::rapidmigrationassessment::v1::Collector>(std::move(span), @@ -101,7 +101,7 @@ RapidMigrationAssessmentTracingConnection::UpdateCollector( auto span = internal::MakeSpan( "rapidmigrationassessment_v1::RapidMigrationAssessmentConnection::" "UpdateCollector"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateCollector(request)); } @@ -112,7 +112,7 @@ RapidMigrationAssessmentTracingConnection::DeleteCollector( auto span = internal::MakeSpan( "rapidmigrationassessment_v1::RapidMigrationAssessmentConnection::" "DeleteCollector"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteCollector(request)); } @@ -123,7 +123,7 @@ RapidMigrationAssessmentTracingConnection::ResumeCollector( auto span = internal::MakeSpan( "rapidmigrationassessment_v1::RapidMigrationAssessmentConnection::" "ResumeCollector"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ResumeCollector(request)); } @@ -134,7 +134,7 @@ RapidMigrationAssessmentTracingConnection::RegisterCollector( auto span = internal::MakeSpan( "rapidmigrationassessment_v1::RapidMigrationAssessmentConnection::" "RegisterCollector"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RegisterCollector(request)); } @@ -145,7 +145,7 @@ RapidMigrationAssessmentTracingConnection::PauseCollector( auto span = internal::MakeSpan( "rapidmigrationassessment_v1::RapidMigrationAssessmentConnection::" "PauseCollector"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PauseCollector(request)); } diff --git a/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_tracing_stub.cc b/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_tracing_stub.cc index e34759062197..ed0f021f8c77 100644 --- a/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_tracing_stub.cc +++ b/google/cloud/rapidmigrationassessment/v1/internal/rapid_migration_assessment_tracing_stub.cc @@ -40,10 +40,8 @@ RapidMigrationAssessmentTracingStub::AsyncCreateCollector( auto span = internal::MakeSpanGrpc( "google.cloud.rapidmigrationassessment.v1.RapidMigrationAssessment", "CreateCollector"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateCollector(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -57,10 +55,8 @@ RapidMigrationAssessmentTracingStub::AsyncCreateAnnotation( auto span = internal::MakeSpanGrpc( "google.cloud.rapidmigrationassessment.v1.RapidMigrationAssessment", "CreateAnnotation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateAnnotation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -116,10 +112,8 @@ RapidMigrationAssessmentTracingStub::AsyncUpdateCollector( auto span = internal::MakeSpanGrpc( "google.cloud.rapidmigrationassessment.v1.RapidMigrationAssessment", "UpdateCollector"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateCollector(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -133,10 +127,8 @@ RapidMigrationAssessmentTracingStub::AsyncDeleteCollector( auto span = internal::MakeSpanGrpc( "google.cloud.rapidmigrationassessment.v1.RapidMigrationAssessment", "DeleteCollector"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteCollector(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -150,10 +142,8 @@ RapidMigrationAssessmentTracingStub::AsyncResumeCollector( auto span = internal::MakeSpanGrpc( "google.cloud.rapidmigrationassessment.v1.RapidMigrationAssessment", "ResumeCollector"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncResumeCollector(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -167,10 +157,8 @@ RapidMigrationAssessmentTracingStub::AsyncRegisterCollector( auto span = internal::MakeSpanGrpc( "google.cloud.rapidmigrationassessment.v1.RapidMigrationAssessment", "RegisterCollector"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncRegisterCollector(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -184,10 +172,8 @@ RapidMigrationAssessmentTracingStub::AsyncPauseCollector( auto span = internal::MakeSpanGrpc( "google.cloud.rapidmigrationassessment.v1.RapidMigrationAssessment", "PauseCollector"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncPauseCollector(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -199,10 +185,8 @@ RapidMigrationAssessmentTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -213,10 +197,8 @@ future RapidMigrationAssessmentTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_tracing_connection.cc b/google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_tracing_connection.cc index 6fe30d56db7a..39b1d5ff92ce 100644 --- a/google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_tracing_connection.cc +++ b/google/cloud/recaptchaenterprise/v1/internal/recaptcha_enterprise_tracing_connection.cc @@ -72,7 +72,7 @@ RecaptchaEnterpriseServiceTracingConnection::ListKeys( google::cloud::recaptchaenterprise::v1::ListKeysRequest request) { auto span = internal::MakeSpan( "recaptchaenterprise_v1::RecaptchaEnterpriseServiceConnection::ListKeys"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListKeys(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::recaptchaenterprise::v1::Key>(std::move(span), @@ -157,7 +157,7 @@ RecaptchaEnterpriseServiceTracingConnection::ListFirewallPolicies( auto span = internal::MakeSpan( "recaptchaenterprise_v1::RecaptchaEnterpriseServiceConnection::" "ListFirewallPolicies"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListFirewallPolicies(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::recaptchaenterprise::v1::FirewallPolicy>(std::move(span), @@ -203,7 +203,7 @@ RecaptchaEnterpriseServiceTracingConnection::ListRelatedAccountGroups( auto span = internal::MakeSpan( "recaptchaenterprise_v1::RecaptchaEnterpriseServiceConnection::" "ListRelatedAccountGroups"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListRelatedAccountGroups(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::recaptchaenterprise::v1::RelatedAccountGroup>( @@ -218,7 +218,7 @@ RecaptchaEnterpriseServiceTracingConnection::ListRelatedAccountGroupMemberships( auto span = internal::MakeSpan( "recaptchaenterprise_v1::RecaptchaEnterpriseServiceConnection::" "ListRelatedAccountGroupMemberships"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListRelatedAccountGroupMemberships(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::recaptchaenterprise::v1::RelatedAccountGroupMembership>( @@ -234,7 +234,7 @@ RecaptchaEnterpriseServiceTracingConnection:: auto span = internal::MakeSpan( "recaptchaenterprise_v1::RecaptchaEnterpriseServiceConnection::" "SearchRelatedAccountGroupMemberships"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->SearchRelatedAccountGroupMemberships(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::recaptchaenterprise::v1::RelatedAccountGroupMembership>( diff --git a/google/cloud/recommender/v1/internal/recommender_tracing_connection.cc b/google/cloud/recommender/v1/internal/recommender_tracing_connection.cc index 8fee37ff7830..33fb02f8ecec 100644 --- a/google/cloud/recommender/v1/internal/recommender_tracing_connection.cc +++ b/google/cloud/recommender/v1/internal/recommender_tracing_connection.cc @@ -37,7 +37,7 @@ RecommenderTracingConnection::ListInsights( google::cloud::recommender::v1::ListInsightsRequest request) { auto span = internal::MakeSpan("recommender_v1::RecommenderConnection::ListInsights"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListInsights(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::recommender::v1::Insight>(std::move(span), std::move(sr)); @@ -66,7 +66,7 @@ RecommenderTracingConnection::ListRecommendations( google::cloud::recommender::v1::ListRecommendationsRequest request) { auto span = internal::MakeSpan( "recommender_v1::RecommenderConnection::ListRecommendations"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListRecommendations(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::recommender::v1::Recommendation>(std::move(span), diff --git a/google/cloud/redis/v1/internal/cloud_redis_tracing_connection.cc b/google/cloud/redis/v1/internal/cloud_redis_tracing_connection.cc index 6ceb443982e9..a32619a7440e 100644 --- a/google/cloud/redis/v1/internal/cloud_redis_tracing_connection.cc +++ b/google/cloud/redis/v1/internal/cloud_redis_tracing_connection.cc @@ -37,7 +37,7 @@ CloudRedisTracingConnection::ListInstances( google::cloud::redis::v1::ListInstancesRequest request) { auto span = internal::MakeSpan("redis_v1::CloudRedisConnection::ListInstances"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListInstances(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -65,7 +65,7 @@ CloudRedisTracingConnection::CreateInstance( google::cloud::redis::v1::CreateInstanceRequest const& request) { auto span = internal::MakeSpan("redis_v1::CloudRedisConnection::CreateInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateInstance(request)); } @@ -74,7 +74,7 @@ CloudRedisTracingConnection::UpdateInstance( google::cloud::redis::v1::UpdateInstanceRequest const& request) { auto span = internal::MakeSpan("redis_v1::CloudRedisConnection::UpdateInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateInstance(request)); } @@ -83,7 +83,7 @@ CloudRedisTracingConnection::UpgradeInstance( google::cloud::redis::v1::UpgradeInstanceRequest const& request) { auto span = internal::MakeSpan("redis_v1::CloudRedisConnection::UpgradeInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpgradeInstance(request)); } @@ -92,7 +92,7 @@ CloudRedisTracingConnection::ImportInstance( google::cloud::redis::v1::ImportInstanceRequest const& request) { auto span = internal::MakeSpan("redis_v1::CloudRedisConnection::ImportInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ImportInstance(request)); } @@ -101,7 +101,7 @@ CloudRedisTracingConnection::ExportInstance( google::cloud::redis::v1::ExportInstanceRequest const& request) { auto span = internal::MakeSpan("redis_v1::CloudRedisConnection::ExportInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ExportInstance(request)); } @@ -110,7 +110,7 @@ CloudRedisTracingConnection::FailoverInstance( google::cloud::redis::v1::FailoverInstanceRequest const& request) { auto span = internal::MakeSpan("redis_v1::CloudRedisConnection::FailoverInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->FailoverInstance(request)); } @@ -119,7 +119,7 @@ CloudRedisTracingConnection::DeleteInstance( google::cloud::redis::v1::DeleteInstanceRequest const& request) { auto span = internal::MakeSpan("redis_v1::CloudRedisConnection::DeleteInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteInstance(request)); } @@ -128,7 +128,7 @@ CloudRedisTracingConnection::RescheduleMaintenance( google::cloud::redis::v1::RescheduleMaintenanceRequest const& request) { auto span = internal::MakeSpan( "redis_v1::CloudRedisConnection::RescheduleMaintenance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RescheduleMaintenance(request)); } diff --git a/google/cloud/redis/v1/internal/cloud_redis_tracing_stub.cc b/google/cloud/redis/v1/internal/cloud_redis_tracing_stub.cc index f6d6806f7058..821c3fc2db96 100644 --- a/google/cloud/redis/v1/internal/cloud_redis_tracing_stub.cc +++ b/google/cloud/redis/v1/internal/cloud_redis_tracing_stub.cc @@ -72,10 +72,8 @@ CloudRedisTracingStub::AsyncCreateInstance( google::cloud::redis::v1::CreateInstanceRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.redis.v1.CloudRedis", "CreateInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -87,10 +85,8 @@ CloudRedisTracingStub::AsyncUpdateInstance( google::cloud::redis::v1::UpdateInstanceRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.redis.v1.CloudRedis", "UpdateInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -102,10 +98,8 @@ CloudRedisTracingStub::AsyncUpgradeInstance( google::cloud::redis::v1::UpgradeInstanceRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.redis.v1.CloudRedis", "UpgradeInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpgradeInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -117,10 +111,8 @@ CloudRedisTracingStub::AsyncImportInstance( google::cloud::redis::v1::ImportInstanceRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.redis.v1.CloudRedis", "ImportInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncImportInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -132,10 +124,8 @@ CloudRedisTracingStub::AsyncExportInstance( google::cloud::redis::v1::ExportInstanceRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.redis.v1.CloudRedis", "ExportInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncExportInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -147,10 +137,8 @@ CloudRedisTracingStub::AsyncFailoverInstance( google::cloud::redis::v1::FailoverInstanceRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.redis.v1.CloudRedis", "FailoverInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncFailoverInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -162,10 +150,8 @@ CloudRedisTracingStub::AsyncDeleteInstance( google::cloud::redis::v1::DeleteInstanceRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.redis.v1.CloudRedis", "DeleteInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -177,10 +163,8 @@ CloudRedisTracingStub::AsyncRescheduleMaintenance( google::cloud::redis::v1::RescheduleMaintenanceRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.redis.v1.CloudRedis", "RescheduleMaintenance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncRescheduleMaintenance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -192,10 +176,8 @@ CloudRedisTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -206,10 +188,8 @@ future CloudRedisTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/resourcemanager/v3/internal/folders_tracing_connection.cc b/google/cloud/resourcemanager/v3/internal/folders_tracing_connection.cc index e9fffdeed3d5..40f8a7f3fee2 100644 --- a/google/cloud/resourcemanager/v3/internal/folders_tracing_connection.cc +++ b/google/cloud/resourcemanager/v3/internal/folders_tracing_connection.cc @@ -46,7 +46,7 @@ FoldersTracingConnection::ListFolders( google::cloud::resourcemanager::v3::ListFoldersRequest request) { auto span = internal::MakeSpan("resourcemanager_v3::FoldersConnection::ListFolders"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListFolders(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::resourcemanager::v3::Folder>(std::move(span), @@ -58,7 +58,7 @@ FoldersTracingConnection::SearchFolders( google::cloud::resourcemanager::v3::SearchFoldersRequest request) { auto span = internal::MakeSpan( "resourcemanager_v3::FoldersConnection::SearchFolders"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->SearchFolders(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::resourcemanager::v3::Folder>(std::move(span), @@ -70,7 +70,7 @@ FoldersTracingConnection::CreateFolder( google::cloud::resourcemanager::v3::CreateFolderRequest const& request) { auto span = internal::MakeSpan("resourcemanager_v3::FoldersConnection::CreateFolder"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateFolder(request)); } @@ -79,7 +79,7 @@ FoldersTracingConnection::UpdateFolder( google::cloud::resourcemanager::v3::UpdateFolderRequest const& request) { auto span = internal::MakeSpan("resourcemanager_v3::FoldersConnection::UpdateFolder"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateFolder(request)); } @@ -88,7 +88,7 @@ FoldersTracingConnection::MoveFolder( google::cloud::resourcemanager::v3::MoveFolderRequest const& request) { auto span = internal::MakeSpan("resourcemanager_v3::FoldersConnection::MoveFolder"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->MoveFolder(request)); } @@ -97,7 +97,7 @@ FoldersTracingConnection::DeleteFolder( google::cloud::resourcemanager::v3::DeleteFolderRequest const& request) { auto span = internal::MakeSpan("resourcemanager_v3::FoldersConnection::DeleteFolder"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteFolder(request)); } @@ -106,7 +106,7 @@ FoldersTracingConnection::UndeleteFolder( google::cloud::resourcemanager::v3::UndeleteFolderRequest const& request) { auto span = internal::MakeSpan( "resourcemanager_v3::FoldersConnection::UndeleteFolder"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UndeleteFolder(request)); } diff --git a/google/cloud/resourcemanager/v3/internal/folders_tracing_stub.cc b/google/cloud/resourcemanager/v3/internal/folders_tracing_stub.cc index 63162ccf49a3..f8de20b68d0a 100644 --- a/google/cloud/resourcemanager/v3/internal/folders_tracing_stub.cc +++ b/google/cloud/resourcemanager/v3/internal/folders_tracing_stub.cc @@ -71,10 +71,8 @@ FoldersTracingStub::AsyncCreateFolder( google::cloud::resourcemanager::v3::CreateFolderRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.resourcemanager.v3.Folders", "CreateFolder"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateFolder(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -86,10 +84,8 @@ FoldersTracingStub::AsyncUpdateFolder( google::cloud::resourcemanager::v3::UpdateFolderRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.resourcemanager.v3.Folders", "UpdateFolder"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateFolder(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -101,10 +97,8 @@ FoldersTracingStub::AsyncMoveFolder( google::cloud::resourcemanager::v3::MoveFolderRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.resourcemanager.v3.Folders", "MoveFolder"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncMoveFolder(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -116,10 +110,8 @@ FoldersTracingStub::AsyncDeleteFolder( google::cloud::resourcemanager::v3::DeleteFolderRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.resourcemanager.v3.Folders", "DeleteFolder"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteFolder(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -131,10 +123,8 @@ FoldersTracingStub::AsyncUndeleteFolder( google::cloud::resourcemanager::v3::UndeleteFolderRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.resourcemanager.v3.Folders", "UndeleteFolder"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUndeleteFolder(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -180,10 +170,8 @@ FoldersTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -194,10 +182,8 @@ future FoldersTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/resourcemanager/v3/internal/organizations_tracing_connection.cc b/google/cloud/resourcemanager/v3/internal/organizations_tracing_connection.cc index 4e1f8614d4f0..dbc8efb06a8e 100644 --- a/google/cloud/resourcemanager/v3/internal/organizations_tracing_connection.cc +++ b/google/cloud/resourcemanager/v3/internal/organizations_tracing_connection.cc @@ -46,7 +46,7 @@ OrganizationsTracingConnection::SearchOrganizations( google::cloud::resourcemanager::v3::SearchOrganizationsRequest request) { auto span = internal::MakeSpan( "resourcemanager_v3::OrganizationsConnection::SearchOrganizations"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->SearchOrganizations(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::resourcemanager::v3::Organization>(std::move(span), diff --git a/google/cloud/resourcemanager/v3/internal/projects_tracing_connection.cc b/google/cloud/resourcemanager/v3/internal/projects_tracing_connection.cc index c83781b11654..650b6d87440e 100644 --- a/google/cloud/resourcemanager/v3/internal/projects_tracing_connection.cc +++ b/google/cloud/resourcemanager/v3/internal/projects_tracing_connection.cc @@ -46,7 +46,7 @@ ProjectsTracingConnection::ListProjects( google::cloud::resourcemanager::v3::ListProjectsRequest request) { auto span = internal::MakeSpan( "resourcemanager_v3::ProjectsConnection::ListProjects"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListProjects(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::resourcemanager::v3::Project>(std::move(span), @@ -58,7 +58,7 @@ ProjectsTracingConnection::SearchProjects( google::cloud::resourcemanager::v3::SearchProjectsRequest request) { auto span = internal::MakeSpan( "resourcemanager_v3::ProjectsConnection::SearchProjects"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->SearchProjects(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::resourcemanager::v3::Project>(std::move(span), @@ -70,7 +70,7 @@ ProjectsTracingConnection::CreateProject( google::cloud::resourcemanager::v3::CreateProjectRequest const& request) { auto span = internal::MakeSpan( "resourcemanager_v3::ProjectsConnection::CreateProject"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateProject(request)); } @@ -79,7 +79,7 @@ ProjectsTracingConnection::UpdateProject( google::cloud::resourcemanager::v3::UpdateProjectRequest const& request) { auto span = internal::MakeSpan( "resourcemanager_v3::ProjectsConnection::UpdateProject"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateProject(request)); } @@ -88,7 +88,7 @@ ProjectsTracingConnection::MoveProject( google::cloud::resourcemanager::v3::MoveProjectRequest const& request) { auto span = internal::MakeSpan("resourcemanager_v3::ProjectsConnection::MoveProject"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->MoveProject(request)); } @@ -97,7 +97,7 @@ ProjectsTracingConnection::DeleteProject( google::cloud::resourcemanager::v3::DeleteProjectRequest const& request) { auto span = internal::MakeSpan( "resourcemanager_v3::ProjectsConnection::DeleteProject"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteProject(request)); } @@ -106,7 +106,7 @@ ProjectsTracingConnection::UndeleteProject( google::cloud::resourcemanager::v3::UndeleteProjectRequest const& request) { auto span = internal::MakeSpan( "resourcemanager_v3::ProjectsConnection::UndeleteProject"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UndeleteProject(request)); } diff --git a/google/cloud/resourcemanager/v3/internal/projects_tracing_stub.cc b/google/cloud/resourcemanager/v3/internal/projects_tracing_stub.cc index 5e12143b6605..372b9716a142 100644 --- a/google/cloud/resourcemanager/v3/internal/projects_tracing_stub.cc +++ b/google/cloud/resourcemanager/v3/internal/projects_tracing_stub.cc @@ -72,10 +72,8 @@ ProjectsTracingStub::AsyncCreateProject( google::cloud::resourcemanager::v3::CreateProjectRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.resourcemanager.v3.Projects", "CreateProject"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateProject(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -87,10 +85,8 @@ ProjectsTracingStub::AsyncUpdateProject( google::cloud::resourcemanager::v3::UpdateProjectRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.resourcemanager.v3.Projects", "UpdateProject"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateProject(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -102,10 +98,8 @@ ProjectsTracingStub::AsyncMoveProject( google::cloud::resourcemanager::v3::MoveProjectRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.resourcemanager.v3.Projects", "MoveProject"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncMoveProject(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -117,10 +111,8 @@ ProjectsTracingStub::AsyncDeleteProject( google::cloud::resourcemanager::v3::DeleteProjectRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.resourcemanager.v3.Projects", "DeleteProject"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteProject(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -132,10 +124,8 @@ ProjectsTracingStub::AsyncUndeleteProject( google::cloud::resourcemanager::v3::UndeleteProjectRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.resourcemanager.v3.Projects", "UndeleteProject"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUndeleteProject(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -181,10 +171,8 @@ ProjectsTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -195,10 +183,8 @@ future ProjectsTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/resourcemanager/v3/internal/tag_bindings_tracing_connection.cc b/google/cloud/resourcemanager/v3/internal/tag_bindings_tracing_connection.cc index 7a69fff710f9..fc062a6be4a5 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_bindings_tracing_connection.cc +++ b/google/cloud/resourcemanager/v3/internal/tag_bindings_tracing_connection.cc @@ -37,7 +37,7 @@ TagBindingsTracingConnection::ListTagBindings( google::cloud::resourcemanager::v3::ListTagBindingsRequest request) { auto span = internal::MakeSpan( "resourcemanager_v3::TagBindingsConnection::ListTagBindings"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListTagBindings(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::resourcemanager::v3::TagBinding>(std::move(span), @@ -50,7 +50,7 @@ TagBindingsTracingConnection::CreateTagBinding( request) { auto span = internal::MakeSpan( "resourcemanager_v3::TagBindingsConnection::CreateTagBinding"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateTagBinding(request)); } @@ -60,7 +60,7 @@ TagBindingsTracingConnection::DeleteTagBinding( request) { auto span = internal::MakeSpan( "resourcemanager_v3::TagBindingsConnection::DeleteTagBinding"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteTagBinding(request)); } @@ -69,7 +69,7 @@ TagBindingsTracingConnection::ListEffectiveTags( google::cloud::resourcemanager::v3::ListEffectiveTagsRequest request) { auto span = internal::MakeSpan( "resourcemanager_v3::TagBindingsConnection::ListEffectiveTags"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListEffectiveTags(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::resourcemanager::v3::EffectiveTag>(std::move(span), diff --git a/google/cloud/resourcemanager/v3/internal/tag_bindings_tracing_stub.cc b/google/cloud/resourcemanager/v3/internal/tag_bindings_tracing_stub.cc index df50376157bf..ff0bdafd4bdf 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_bindings_tracing_stub.cc +++ b/google/cloud/resourcemanager/v3/internal/tag_bindings_tracing_stub.cc @@ -50,10 +50,8 @@ TagBindingsTracingStub::AsyncCreateTagBinding( request) { auto span = internal::MakeSpanGrpc( "google.cloud.resourcemanager.v3.TagBindings", "CreateTagBinding"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateTagBinding(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -66,10 +64,8 @@ TagBindingsTracingStub::AsyncDeleteTagBinding( request) { auto span = internal::MakeSpanGrpc( "google.cloud.resourcemanager.v3.TagBindings", "DeleteTagBinding"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteTagBinding(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -94,10 +90,8 @@ TagBindingsTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -108,10 +102,8 @@ future TagBindingsTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/resourcemanager/v3/internal/tag_holds_tracing_connection.cc b/google/cloud/resourcemanager/v3/internal/tag_holds_tracing_connection.cc index 4a70c2bcc13e..2d78f9f3b475 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_holds_tracing_connection.cc +++ b/google/cloud/resourcemanager/v3/internal/tag_holds_tracing_connection.cc @@ -37,7 +37,7 @@ TagHoldsTracingConnection::CreateTagHold( google::cloud::resourcemanager::v3::CreateTagHoldRequest const& request) { auto span = internal::MakeSpan( "resourcemanager_v3::TagHoldsConnection::CreateTagHold"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateTagHold(request)); } @@ -46,7 +46,7 @@ TagHoldsTracingConnection::DeleteTagHold( google::cloud::resourcemanager::v3::DeleteTagHoldRequest const& request) { auto span = internal::MakeSpan( "resourcemanager_v3::TagHoldsConnection::DeleteTagHold"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteTagHold(request)); } @@ -55,7 +55,7 @@ TagHoldsTracingConnection::ListTagHolds( google::cloud::resourcemanager::v3::ListTagHoldsRequest request) { auto span = internal::MakeSpan( "resourcemanager_v3::TagHoldsConnection::ListTagHolds"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListTagHolds(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::resourcemanager::v3::TagHold>(std::move(span), diff --git a/google/cloud/resourcemanager/v3/internal/tag_holds_tracing_stub.cc b/google/cloud/resourcemanager/v3/internal/tag_holds_tracing_stub.cc index c71b9aac48c5..8388e7c51341 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_holds_tracing_stub.cc +++ b/google/cloud/resourcemanager/v3/internal/tag_holds_tracing_stub.cc @@ -36,10 +36,8 @@ TagHoldsTracingStub::AsyncCreateTagHold( google::cloud::resourcemanager::v3::CreateTagHoldRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.resourcemanager.v3.TagHolds", "CreateTagHold"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateTagHold(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -51,10 +49,8 @@ TagHoldsTracingStub::AsyncDeleteTagHold( google::cloud::resourcemanager::v3::DeleteTagHoldRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.resourcemanager.v3.TagHolds", "DeleteTagHold"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteTagHold(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -78,10 +74,8 @@ TagHoldsTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -92,10 +86,8 @@ future TagHoldsTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/resourcemanager/v3/internal/tag_keys_tracing_connection.cc b/google/cloud/resourcemanager/v3/internal/tag_keys_tracing_connection.cc index 28075df81b1f..67aa02d19728 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_keys_tracing_connection.cc +++ b/google/cloud/resourcemanager/v3/internal/tag_keys_tracing_connection.cc @@ -37,7 +37,7 @@ TagKeysTracingConnection::ListTagKeys( google::cloud::resourcemanager::v3::ListTagKeysRequest request) { auto span = internal::MakeSpan("resourcemanager_v3::TagKeysConnection::ListTagKeys"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListTagKeys(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::resourcemanager::v3::TagKey>(std::move(span), @@ -68,7 +68,7 @@ TagKeysTracingConnection::CreateTagKey( google::cloud::resourcemanager::v3::CreateTagKeyRequest const& request) { auto span = internal::MakeSpan("resourcemanager_v3::TagKeysConnection::CreateTagKey"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateTagKey(request)); } @@ -77,7 +77,7 @@ TagKeysTracingConnection::UpdateTagKey( google::cloud::resourcemanager::v3::UpdateTagKeyRequest const& request) { auto span = internal::MakeSpan("resourcemanager_v3::TagKeysConnection::UpdateTagKey"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateTagKey(request)); } @@ -86,7 +86,7 @@ TagKeysTracingConnection::DeleteTagKey( google::cloud::resourcemanager::v3::DeleteTagKeyRequest const& request) { auto span = internal::MakeSpan("resourcemanager_v3::TagKeysConnection::DeleteTagKey"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteTagKey(request)); } diff --git a/google/cloud/resourcemanager/v3/internal/tag_keys_tracing_stub.cc b/google/cloud/resourcemanager/v3/internal/tag_keys_tracing_stub.cc index 9ca14a7a480b..8072b7171013 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_keys_tracing_stub.cc +++ b/google/cloud/resourcemanager/v3/internal/tag_keys_tracing_stub.cc @@ -72,10 +72,8 @@ TagKeysTracingStub::AsyncCreateTagKey( google::cloud::resourcemanager::v3::CreateTagKeyRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.resourcemanager.v3.TagKeys", "CreateTagKey"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateTagKey(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -87,10 +85,8 @@ TagKeysTracingStub::AsyncUpdateTagKey( google::cloud::resourcemanager::v3::UpdateTagKeyRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.resourcemanager.v3.TagKeys", "UpdateTagKey"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateTagKey(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -102,10 +98,8 @@ TagKeysTracingStub::AsyncDeleteTagKey( google::cloud::resourcemanager::v3::DeleteTagKeyRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.resourcemanager.v3.TagKeys", "DeleteTagKey"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteTagKey(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -151,10 +145,8 @@ TagKeysTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -165,10 +157,8 @@ future TagKeysTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/resourcemanager/v3/internal/tag_values_tracing_connection.cc b/google/cloud/resourcemanager/v3/internal/tag_values_tracing_connection.cc index 5a0f702e1cb6..af22508fb28a 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_values_tracing_connection.cc +++ b/google/cloud/resourcemanager/v3/internal/tag_values_tracing_connection.cc @@ -37,7 +37,7 @@ TagValuesTracingConnection::ListTagValues( google::cloud::resourcemanager::v3::ListTagValuesRequest request) { auto span = internal::MakeSpan( "resourcemanager_v3::TagValuesConnection::ListTagValues"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListTagValues(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::resourcemanager::v3::TagValue>(std::move(span), @@ -68,7 +68,7 @@ TagValuesTracingConnection::CreateTagValue( google::cloud::resourcemanager::v3::CreateTagValueRequest const& request) { auto span = internal::MakeSpan( "resourcemanager_v3::TagValuesConnection::CreateTagValue"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateTagValue(request)); } @@ -77,7 +77,7 @@ TagValuesTracingConnection::UpdateTagValue( google::cloud::resourcemanager::v3::UpdateTagValueRequest const& request) { auto span = internal::MakeSpan( "resourcemanager_v3::TagValuesConnection::UpdateTagValue"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateTagValue(request)); } @@ -86,7 +86,7 @@ TagValuesTracingConnection::DeleteTagValue( google::cloud::resourcemanager::v3::DeleteTagValueRequest const& request) { auto span = internal::MakeSpan( "resourcemanager_v3::TagValuesConnection::DeleteTagValue"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteTagValue(request)); } diff --git a/google/cloud/resourcemanager/v3/internal/tag_values_tracing_stub.cc b/google/cloud/resourcemanager/v3/internal/tag_values_tracing_stub.cc index bdc4cdf13f9f..7709fc81ddc8 100644 --- a/google/cloud/resourcemanager/v3/internal/tag_values_tracing_stub.cc +++ b/google/cloud/resourcemanager/v3/internal/tag_values_tracing_stub.cc @@ -73,10 +73,8 @@ TagValuesTracingStub::AsyncCreateTagValue( google::cloud::resourcemanager::v3::CreateTagValueRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.resourcemanager.v3.TagValues", "CreateTagValue"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateTagValue(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -88,10 +86,8 @@ TagValuesTracingStub::AsyncUpdateTagValue( google::cloud::resourcemanager::v3::UpdateTagValueRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.resourcemanager.v3.TagValues", "UpdateTagValue"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateTagValue(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -103,10 +99,8 @@ TagValuesTracingStub::AsyncDeleteTagValue( google::cloud::resourcemanager::v3::DeleteTagValueRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.resourcemanager.v3.TagValues", "DeleteTagValue"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteTagValue(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -152,10 +146,8 @@ TagValuesTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -166,10 +158,8 @@ future TagValuesTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/resourcesettings/v1/internal/resource_settings_tracing_connection.cc b/google/cloud/resourcesettings/v1/internal/resource_settings_tracing_connection.cc index 767b854145a1..90f01f991345 100644 --- a/google/cloud/resourcesettings/v1/internal/resource_settings_tracing_connection.cc +++ b/google/cloud/resourcesettings/v1/internal/resource_settings_tracing_connection.cc @@ -39,7 +39,7 @@ ResourceSettingsServiceTracingConnection::ListSettings( google::cloud::resourcesettings::v1::ListSettingsRequest request) { auto span = internal::MakeSpan( "resourcesettings_v1::ResourceSettingsServiceConnection::ListSettings"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListSettings(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::resourcesettings::v1::Setting>(std::move(span), diff --git a/google/cloud/retail/v2/internal/catalog_tracing_connection.cc b/google/cloud/retail/v2/internal/catalog_tracing_connection.cc index 85a232ab8a7a..e6b10a3ba3f9 100644 --- a/google/cloud/retail/v2/internal/catalog_tracing_connection.cc +++ b/google/cloud/retail/v2/internal/catalog_tracing_connection.cc @@ -37,7 +37,7 @@ CatalogServiceTracingConnection::ListCatalogs( google::cloud::retail::v2::ListCatalogsRequest request) { auto span = internal::MakeSpan("retail_v2::CatalogServiceConnection::ListCatalogs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListCatalogs(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); diff --git a/google/cloud/retail/v2/internal/completion_tracing_connection.cc b/google/cloud/retail/v2/internal/completion_tracing_connection.cc index ff9ef93c1488..4451e471a7aa 100644 --- a/google/cloud/retail/v2/internal/completion_tracing_connection.cc +++ b/google/cloud/retail/v2/internal/completion_tracing_connection.cc @@ -45,7 +45,7 @@ CompletionServiceTracingConnection::ImportCompletionData( google::cloud::retail::v2::ImportCompletionDataRequest const& request) { auto span = internal::MakeSpan( "retail_v2::CompletionServiceConnection::ImportCompletionData"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ImportCompletionData(request)); } diff --git a/google/cloud/retail/v2/internal/completion_tracing_stub.cc b/google/cloud/retail/v2/internal/completion_tracing_stub.cc index e6dfa660d48d..82d5da39cf55 100644 --- a/google/cloud/retail/v2/internal/completion_tracing_stub.cc +++ b/google/cloud/retail/v2/internal/completion_tracing_stub.cc @@ -49,10 +49,8 @@ CompletionServiceTracingStub::AsyncImportCompletionData( google::cloud::retail::v2::ImportCompletionDataRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.retail.v2.CompletionService", "ImportCompletionData"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncImportCompletionData(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -64,10 +62,8 @@ CompletionServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -78,10 +74,8 @@ future CompletionServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/retail/v2/internal/control_tracing_connection.cc b/google/cloud/retail/v2/internal/control_tracing_connection.cc index 0e7d6674ed6b..07817c6caf33 100644 --- a/google/cloud/retail/v2/internal/control_tracing_connection.cc +++ b/google/cloud/retail/v2/internal/control_tracing_connection.cc @@ -72,7 +72,7 @@ ControlServiceTracingConnection::ListControls( google::cloud::retail::v2::ListControlsRequest request) { auto span = internal::MakeSpan("retail_v2::ControlServiceConnection::ListControls"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListControls(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); diff --git a/google/cloud/retail/v2/internal/model_tracing_connection.cc b/google/cloud/retail/v2/internal/model_tracing_connection.cc index f420d92bd1a8..fe416ab12c66 100644 --- a/google/cloud/retail/v2/internal/model_tracing_connection.cc +++ b/google/cloud/retail/v2/internal/model_tracing_connection.cc @@ -37,7 +37,7 @@ ModelServiceTracingConnection::CreateModel( google::cloud::retail::v2::CreateModelRequest const& request) { auto span = internal::MakeSpan("retail_v2::ModelServiceConnection::CreateModel"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateModel(request)); } @@ -80,7 +80,7 @@ ModelServiceTracingConnection::ListModels( google::cloud::retail::v2::ListModelsRequest request) { auto span = internal::MakeSpan("retail_v2::ModelServiceConnection::ListModels"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListModels(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -100,7 +100,7 @@ ModelServiceTracingConnection::TuneModel( google::cloud::retail::v2::TuneModelRequest const& request) { auto span = internal::MakeSpan("retail_v2::ModelServiceConnection::TuneModel"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->TuneModel(request)); } diff --git a/google/cloud/retail/v2/internal/model_tracing_stub.cc b/google/cloud/retail/v2/internal/model_tracing_stub.cc index 54a644ab2c7f..95efa6b5adac 100644 --- a/google/cloud/retail/v2/internal/model_tracing_stub.cc +++ b/google/cloud/retail/v2/internal/model_tracing_stub.cc @@ -37,10 +37,8 @@ ModelServiceTracingStub::AsyncCreateModel( google::cloud::retail::v2::CreateModelRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.retail.v2.ModelService", "CreateModel"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateModel(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -118,10 +116,8 @@ ModelServiceTracingStub::AsyncTuneModel( google::cloud::retail::v2::TuneModelRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.retail.v2.ModelService", "TuneModel"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncTuneModel(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -133,10 +129,8 @@ ModelServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -147,10 +141,8 @@ future ModelServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/retail/v2/internal/product_tracing_connection.cc b/google/cloud/retail/v2/internal/product_tracing_connection.cc index 5c6d481c9e20..438568a14e3a 100644 --- a/google/cloud/retail/v2/internal/product_tracing_connection.cc +++ b/google/cloud/retail/v2/internal/product_tracing_connection.cc @@ -55,7 +55,7 @@ ProductServiceTracingConnection::ListProducts( google::cloud::retail::v2::ListProductsRequest request) { auto span = internal::MakeSpan("retail_v2::ProductServiceConnection::ListProducts"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListProducts(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -83,7 +83,7 @@ ProductServiceTracingConnection::ImportProducts( google::cloud::retail::v2::ImportProductsRequest const& request) { auto span = internal::MakeSpan("retail_v2::ProductServiceConnection::ImportProducts"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ImportProducts(request)); } @@ -92,7 +92,7 @@ ProductServiceTracingConnection::SetInventory( google::cloud::retail::v2::SetInventoryRequest const& request) { auto span = internal::MakeSpan("retail_v2::ProductServiceConnection::SetInventory"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SetInventory(request)); } @@ -101,7 +101,7 @@ ProductServiceTracingConnection::AddFulfillmentPlaces( google::cloud::retail::v2::AddFulfillmentPlacesRequest const& request) { auto span = internal::MakeSpan( "retail_v2::ProductServiceConnection::AddFulfillmentPlaces"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->AddFulfillmentPlaces(request)); } @@ -111,7 +111,7 @@ ProductServiceTracingConnection::RemoveFulfillmentPlaces( google::cloud::retail::v2::RemoveFulfillmentPlacesRequest const& request) { auto span = internal::MakeSpan( "retail_v2::ProductServiceConnection::RemoveFulfillmentPlaces"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RemoveFulfillmentPlaces(request)); } @@ -121,7 +121,7 @@ ProductServiceTracingConnection::AddLocalInventories( google::cloud::retail::v2::AddLocalInventoriesRequest const& request) { auto span = internal::MakeSpan( "retail_v2::ProductServiceConnection::AddLocalInventories"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->AddLocalInventories(request)); } @@ -131,7 +131,7 @@ ProductServiceTracingConnection::RemoveLocalInventories( google::cloud::retail::v2::RemoveLocalInventoriesRequest const& request) { auto span = internal::MakeSpan( "retail_v2::ProductServiceConnection::RemoveLocalInventories"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RemoveLocalInventories(request)); } diff --git a/google/cloud/retail/v2/internal/product_tracing_stub.cc b/google/cloud/retail/v2/internal/product_tracing_stub.cc index d4d58c19d96c..a7d93526cfdc 100644 --- a/google/cloud/retail/v2/internal/product_tracing_stub.cc +++ b/google/cloud/retail/v2/internal/product_tracing_stub.cc @@ -96,10 +96,8 @@ ProductServiceTracingStub::AsyncImportProducts( google::cloud::retail::v2::ImportProductsRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.retail.v2.ProductService", "ImportProducts"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncImportProducts(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -111,10 +109,8 @@ ProductServiceTracingStub::AsyncSetInventory( google::cloud::retail::v2::SetInventoryRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.retail.v2.ProductService", "SetInventory"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncSetInventory(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -126,10 +122,8 @@ ProductServiceTracingStub::AsyncAddFulfillmentPlaces( google::cloud::retail::v2::AddFulfillmentPlacesRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.retail.v2.ProductService", "AddFulfillmentPlaces"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncAddFulfillmentPlaces(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -141,10 +135,8 @@ ProductServiceTracingStub::AsyncRemoveFulfillmentPlaces( google::cloud::retail::v2::RemoveFulfillmentPlacesRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.retail.v2.ProductService", "RemoveFulfillmentPlaces"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncRemoveFulfillmentPlaces(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -156,10 +148,8 @@ ProductServiceTracingStub::AsyncAddLocalInventories( google::cloud::retail::v2::AddLocalInventoriesRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.retail.v2.ProductService", "AddLocalInventories"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncAddLocalInventories(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -171,10 +161,8 @@ ProductServiceTracingStub::AsyncRemoveLocalInventories( google::cloud::retail::v2::RemoveLocalInventoriesRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.retail.v2.ProductService", "RemoveLocalInventories"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncRemoveLocalInventories(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -186,10 +174,8 @@ ProductServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -200,10 +186,8 @@ future ProductServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/retail/v2/internal/search_tracing_connection.cc b/google/cloud/retail/v2/internal/search_tracing_connection.cc index 3dea6d6c3132..213fb89c332d 100644 --- a/google/cloud/retail/v2/internal/search_tracing_connection.cc +++ b/google/cloud/retail/v2/internal/search_tracing_connection.cc @@ -36,7 +36,7 @@ StreamRange SearchServiceTracingConnection::Search( google::cloud::retail::v2::SearchRequest request) { auto span = internal::MakeSpan("retail_v2::SearchServiceConnection::Search"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->Search(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::retail::v2::SearchResponse::SearchResult>(std::move(span), diff --git a/google/cloud/retail/v2/internal/serving_config_tracing_connection.cc b/google/cloud/retail/v2/internal/serving_config_tracing_connection.cc index d28ccc05e8d1..a95624d35605 100644 --- a/google/cloud/retail/v2/internal/serving_config_tracing_connection.cc +++ b/google/cloud/retail/v2/internal/serving_config_tracing_connection.cc @@ -72,7 +72,7 @@ ServingConfigServiceTracingConnection::ListServingConfigs( google::cloud::retail::v2::ListServingConfigsRequest request) { auto span = internal::MakeSpan( "retail_v2::ServingConfigServiceConnection::ListServingConfigs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListServingConfigs(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::retail::v2::ServingConfig>(std::move(span), std::move(sr)); diff --git a/google/cloud/retail/v2/internal/user_event_tracing_connection.cc b/google/cloud/retail/v2/internal/user_event_tracing_connection.cc index b68f1baeaaba..5927fd600df8 100644 --- a/google/cloud/retail/v2/internal/user_event_tracing_connection.cc +++ b/google/cloud/retail/v2/internal/user_event_tracing_connection.cc @@ -54,7 +54,7 @@ UserEventServiceTracingConnection::PurgeUserEvents( google::cloud::retail::v2::PurgeUserEventsRequest const& request) { auto span = internal::MakeSpan( "retail_v2::UserEventServiceConnection::PurgeUserEvents"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PurgeUserEvents(request)); } @@ -63,7 +63,7 @@ UserEventServiceTracingConnection::ImportUserEvents( google::cloud::retail::v2::ImportUserEventsRequest const& request) { auto span = internal::MakeSpan( "retail_v2::UserEventServiceConnection::ImportUserEvents"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ImportUserEvents(request)); } @@ -72,7 +72,7 @@ UserEventServiceTracingConnection::RejoinUserEvents( google::cloud::retail::v2::RejoinUserEventsRequest const& request) { auto span = internal::MakeSpan( "retail_v2::UserEventServiceConnection::RejoinUserEvents"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RejoinUserEvents(request)); } diff --git a/google/cloud/retail/v2/internal/user_event_tracing_stub.cc b/google/cloud/retail/v2/internal/user_event_tracing_stub.cc index 0a2d9d35625e..cdeb1173dcd5 100644 --- a/google/cloud/retail/v2/internal/user_event_tracing_stub.cc +++ b/google/cloud/retail/v2/internal/user_event_tracing_stub.cc @@ -60,10 +60,8 @@ UserEventServiceTracingStub::AsyncPurgeUserEvents( google::cloud::retail::v2::PurgeUserEventsRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.retail.v2.UserEventService", "PurgeUserEvents"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncPurgeUserEvents(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -75,10 +73,8 @@ UserEventServiceTracingStub::AsyncImportUserEvents( google::cloud::retail::v2::ImportUserEventsRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.retail.v2.UserEventService", "ImportUserEvents"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncImportUserEvents(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -90,10 +86,8 @@ UserEventServiceTracingStub::AsyncRejoinUserEvents( google::cloud::retail::v2::RejoinUserEventsRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.retail.v2.UserEventService", "RejoinUserEvents"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncRejoinUserEvents(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -105,10 +99,8 @@ UserEventServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -119,10 +111,8 @@ future UserEventServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/run/v2/internal/executions_tracing_connection.cc b/google/cloud/run/v2/internal/executions_tracing_connection.cc index e3b9545165ab..a5226059fc33 100644 --- a/google/cloud/run/v2/internal/executions_tracing_connection.cc +++ b/google/cloud/run/v2/internal/executions_tracing_connection.cc @@ -45,7 +45,7 @@ ExecutionsTracingConnection::ListExecutions( google::cloud::run::v2::ListExecutionsRequest request) { auto span = internal::MakeSpan("run_v2::ExecutionsConnection::ListExecutions"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListExecutions(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -56,7 +56,7 @@ ExecutionsTracingConnection::DeleteExecution( google::cloud::run::v2::DeleteExecutionRequest const& request) { auto span = internal::MakeSpan("run_v2::ExecutionsConnection::DeleteExecution"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteExecution(request)); } @@ -65,7 +65,7 @@ ExecutionsTracingConnection::CancelExecution( google::cloud::run::v2::CancelExecutionRequest const& request) { auto span = internal::MakeSpan("run_v2::ExecutionsConnection::CancelExecution"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CancelExecution(request)); } diff --git a/google/cloud/run/v2/internal/executions_tracing_stub.cc b/google/cloud/run/v2/internal/executions_tracing_stub.cc index c153c72fffaa..6827d1826f0e 100644 --- a/google/cloud/run/v2/internal/executions_tracing_stub.cc +++ b/google/cloud/run/v2/internal/executions_tracing_stub.cc @@ -60,10 +60,8 @@ ExecutionsTracingStub::AsyncDeleteExecution( google::cloud::run::v2::DeleteExecutionRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.run.v2.Executions", "DeleteExecution"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteExecution(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -75,10 +73,8 @@ ExecutionsTracingStub::AsyncCancelExecution( google::cloud::run::v2::CancelExecutionRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.run.v2.Executions", "CancelExecution"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelExecution(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -90,10 +86,8 @@ ExecutionsTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -104,10 +98,8 @@ future ExecutionsTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/run/v2/internal/jobs_tracing_connection.cc b/google/cloud/run/v2/internal/jobs_tracing_connection.cc index 0c76bb158e1a..cfc8f96d3a1e 100644 --- a/google/cloud/run/v2/internal/jobs_tracing_connection.cc +++ b/google/cloud/run/v2/internal/jobs_tracing_connection.cc @@ -35,7 +35,7 @@ JobsTracingConnection::JobsTracingConnection( future> JobsTracingConnection::CreateJob( google::cloud::run::v2::CreateJobRequest const& request) { auto span = internal::MakeSpan("run_v2::JobsConnection::CreateJob"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateJob(request)); } @@ -49,7 +49,7 @@ StatusOr JobsTracingConnection::GetJob( StreamRange JobsTracingConnection::ListJobs( google::cloud::run::v2::ListJobsRequest request) { auto span = internal::MakeSpan("run_v2::JobsConnection::ListJobs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListJobs(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -58,14 +58,14 @@ StreamRange JobsTracingConnection::ListJobs( future> JobsTracingConnection::UpdateJob( google::cloud::run::v2::UpdateJobRequest const& request) { auto span = internal::MakeSpan("run_v2::JobsConnection::UpdateJob"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateJob(request)); } future> JobsTracingConnection::DeleteJob( google::cloud::run::v2::DeleteJobRequest const& request) { auto span = internal::MakeSpan("run_v2::JobsConnection::DeleteJob"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteJob(request)); } @@ -73,7 +73,7 @@ future> JobsTracingConnection::RunJob( google::cloud::run::v2::RunJobRequest const& request) { auto span = internal::MakeSpan("run_v2::JobsConnection::RunJob"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RunJob(request)); } diff --git a/google/cloud/run/v2/internal/jobs_tracing_stub.cc b/google/cloud/run/v2/internal/jobs_tracing_stub.cc index 402257fa8f2d..029e2f7de826 100644 --- a/google/cloud/run/v2/internal/jobs_tracing_stub.cc +++ b/google/cloud/run/v2/internal/jobs_tracing_stub.cc @@ -35,10 +35,8 @@ JobsTracingStub::AsyncCreateJob( std::shared_ptr context, google::cloud::run::v2::CreateJobRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.run.v2.Jobs", "CreateJob"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateJob(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -67,10 +65,8 @@ JobsTracingStub::AsyncUpdateJob( std::shared_ptr context, google::cloud::run::v2::UpdateJobRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.run.v2.Jobs", "UpdateJob"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateJob(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -81,10 +77,8 @@ JobsTracingStub::AsyncDeleteJob( std::shared_ptr context, google::cloud::run::v2::DeleteJobRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.run.v2.Jobs", "DeleteJob"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteJob(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -94,10 +88,8 @@ future> JobsTracingStub::AsyncRunJob( std::shared_ptr context, google::cloud::run::v2::RunJobRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.run.v2.Jobs", "RunJob"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncRunJob(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -143,10 +135,8 @@ JobsTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -157,10 +147,8 @@ future JobsTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/run/v2/internal/revisions_tracing_connection.cc b/google/cloud/run/v2/internal/revisions_tracing_connection.cc index 4c3ef3362623..6004b2dac180 100644 --- a/google/cloud/run/v2/internal/revisions_tracing_connection.cc +++ b/google/cloud/run/v2/internal/revisions_tracing_connection.cc @@ -44,7 +44,7 @@ StreamRange RevisionsTracingConnection::ListRevisions( google::cloud::run::v2::ListRevisionsRequest request) { auto span = internal::MakeSpan("run_v2::RevisionsConnection::ListRevisions"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListRevisions(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -54,7 +54,7 @@ future> RevisionsTracingConnection::DeleteRevision( google::cloud::run::v2::DeleteRevisionRequest const& request) { auto span = internal::MakeSpan("run_v2::RevisionsConnection::DeleteRevision"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteRevision(request)); } diff --git a/google/cloud/run/v2/internal/revisions_tracing_stub.cc b/google/cloud/run/v2/internal/revisions_tracing_stub.cc index 47a2f5e7eb89..1f044c2b7e49 100644 --- a/google/cloud/run/v2/internal/revisions_tracing_stub.cc +++ b/google/cloud/run/v2/internal/revisions_tracing_stub.cc @@ -59,10 +59,8 @@ RevisionsTracingStub::AsyncDeleteRevision( google::cloud::run::v2::DeleteRevisionRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.run.v2.Revisions", "DeleteRevision"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteRevision(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -74,10 +72,8 @@ RevisionsTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -88,10 +84,8 @@ future RevisionsTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/run/v2/internal/services_tracing_connection.cc b/google/cloud/run/v2/internal/services_tracing_connection.cc index d5a96609a833..42582f4073e2 100644 --- a/google/cloud/run/v2/internal/services_tracing_connection.cc +++ b/google/cloud/run/v2/internal/services_tracing_connection.cc @@ -36,7 +36,7 @@ future> ServicesTracingConnection::CreateService( google::cloud::run::v2::CreateServiceRequest const& request) { auto span = internal::MakeSpan("run_v2::ServicesConnection::CreateService"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateService(request)); } @@ -51,7 +51,7 @@ StreamRange ServicesTracingConnection::ListServices( google::cloud::run::v2::ListServicesRequest request) { auto span = internal::MakeSpan("run_v2::ServicesConnection::ListServices"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListServices(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -61,7 +61,7 @@ future> ServicesTracingConnection::UpdateService( google::cloud::run::v2::UpdateServiceRequest const& request) { auto span = internal::MakeSpan("run_v2::ServicesConnection::UpdateService"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateService(request)); } @@ -69,7 +69,7 @@ future> ServicesTracingConnection::DeleteService( google::cloud::run::v2::DeleteServiceRequest const& request) { auto span = internal::MakeSpan("run_v2::ServicesConnection::DeleteService"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteService(request)); } diff --git a/google/cloud/run/v2/internal/services_tracing_stub.cc b/google/cloud/run/v2/internal/services_tracing_stub.cc index e19e901f7201..6e231b55e836 100644 --- a/google/cloud/run/v2/internal/services_tracing_stub.cc +++ b/google/cloud/run/v2/internal/services_tracing_stub.cc @@ -36,10 +36,8 @@ ServicesTracingStub::AsyncCreateService( google::cloud::run::v2::CreateServiceRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.run.v2.Services", "CreateService"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateService(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -74,10 +72,8 @@ ServicesTracingStub::AsyncUpdateService( google::cloud::run::v2::UpdateServiceRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.run.v2.Services", "UpdateService"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateService(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -89,10 +85,8 @@ ServicesTracingStub::AsyncDeleteService( google::cloud::run::v2::DeleteServiceRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.run.v2.Services", "DeleteService"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteService(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -138,10 +132,8 @@ ServicesTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -152,10 +144,8 @@ future ServicesTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/run/v2/internal/tasks_tracing_connection.cc b/google/cloud/run/v2/internal/tasks_tracing_connection.cc index bae0f23fbe81..f5e4faf286be 100644 --- a/google/cloud/run/v2/internal/tasks_tracing_connection.cc +++ b/google/cloud/run/v2/internal/tasks_tracing_connection.cc @@ -42,7 +42,7 @@ StatusOr TasksTracingConnection::GetTask( StreamRange TasksTracingConnection::ListTasks( google::cloud::run::v2::ListTasksRequest request) { auto span = internal::MakeSpan("run_v2::TasksConnection::ListTasks"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListTasks(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); diff --git a/google/cloud/scheduler/v1/internal/cloud_scheduler_tracing_connection.cc b/google/cloud/scheduler/v1/internal/cloud_scheduler_tracing_connection.cc index bc5d87ea113b..ed164b9e26e5 100644 --- a/google/cloud/scheduler/v1/internal/cloud_scheduler_tracing_connection.cc +++ b/google/cloud/scheduler/v1/internal/cloud_scheduler_tracing_connection.cc @@ -37,7 +37,7 @@ CloudSchedulerTracingConnection::ListJobs( google::cloud::scheduler::v1::ListJobsRequest request) { auto span = internal::MakeSpan("scheduler_v1::CloudSchedulerConnection::ListJobs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListJobs(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); diff --git a/google/cloud/secretmanager/v1/internal/secret_manager_tracing_connection.cc b/google/cloud/secretmanager/v1/internal/secret_manager_tracing_connection.cc index 8673882fbc35..ada1a662ff37 100644 --- a/google/cloud/secretmanager/v1/internal/secret_manager_tracing_connection.cc +++ b/google/cloud/secretmanager/v1/internal/secret_manager_tracing_connection.cc @@ -37,7 +37,7 @@ SecretManagerServiceTracingConnection::ListSecrets( google::cloud::secretmanager::v1::ListSecretsRequest request) { auto span = internal::MakeSpan( "secretmanager_v1::SecretManagerServiceConnection::ListSecrets"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListSecrets(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::secretmanager::v1::Secret>(std::move(span), std::move(sr)); @@ -92,7 +92,7 @@ SecretManagerServiceTracingConnection::ListSecretVersions( google::cloud::secretmanager::v1::ListSecretVersionsRequest request) { auto span = internal::MakeSpan( "secretmanager_v1::SecretManagerServiceConnection::ListSecretVersions"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListSecretVersions(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::secretmanager::v1::SecretVersion>(std::move(span), diff --git a/google/cloud/securesourcemanager/v1/internal/secure_source_manager_tracing_connection.cc b/google/cloud/securesourcemanager/v1/internal/secure_source_manager_tracing_connection.cc index b41731e4311f..b4c3ce4cfc6f 100644 --- a/google/cloud/securesourcemanager/v1/internal/secure_source_manager_tracing_connection.cc +++ b/google/cloud/securesourcemanager/v1/internal/secure_source_manager_tracing_connection.cc @@ -38,7 +38,7 @@ SecureSourceManagerTracingConnection::ListInstances( google::cloud::securesourcemanager::v1::ListInstancesRequest request) { auto span = internal::MakeSpan( "securesourcemanager_v1::SecureSourceManagerConnection::ListInstances"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListInstances(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::securesourcemanager::v1::Instance>(std::move(span), @@ -60,7 +60,7 @@ SecureSourceManagerTracingConnection::CreateInstance( request) { auto span = internal::MakeSpan( "securesourcemanager_v1::SecureSourceManagerConnection::CreateInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateInstance(request)); } @@ -70,7 +70,7 @@ SecureSourceManagerTracingConnection::DeleteInstance( request) { auto span = internal::MakeSpan( "securesourcemanager_v1::SecureSourceManagerConnection::DeleteInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteInstance(request)); } @@ -80,7 +80,7 @@ SecureSourceManagerTracingConnection::ListRepositories( auto span = internal::MakeSpan( "securesourcemanager_v1::SecureSourceManagerConnection::" "ListRepositories"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListRepositories(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::securesourcemanager::v1::Repository>(std::move(span), @@ -104,7 +104,7 @@ SecureSourceManagerTracingConnection::CreateRepository( auto span = internal::MakeSpan( "securesourcemanager_v1::SecureSourceManagerConnection::" "CreateRepository"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateRepository(request)); } @@ -115,7 +115,7 @@ SecureSourceManagerTracingConnection::DeleteRepository( auto span = internal::MakeSpan( "securesourcemanager_v1::SecureSourceManagerConnection::" "DeleteRepository"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteRepository(request)); } diff --git a/google/cloud/securesourcemanager/v1/internal/secure_source_manager_tracing_stub.cc b/google/cloud/securesourcemanager/v1/internal/secure_source_manager_tracing_stub.cc index c81fbb4fff94..a9ead0f56336 100644 --- a/google/cloud/securesourcemanager/v1/internal/secure_source_manager_tracing_stub.cc +++ b/google/cloud/securesourcemanager/v1/internal/secure_source_manager_tracing_stub.cc @@ -65,10 +65,8 @@ SecureSourceManagerTracingStub::AsyncCreateInstance( auto span = internal::MakeSpanGrpc( "google.cloud.securesourcemanager.v1.SecureSourceManager", "CreateInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -82,10 +80,8 @@ SecureSourceManagerTracingStub::AsyncDeleteInstance( auto span = internal::MakeSpanGrpc( "google.cloud.securesourcemanager.v1.SecureSourceManager", "DeleteInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -127,10 +123,8 @@ SecureSourceManagerTracingStub::AsyncCreateRepository( auto span = internal::MakeSpanGrpc( "google.cloud.securesourcemanager.v1.SecureSourceManager", "CreateRepository"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateRepository(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -144,10 +138,8 @@ SecureSourceManagerTracingStub::AsyncDeleteRepository( auto span = internal::MakeSpanGrpc( "google.cloud.securesourcemanager.v1.SecureSourceManager", "DeleteRepository"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteRepository(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -198,10 +190,8 @@ SecureSourceManagerTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -212,10 +202,8 @@ future SecureSourceManagerTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/securitycenter/v1/internal/security_center_tracing_connection.cc b/google/cloud/securitycenter/v1/internal/security_center_tracing_connection.cc index 2e5269d25f86..2dc1a129e02c 100644 --- a/google/cloud/securitycenter/v1/internal/security_center_tracing_connection.cc +++ b/google/cloud/securitycenter/v1/internal/security_center_tracing_connection.cc @@ -37,7 +37,7 @@ SecurityCenterTracingConnection::BulkMuteFindings( google::cloud::securitycenter::v1::BulkMuteFindingsRequest const& request) { auto span = internal::MakeSpan( "securitycenter_v1::SecurityCenterConnection::BulkMuteFindings"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->BulkMuteFindings(request)); } @@ -207,7 +207,7 @@ SecurityCenterTracingConnection::GroupAssets( google::cloud::securitycenter::v1::GroupAssetsRequest request) { auto span = internal::MakeSpan( "securitycenter_v1::SecurityCenterConnection::GroupAssets"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->GroupAssets(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::securitycenter::v1::GroupResult>(std::move(span), @@ -219,7 +219,7 @@ SecurityCenterTracingConnection::GroupFindings( google::cloud::securitycenter::v1::GroupFindingsRequest request) { auto span = internal::MakeSpan( "securitycenter_v1::SecurityCenterConnection::GroupFindings"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->GroupFindings(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::securitycenter::v1::GroupResult>(std::move(span), @@ -232,7 +232,7 @@ SecurityCenterTracingConnection::ListAssets( google::cloud::securitycenter::v1::ListAssetsRequest request) { auto span = internal::MakeSpan( "securitycenter_v1::SecurityCenterConnection::ListAssets"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListAssets(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::securitycenter::v1::ListAssetsResponse::ListAssetsResult>( @@ -248,7 +248,7 @@ SecurityCenterTracingConnection:: auto span = internal::MakeSpan( "securitycenter_v1::SecurityCenterConnection::" "ListDescendantSecurityHealthAnalyticsCustomModules"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListDescendantSecurityHealthAnalyticsCustomModules( std::move(request)); return internal::MakeTracedStreamRange< @@ -262,7 +262,7 @@ SecurityCenterTracingConnection::ListFindings( google::cloud::securitycenter::v1::ListFindingsRequest request) { auto span = internal::MakeSpan( "securitycenter_v1::SecurityCenterConnection::ListFindings"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListFindings(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::securitycenter::v1::ListFindingsResponse:: @@ -274,7 +274,7 @@ SecurityCenterTracingConnection::ListMuteConfigs( google::cloud::securitycenter::v1::ListMuteConfigsRequest request) { auto span = internal::MakeSpan( "securitycenter_v1::SecurityCenterConnection::ListMuteConfigs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListMuteConfigs(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::securitycenter::v1::MuteConfig>(std::move(span), @@ -286,7 +286,7 @@ SecurityCenterTracingConnection::ListNotificationConfigs( google::cloud::securitycenter::v1::ListNotificationConfigsRequest request) { auto span = internal::MakeSpan( "securitycenter_v1::SecurityCenterConnection::ListNotificationConfigs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListNotificationConfigs(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::securitycenter::v1::NotificationConfig>(std::move(span), @@ -302,7 +302,7 @@ SecurityCenterTracingConnection:: auto span = internal::MakeSpan( "securitycenter_v1::SecurityCenterConnection::" "ListEffectiveSecurityHealthAnalyticsCustomModules"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListEffectiveSecurityHealthAnalyticsCustomModules( std::move(request)); return internal::MakeTracedStreamRange< @@ -319,7 +319,7 @@ SecurityCenterTracingConnection::ListSecurityHealthAnalyticsCustomModules( auto span = internal::MakeSpan( "securitycenter_v1::SecurityCenterConnection::" "ListSecurityHealthAnalyticsCustomModules"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListSecurityHealthAnalyticsCustomModules(std::move(request)); return internal::MakeTracedStreamRange< @@ -332,7 +332,7 @@ SecurityCenterTracingConnection::ListSources( google::cloud::securitycenter::v1::ListSourcesRequest request) { auto span = internal::MakeSpan( "securitycenter_v1::SecurityCenterConnection::ListSources"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListSources(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::securitycenter::v1::Source>(std::move(span), @@ -345,7 +345,7 @@ SecurityCenterTracingConnection::RunAssetDiscovery( request) { auto span = internal::MakeSpan( "securitycenter_v1::SecurityCenterConnection::RunAssetDiscovery"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RunAssetDiscovery(request)); } @@ -498,7 +498,7 @@ SecurityCenterTracingConnection::ListBigQueryExports( google::cloud::securitycenter::v1::ListBigQueryExportsRequest request) { auto span = internal::MakeSpan( "securitycenter_v1::SecurityCenterConnection::ListBigQueryExports"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListBigQueryExports(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::securitycenter::v1::BigQueryExport>(std::move(span), diff --git a/google/cloud/securitycenter/v1/internal/security_center_tracing_stub.cc b/google/cloud/securitycenter/v1/internal/security_center_tracing_stub.cc index 40a84cadc962..418f7976b527 100644 --- a/google/cloud/securitycenter/v1/internal/security_center_tracing_stub.cc +++ b/google/cloud/securitycenter/v1/internal/security_center_tracing_stub.cc @@ -37,10 +37,8 @@ SecurityCenterTracingStub::AsyncBulkMuteFindings( google::cloud::securitycenter::v1::BulkMuteFindingsRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.securitycenter.v1.SecurityCenter", "BulkMuteFindings"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncBulkMuteFindings(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -400,10 +398,8 @@ SecurityCenterTracingStub::AsyncRunAssetDiscovery( request) { auto span = internal::MakeSpanGrpc( "google.cloud.securitycenter.v1.SecurityCenter", "RunAssetDiscovery"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncRunAssetDiscovery(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -617,10 +613,8 @@ SecurityCenterTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -631,10 +625,8 @@ future SecurityCenterTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/servicedirectory/v1/internal/registration_tracing_connection.cc b/google/cloud/servicedirectory/v1/internal/registration_tracing_connection.cc index 963a92c98d9c..60b78321a8db 100644 --- a/google/cloud/servicedirectory/v1/internal/registration_tracing_connection.cc +++ b/google/cloud/servicedirectory/v1/internal/registration_tracing_connection.cc @@ -47,7 +47,7 @@ RegistrationServiceTracingConnection::ListNamespaces( google::cloud::servicedirectory::v1::ListNamespacesRequest request) { auto span = internal::MakeSpan( "servicedirectory_v1::RegistrationServiceConnection::ListNamespaces"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListNamespaces(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::servicedirectory::v1::Namespace>(std::move(span), @@ -96,7 +96,7 @@ RegistrationServiceTracingConnection::ListServices( google::cloud::servicedirectory::v1::ListServicesRequest request) { auto span = internal::MakeSpan( "servicedirectory_v1::RegistrationServiceConnection::ListServices"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListServices(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::servicedirectory::v1::Service>(std::move(span), @@ -143,7 +143,7 @@ RegistrationServiceTracingConnection::ListEndpoints( google::cloud::servicedirectory::v1::ListEndpointsRequest request) { auto span = internal::MakeSpan( "servicedirectory_v1::RegistrationServiceConnection::ListEndpoints"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListEndpoints(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::servicedirectory::v1::Endpoint>(std::move(span), diff --git a/google/cloud/servicemanagement/v1/internal/service_manager_tracing_connection.cc b/google/cloud/servicemanagement/v1/internal/service_manager_tracing_connection.cc index 8cbedafb2406..9d55a8d1b4f6 100644 --- a/google/cloud/servicemanagement/v1/internal/service_manager_tracing_connection.cc +++ b/google/cloud/servicemanagement/v1/internal/service_manager_tracing_connection.cc @@ -37,7 +37,7 @@ ServiceManagerTracingConnection::ListServices( google::api::servicemanagement::v1::ListServicesRequest request) { auto span = internal::MakeSpan( "servicemanagement_v1::ServiceManagerConnection::ListServices"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListServices(std::move(request)); return internal::MakeTracedStreamRange< google::api::servicemanagement::v1::ManagedService>(std::move(span), @@ -58,7 +58,7 @@ ServiceManagerTracingConnection::CreateService( google::api::servicemanagement::v1::CreateServiceRequest const& request) { auto span = internal::MakeSpan( "servicemanagement_v1::ServiceManagerConnection::CreateService"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateService(request)); } @@ -67,7 +67,7 @@ ServiceManagerTracingConnection::DeleteService( google::api::servicemanagement::v1::DeleteServiceRequest const& request) { auto span = internal::MakeSpan( "servicemanagement_v1::ServiceManagerConnection::DeleteService"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteService(request)); } @@ -76,7 +76,7 @@ ServiceManagerTracingConnection::UndeleteService( google::api::servicemanagement::v1::UndeleteServiceRequest const& request) { auto span = internal::MakeSpan( "servicemanagement_v1::ServiceManagerConnection::UndeleteService"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UndeleteService(request)); } @@ -85,7 +85,7 @@ ServiceManagerTracingConnection::ListServiceConfigs( google::api::servicemanagement::v1::ListServiceConfigsRequest request) { auto span = internal::MakeSpan( "servicemanagement_v1::ServiceManagerConnection::ListServiceConfigs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListServiceConfigs(std::move(request)); return internal::MakeTracedStreamRange(std::move(span), std::move(sr)); @@ -117,7 +117,7 @@ ServiceManagerTracingConnection::SubmitConfigSource( request) { auto span = internal::MakeSpan( "servicemanagement_v1::ServiceManagerConnection::SubmitConfigSource"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SubmitConfigSource(request)); } @@ -127,7 +127,7 @@ ServiceManagerTracingConnection::ListServiceRollouts( google::api::servicemanagement::v1::ListServiceRolloutsRequest request) { auto span = internal::MakeSpan( "servicemanagement_v1::ServiceManagerConnection::ListServiceRollouts"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListServiceRollouts(std::move(request)); return internal::MakeTracedStreamRange< google::api::servicemanagement::v1::Rollout>(std::move(span), @@ -150,7 +150,7 @@ ServiceManagerTracingConnection::CreateServiceRollout( request) { auto span = internal::MakeSpan( "servicemanagement_v1::ServiceManagerConnection::CreateServiceRollout"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateServiceRollout(request)); } diff --git a/google/cloud/servicemanagement/v1/internal/service_manager_tracing_stub.cc b/google/cloud/servicemanagement/v1/internal/service_manager_tracing_stub.cc index 8bf6e2dfe2dd..af918927bc89 100644 --- a/google/cloud/servicemanagement/v1/internal/service_manager_tracing_stub.cc +++ b/google/cloud/servicemanagement/v1/internal/service_manager_tracing_stub.cc @@ -61,10 +61,8 @@ ServiceManagerTracingStub::AsyncCreateService( google::api::servicemanagement::v1::CreateServiceRequest const& request) { auto span = internal::MakeSpanGrpc( "google.api.servicemanagement.v1.ServiceManager", "CreateService"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateService(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -76,10 +74,8 @@ ServiceManagerTracingStub::AsyncDeleteService( google::api::servicemanagement::v1::DeleteServiceRequest const& request) { auto span = internal::MakeSpanGrpc( "google.api.servicemanagement.v1.ServiceManager", "DeleteService"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteService(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -91,10 +87,8 @@ ServiceManagerTracingStub::AsyncUndeleteService( google::api::servicemanagement::v1::UndeleteServiceRequest const& request) { auto span = internal::MakeSpanGrpc( "google.api.servicemanagement.v1.ServiceManager", "UndeleteService"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUndeleteService(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -144,10 +138,8 @@ ServiceManagerTracingStub::AsyncSubmitConfigSource( request) { auto span = internal::MakeSpanGrpc( "google.api.servicemanagement.v1.ServiceManager", "SubmitConfigSource"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncSubmitConfigSource(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -186,10 +178,8 @@ ServiceManagerTracingStub::AsyncCreateServiceRollout( request) { auto span = internal::MakeSpanGrpc( "google.api.servicemanagement.v1.ServiceManager", "CreateServiceRollout"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateServiceRollout(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -214,10 +204,8 @@ ServiceManagerTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -228,10 +216,8 @@ future ServiceManagerTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/serviceusage/v1/internal/service_usage_tracing_connection.cc b/google/cloud/serviceusage/v1/internal/service_usage_tracing_connection.cc index ec389e9a5422..0d126efea290 100644 --- a/google/cloud/serviceusage/v1/internal/service_usage_tracing_connection.cc +++ b/google/cloud/serviceusage/v1/internal/service_usage_tracing_connection.cc @@ -37,7 +37,7 @@ ServiceUsageTracingConnection::EnableService( google::api::serviceusage::v1::EnableServiceRequest const& request) { auto span = internal::MakeSpan( "serviceusage_v1::ServiceUsageConnection::EnableService"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->EnableService(request)); } @@ -46,7 +46,7 @@ ServiceUsageTracingConnection::DisableService( google::api::serviceusage::v1::DisableServiceRequest const& request) { auto span = internal::MakeSpan( "serviceusage_v1::ServiceUsageConnection::DisableService"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DisableService(request)); } @@ -64,7 +64,7 @@ ServiceUsageTracingConnection::ListServices( google::api::serviceusage::v1::ListServicesRequest request) { auto span = internal::MakeSpan( "serviceusage_v1::ServiceUsageConnection::ListServices"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListServices(std::move(request)); return internal::MakeTracedStreamRange< google::api::serviceusage::v1::Service>(std::move(span), std::move(sr)); @@ -75,7 +75,7 @@ ServiceUsageTracingConnection::BatchEnableServices( google::api::serviceusage::v1::BatchEnableServicesRequest const& request) { auto span = internal::MakeSpan( "serviceusage_v1::ServiceUsageConnection::BatchEnableServices"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->BatchEnableServices(request)); } diff --git a/google/cloud/serviceusage/v1/internal/service_usage_tracing_stub.cc b/google/cloud/serviceusage/v1/internal/service_usage_tracing_stub.cc index 5c5f104160c2..9b04e624aa6b 100644 --- a/google/cloud/serviceusage/v1/internal/service_usage_tracing_stub.cc +++ b/google/cloud/serviceusage/v1/internal/service_usage_tracing_stub.cc @@ -37,10 +37,8 @@ ServiceUsageTracingStub::AsyncEnableService( google::api::serviceusage::v1::EnableServiceRequest const& request) { auto span = internal::MakeSpanGrpc("google.api.serviceusage.v1.ServiceUsage", "EnableService"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncEnableService(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -52,10 +50,8 @@ ServiceUsageTracingStub::AsyncDisableService( google::api::serviceusage::v1::DisableServiceRequest const& request) { auto span = internal::MakeSpanGrpc("google.api.serviceusage.v1.ServiceUsage", "DisableService"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDisableService(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -91,10 +87,8 @@ ServiceUsageTracingStub::AsyncBatchEnableServices( google::api::serviceusage::v1::BatchEnableServicesRequest const& request) { auto span = internal::MakeSpanGrpc("google.api.serviceusage.v1.ServiceUsage", "BatchEnableServices"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncBatchEnableServices(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -118,10 +112,8 @@ ServiceUsageTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -132,10 +124,8 @@ future ServiceUsageTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/shell/v1/internal/cloud_shell_tracing_connection.cc b/google/cloud/shell/v1/internal/cloud_shell_tracing_connection.cc index 7200762160ea..fcbf0813f288 100644 --- a/google/cloud/shell/v1/internal/cloud_shell_tracing_connection.cc +++ b/google/cloud/shell/v1/internal/cloud_shell_tracing_connection.cc @@ -45,7 +45,7 @@ CloudShellServiceTracingConnection::StartEnvironment( google::cloud::shell::v1::StartEnvironmentRequest const& request) { auto span = internal::MakeSpan( "shell_v1::CloudShellServiceConnection::StartEnvironment"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->StartEnvironment(request)); } @@ -54,7 +54,7 @@ CloudShellServiceTracingConnection::AuthorizeEnvironment( google::cloud::shell::v1::AuthorizeEnvironmentRequest const& request) { auto span = internal::MakeSpan( "shell_v1::CloudShellServiceConnection::AuthorizeEnvironment"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->AuthorizeEnvironment(request)); } @@ -64,7 +64,7 @@ CloudShellServiceTracingConnection::AddPublicKey( google::cloud::shell::v1::AddPublicKeyRequest const& request) { auto span = internal::MakeSpan("shell_v1::CloudShellServiceConnection::AddPublicKey"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->AddPublicKey(request)); } @@ -73,7 +73,7 @@ CloudShellServiceTracingConnection::RemovePublicKey( google::cloud::shell::v1::RemovePublicKeyRequest const& request) { auto span = internal::MakeSpan( "shell_v1::CloudShellServiceConnection::RemovePublicKey"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RemovePublicKey(request)); } diff --git a/google/cloud/shell/v1/internal/cloud_shell_tracing_stub.cc b/google/cloud/shell/v1/internal/cloud_shell_tracing_stub.cc index 03978485c675..7742819e93bd 100644 --- a/google/cloud/shell/v1/internal/cloud_shell_tracing_stub.cc +++ b/google/cloud/shell/v1/internal/cloud_shell_tracing_stub.cc @@ -49,10 +49,8 @@ CloudShellServiceTracingStub::AsyncStartEnvironment( google::cloud::shell::v1::StartEnvironmentRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.shell.v1.CloudShellService", "StartEnvironment"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncStartEnvironment(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -64,10 +62,8 @@ CloudShellServiceTracingStub::AsyncAuthorizeEnvironment( google::cloud::shell::v1::AuthorizeEnvironmentRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.shell.v1.CloudShellService", "AuthorizeEnvironment"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncAuthorizeEnvironment(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -79,10 +75,8 @@ CloudShellServiceTracingStub::AsyncAddPublicKey( google::cloud::shell::v1::AddPublicKeyRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.shell.v1.CloudShellService", "AddPublicKey"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncAddPublicKey(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -94,10 +88,8 @@ CloudShellServiceTracingStub::AsyncRemovePublicKey( google::cloud::shell::v1::RemovePublicKeyRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.shell.v1.CloudShellService", "RemovePublicKey"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncRemovePublicKey(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -109,10 +101,8 @@ CloudShellServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -123,10 +113,8 @@ future CloudShellServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/spanner/admin/internal/database_admin_tracing_connection.cc b/google/cloud/spanner/admin/internal/database_admin_tracing_connection.cc index d4e500613c8b..191fa43dcf97 100644 --- a/google/cloud/spanner/admin/internal/database_admin_tracing_connection.cc +++ b/google/cloud/spanner/admin/internal/database_admin_tracing_connection.cc @@ -37,7 +37,7 @@ DatabaseAdminTracingConnection::ListDatabases( google::spanner::admin::database::v1::ListDatabasesRequest request) { auto span = internal::MakeSpan( "spanner_admin::DatabaseAdminConnection::ListDatabases"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListDatabases(std::move(request)); return internal::MakeTracedStreamRange< google::spanner::admin::database::v1::Database>(std::move(span), @@ -50,7 +50,7 @@ DatabaseAdminTracingConnection::CreateDatabase( request) { auto span = internal::MakeSpan( "spanner_admin::DatabaseAdminConnection::CreateDatabase"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateDatabase(request)); } @@ -69,7 +69,7 @@ DatabaseAdminTracingConnection::UpdateDatabase( request) { auto span = internal::MakeSpan( "spanner_admin::DatabaseAdminConnection::UpdateDatabase"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateDatabase(request)); } @@ -80,7 +80,7 @@ DatabaseAdminTracingConnection::UpdateDatabaseDdl( request) { auto span = internal::MakeSpan( "spanner_admin::DatabaseAdminConnection::UpdateDatabaseDdl"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateDatabaseDdl(request)); } @@ -132,7 +132,7 @@ DatabaseAdminTracingConnection::CreateBackup( google::spanner::admin::database::v1::CreateBackupRequest const& request) { auto span = internal::MakeSpan( "spanner_admin::DatabaseAdminConnection::CreateBackup"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateBackup(request)); } @@ -141,7 +141,7 @@ DatabaseAdminTracingConnection::CopyBackup( google::spanner::admin::database::v1::CopyBackupRequest const& request) { auto span = internal::MakeSpan("spanner_admin::DatabaseAdminConnection::CopyBackup"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CopyBackup(request)); } @@ -176,7 +176,7 @@ DatabaseAdminTracingConnection::ListBackups( google::spanner::admin::database::v1::ListBackupsRequest request) { auto span = internal::MakeSpan("spanner_admin::DatabaseAdminConnection::ListBackups"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListBackups(std::move(request)); return internal::MakeTracedStreamRange< google::spanner::admin::database::v1::Backup>(std::move(span), @@ -189,7 +189,7 @@ DatabaseAdminTracingConnection::RestoreDatabase( request) { auto span = internal::MakeSpan( "spanner_admin::DatabaseAdminConnection::RestoreDatabase"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RestoreDatabase(request)); } @@ -199,7 +199,7 @@ DatabaseAdminTracingConnection::ListDatabaseOperations( request) { auto span = internal::MakeSpan( "spanner_admin::DatabaseAdminConnection::ListDatabaseOperations"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListDatabaseOperations(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -210,7 +210,7 @@ DatabaseAdminTracingConnection::ListBackupOperations( google::spanner::admin::database::v1::ListBackupOperationsRequest request) { auto span = internal::MakeSpan( "spanner_admin::DatabaseAdminConnection::ListBackupOperations"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListBackupOperations(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -221,7 +221,7 @@ DatabaseAdminTracingConnection::ListDatabaseRoles( google::spanner::admin::database::v1::ListDatabaseRolesRequest request) { auto span = internal::MakeSpan( "spanner_admin::DatabaseAdminConnection::ListDatabaseRoles"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListDatabaseRoles(std::move(request)); return internal::MakeTracedStreamRange< google::spanner::admin::database::v1::DatabaseRole>(std::move(span), diff --git a/google/cloud/spanner/admin/internal/database_admin_tracing_stub.cc b/google/cloud/spanner/admin/internal/database_admin_tracing_stub.cc index e30dc73ce4ea..dd3ae43386a7 100644 --- a/google/cloud/spanner/admin/internal/database_admin_tracing_stub.cc +++ b/google/cloud/spanner/admin/internal/database_admin_tracing_stub.cc @@ -50,10 +50,8 @@ DatabaseAdminTracingStub::AsyncCreateDatabase( request) { auto span = internal::MakeSpanGrpc( "google.spanner.admin.database.v1.DatabaseAdmin", "CreateDatabase"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateDatabase(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -78,10 +76,8 @@ DatabaseAdminTracingStub::AsyncUpdateDatabase( request) { auto span = internal::MakeSpanGrpc( "google.spanner.admin.database.v1.DatabaseAdmin", "UpdateDatabase"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateDatabase(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -94,10 +90,8 @@ DatabaseAdminTracingStub::AsyncUpdateDatabaseDdl( request) { auto span = internal::MakeSpanGrpc( "google.spanner.admin.database.v1.DatabaseAdmin", "UpdateDatabaseDdl"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateDatabaseDdl(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -167,10 +161,8 @@ DatabaseAdminTracingStub::AsyncCreateBackup( google::spanner::admin::database::v1::CreateBackupRequest const& request) { auto span = internal::MakeSpanGrpc( "google.spanner.admin.database.v1.DatabaseAdmin", "CreateBackup"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateBackup(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -182,10 +174,8 @@ DatabaseAdminTracingStub::AsyncCopyBackup( google::spanner::admin::database::v1::CopyBackupRequest const& request) { auto span = internal::MakeSpanGrpc( "google.spanner.admin.database.v1.DatabaseAdmin", "CopyBackup"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCopyBackup(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -244,10 +234,8 @@ DatabaseAdminTracingStub::AsyncRestoreDatabase( request) { auto span = internal::MakeSpanGrpc( "google.spanner.admin.database.v1.DatabaseAdmin", "RestoreDatabase"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncRestoreDatabase(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -299,10 +287,8 @@ DatabaseAdminTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -313,10 +299,8 @@ future DatabaseAdminTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/spanner/admin/internal/instance_admin_tracing_connection.cc b/google/cloud/spanner/admin/internal/instance_admin_tracing_connection.cc index 537faa0bef34..56e872a481a2 100644 --- a/google/cloud/spanner/admin/internal/instance_admin_tracing_connection.cc +++ b/google/cloud/spanner/admin/internal/instance_admin_tracing_connection.cc @@ -37,7 +37,7 @@ InstanceAdminTracingConnection::ListInstanceConfigs( google::spanner::admin::instance::v1::ListInstanceConfigsRequest request) { auto span = internal::MakeSpan( "spanner_admin::InstanceAdminConnection::ListInstanceConfigs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListInstanceConfigs(std::move(request)); return internal::MakeTracedStreamRange< google::spanner::admin::instance::v1::InstanceConfig>(std::move(span), @@ -60,7 +60,7 @@ InstanceAdminTracingConnection::CreateInstanceConfig( request) { auto span = internal::MakeSpan( "spanner_admin::InstanceAdminConnection::CreateInstanceConfig"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateInstanceConfig(request)); } @@ -71,7 +71,7 @@ InstanceAdminTracingConnection::UpdateInstanceConfig( request) { auto span = internal::MakeSpan( "spanner_admin::InstanceAdminConnection::UpdateInstanceConfig"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateInstanceConfig(request)); } @@ -91,7 +91,7 @@ InstanceAdminTracingConnection::ListInstanceConfigOperations( request) { auto span = internal::MakeSpan( "spanner_admin::InstanceAdminConnection::ListInstanceConfigOperations"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListInstanceConfigOperations(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -102,7 +102,7 @@ InstanceAdminTracingConnection::ListInstances( google::spanner::admin::instance::v1::ListInstancesRequest request) { auto span = internal::MakeSpan( "spanner_admin::InstanceAdminConnection::ListInstances"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListInstances(std::move(request)); return internal::MakeTracedStreamRange< google::spanner::admin::instance::v1::Instance>(std::move(span), @@ -124,7 +124,7 @@ InstanceAdminTracingConnection::CreateInstance( request) { auto span = internal::MakeSpan( "spanner_admin::InstanceAdminConnection::CreateInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateInstance(request)); } @@ -134,7 +134,7 @@ InstanceAdminTracingConnection::UpdateInstance( request) { auto span = internal::MakeSpan( "spanner_admin::InstanceAdminConnection::UpdateInstance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateInstance(request)); } diff --git a/google/cloud/spanner/admin/internal/instance_admin_tracing_stub.cc b/google/cloud/spanner/admin/internal/instance_admin_tracing_stub.cc index ddba5701a295..286a0477af8e 100644 --- a/google/cloud/spanner/admin/internal/instance_admin_tracing_stub.cc +++ b/google/cloud/spanner/admin/internal/instance_admin_tracing_stub.cc @@ -64,10 +64,8 @@ InstanceAdminTracingStub::AsyncCreateInstanceConfig( request) { auto span = internal::MakeSpanGrpc( "google.spanner.admin.instance.v1.InstanceAdmin", "CreateInstanceConfig"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateInstanceConfig(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -80,10 +78,8 @@ InstanceAdminTracingStub::AsyncUpdateInstanceConfig( request) { auto span = internal::MakeSpanGrpc( "google.spanner.admin.instance.v1.InstanceAdmin", "UpdateInstanceConfig"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateInstanceConfig(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -147,10 +143,8 @@ InstanceAdminTracingStub::AsyncCreateInstance( request) { auto span = internal::MakeSpanGrpc( "google.spanner.admin.instance.v1.InstanceAdmin", "CreateInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -163,10 +157,8 @@ InstanceAdminTracingStub::AsyncUpdateInstance( request) { auto span = internal::MakeSpanGrpc( "google.spanner.admin.instance.v1.InstanceAdmin", "UpdateInstance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateInstance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -224,10 +216,8 @@ InstanceAdminTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -238,10 +228,8 @@ future InstanceAdminTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/spanner/internal/spanner_tracing_stub.cc b/google/cloud/spanner/internal/spanner_tracing_stub.cc index 7a0cee7aa022..73d96669b7b9 100644 --- a/google/cloud/spanner/internal/spanner_tracing_stub.cc +++ b/google/cloud/spanner/internal/spanner_tracing_stub.cc @@ -190,10 +190,8 @@ SpannerTracingStub::AsyncBatchCreateSessions( google::spanner::v1::BatchCreateSessionsRequest const& request) { auto span = internal::MakeSpanGrpc("google.spanner.v1.Spanner", "BatchCreateSessions"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncBatchCreateSessions(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -204,10 +202,8 @@ future SpannerTracingStub::AsyncDeleteSession( google::spanner::v1::DeleteSessionRequest const& request) { auto span = internal::MakeSpanGrpc("google.spanner.v1.Spanner", "DeleteSession"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteSession(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -218,10 +214,8 @@ SpannerTracingStub::AsyncExecuteSql( std::shared_ptr context, google::spanner::v1::ExecuteSqlRequest const& request) { auto span = internal::MakeSpanGrpc("google.spanner.v1.Spanner", "ExecuteSql"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncExecuteSql(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/speech/v1/internal/adaptation_tracing_connection.cc b/google/cloud/speech/v1/internal/adaptation_tracing_connection.cc index 89860374c539..f91b710ca827 100644 --- a/google/cloud/speech/v1/internal/adaptation_tracing_connection.cc +++ b/google/cloud/speech/v1/internal/adaptation_tracing_connection.cc @@ -55,7 +55,7 @@ AdaptationTracingConnection::ListPhraseSet( google::cloud::speech::v1::ListPhraseSetRequest request) { auto span = internal::MakeSpan("speech_v1::AdaptationConnection::ListPhraseSet"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListPhraseSet(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -101,7 +101,7 @@ AdaptationTracingConnection::ListCustomClasses( google::cloud::speech::v1::ListCustomClassesRequest request) { auto span = internal::MakeSpan("speech_v1::AdaptationConnection::ListCustomClasses"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListCustomClasses(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::speech::v1::CustomClass>(std::move(span), std::move(sr)); diff --git a/google/cloud/speech/v1/internal/speech_tracing_connection.cc b/google/cloud/speech/v1/internal/speech_tracing_connection.cc index 29258dfe29d2..d335a7da4185 100644 --- a/google/cloud/speech/v1/internal/speech_tracing_connection.cc +++ b/google/cloud/speech/v1/internal/speech_tracing_connection.cc @@ -44,7 +44,7 @@ SpeechTracingConnection::LongRunningRecognize( google::cloud::speech::v1::LongRunningRecognizeRequest const& request) { auto span = internal::MakeSpan("speech_v1::SpeechConnection::LongRunningRecognize"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->LongRunningRecognize(request)); } diff --git a/google/cloud/speech/v1/internal/speech_tracing_stub.cc b/google/cloud/speech/v1/internal/speech_tracing_stub.cc index 0b73f8b84ec2..ad3e93e89b30 100644 --- a/google/cloud/speech/v1/internal/speech_tracing_stub.cc +++ b/google/cloud/speech/v1/internal/speech_tracing_stub.cc @@ -48,10 +48,8 @@ SpeechTracingStub::AsyncLongRunningRecognize( google::cloud::speech::v1::LongRunningRecognizeRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.speech.v1.Speech", "LongRunningRecognize"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncLongRunningRecognize(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -63,7 +61,7 @@ SpeechTracingStub::AsyncStreamingRecognize( CompletionQueue const& cq, std::shared_ptr context) { auto span = internal::MakeSpanGrpc("google.cloud.speech.v1.Speech", "StreamingRecognize"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); internal::InjectTraceContext(*context, *propagator_); auto stream = child_->AsyncStreamingRecognize(cq, context); return std::make_uniqueAsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -93,10 +89,8 @@ future SpeechTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/speech/v2/internal/speech_tracing_connection.cc b/google/cloud/speech/v2/internal/speech_tracing_connection.cc index b94013ddbc42..8b541de39208 100644 --- a/google/cloud/speech/v2/internal/speech_tracing_connection.cc +++ b/google/cloud/speech/v2/internal/speech_tracing_connection.cc @@ -37,7 +37,7 @@ SpeechTracingConnection::CreateRecognizer( google::cloud::speech::v2::CreateRecognizerRequest const& request) { auto span = internal::MakeSpan("speech_v2::SpeechConnection::CreateRecognizer"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateRecognizer(request)); } @@ -46,7 +46,7 @@ SpeechTracingConnection::ListRecognizers( google::cloud::speech::v2::ListRecognizersRequest request) { auto span = internal::MakeSpan("speech_v2::SpeechConnection::ListRecognizers"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListRecognizers(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -65,7 +65,7 @@ SpeechTracingConnection::UpdateRecognizer( google::cloud::speech::v2::UpdateRecognizerRequest const& request) { auto span = internal::MakeSpan("speech_v2::SpeechConnection::UpdateRecognizer"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateRecognizer(request)); } @@ -74,7 +74,7 @@ SpeechTracingConnection::DeleteRecognizer( google::cloud::speech::v2::DeleteRecognizerRequest const& request) { auto span = internal::MakeSpan("speech_v2::SpeechConnection::DeleteRecognizer"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteRecognizer(request)); } @@ -83,7 +83,7 @@ SpeechTracingConnection::UndeleteRecognizer( google::cloud::speech::v2::UndeleteRecognizerRequest const& request) { auto span = internal::MakeSpan("speech_v2::SpeechConnection::UndeleteRecognizer"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UndeleteRecognizer(request)); } @@ -107,7 +107,7 @@ future> SpeechTracingConnection::BatchRecognize( google::cloud::speech::v2::BatchRecognizeRequest const& request) { auto span = internal::MakeSpan("speech_v2::SpeechConnection::BatchRecognize"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->BatchRecognize(request)); } @@ -131,7 +131,7 @@ SpeechTracingConnection::CreateCustomClass( google::cloud::speech::v2::CreateCustomClassRequest const& request) { auto span = internal::MakeSpan("speech_v2::SpeechConnection::CreateCustomClass"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateCustomClass(request)); } @@ -140,7 +140,7 @@ SpeechTracingConnection::ListCustomClasses( google::cloud::speech::v2::ListCustomClassesRequest request) { auto span = internal::MakeSpan("speech_v2::SpeechConnection::ListCustomClasses"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListCustomClasses(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::speech::v2::CustomClass>(std::move(span), std::move(sr)); @@ -159,7 +159,7 @@ SpeechTracingConnection::UpdateCustomClass( google::cloud::speech::v2::UpdateCustomClassRequest const& request) { auto span = internal::MakeSpan("speech_v2::SpeechConnection::UpdateCustomClass"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateCustomClass(request)); } @@ -168,7 +168,7 @@ SpeechTracingConnection::DeleteCustomClass( google::cloud::speech::v2::DeleteCustomClassRequest const& request) { auto span = internal::MakeSpan("speech_v2::SpeechConnection::DeleteCustomClass"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteCustomClass(request)); } @@ -177,7 +177,7 @@ SpeechTracingConnection::UndeleteCustomClass( google::cloud::speech::v2::UndeleteCustomClassRequest const& request) { auto span = internal::MakeSpan("speech_v2::SpeechConnection::UndeleteCustomClass"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UndeleteCustomClass(request)); } @@ -187,7 +187,7 @@ SpeechTracingConnection::CreatePhraseSet( google::cloud::speech::v2::CreatePhraseSetRequest const& request) { auto span = internal::MakeSpan("speech_v2::SpeechConnection::CreatePhraseSet"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreatePhraseSet(request)); } @@ -195,7 +195,7 @@ StreamRange SpeechTracingConnection::ListPhraseSets( google::cloud::speech::v2::ListPhraseSetsRequest request) { auto span = internal::MakeSpan("speech_v2::SpeechConnection::ListPhraseSets"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListPhraseSets(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -214,7 +214,7 @@ SpeechTracingConnection::UpdatePhraseSet( google::cloud::speech::v2::UpdatePhraseSetRequest const& request) { auto span = internal::MakeSpan("speech_v2::SpeechConnection::UpdatePhraseSet"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdatePhraseSet(request)); } @@ -223,7 +223,7 @@ SpeechTracingConnection::DeletePhraseSet( google::cloud::speech::v2::DeletePhraseSetRequest const& request) { auto span = internal::MakeSpan("speech_v2::SpeechConnection::DeletePhraseSet"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeletePhraseSet(request)); } @@ -232,7 +232,7 @@ SpeechTracingConnection::UndeletePhraseSet( google::cloud::speech::v2::UndeletePhraseSetRequest const& request) { auto span = internal::MakeSpan("speech_v2::SpeechConnection::UndeletePhraseSet"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UndeletePhraseSet(request)); } diff --git a/google/cloud/speech/v2/internal/speech_tracing_stub.cc b/google/cloud/speech/v2/internal/speech_tracing_stub.cc index ca9651f358e0..ab93463f4c22 100644 --- a/google/cloud/speech/v2/internal/speech_tracing_stub.cc +++ b/google/cloud/speech/v2/internal/speech_tracing_stub.cc @@ -37,10 +37,8 @@ SpeechTracingStub::AsyncCreateRecognizer( google::cloud::speech::v2::CreateRecognizerRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.speech.v2.Speech", "CreateRecognizer"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateRecognizer(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -76,10 +74,8 @@ SpeechTracingStub::AsyncUpdateRecognizer( google::cloud::speech::v2::UpdateRecognizerRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.speech.v2.Speech", "UpdateRecognizer"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateRecognizer(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -91,10 +87,8 @@ SpeechTracingStub::AsyncDeleteRecognizer( google::cloud::speech::v2::DeleteRecognizerRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.speech.v2.Speech", "DeleteRecognizer"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteRecognizer(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -106,10 +100,8 @@ SpeechTracingStub::AsyncUndeleteRecognizer( google::cloud::speech::v2::UndeleteRecognizerRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.speech.v2.Speech", "UndeleteRecognizer"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUndeleteRecognizer(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -132,7 +124,7 @@ SpeechTracingStub::AsyncStreamingRecognize( CompletionQueue const& cq, std::shared_ptr context) { auto span = internal::MakeSpanGrpc("google.cloud.speech.v2.Speech", "StreamingRecognize"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); internal::InjectTraceContext(*context, *propagator_); auto stream = child_->AsyncStreamingRecognize(cq, context); return std::make_uniqueAsyncBatchRecognize(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -184,10 +174,8 @@ SpeechTracingStub::AsyncCreateCustomClass( google::cloud::speech::v2::CreateCustomClassRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.speech.v2.Speech", "CreateCustomClass"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateCustomClass(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -223,10 +211,8 @@ SpeechTracingStub::AsyncUpdateCustomClass( google::cloud::speech::v2::UpdateCustomClassRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.speech.v2.Speech", "UpdateCustomClass"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateCustomClass(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -238,10 +224,8 @@ SpeechTracingStub::AsyncDeleteCustomClass( google::cloud::speech::v2::DeleteCustomClassRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.speech.v2.Speech", "DeleteCustomClass"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteCustomClass(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -253,10 +237,8 @@ SpeechTracingStub::AsyncUndeleteCustomClass( google::cloud::speech::v2::UndeleteCustomClassRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.speech.v2.Speech", "UndeleteCustomClass"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUndeleteCustomClass(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -268,10 +250,8 @@ SpeechTracingStub::AsyncCreatePhraseSet( google::cloud::speech::v2::CreatePhraseSetRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.speech.v2.Speech", "CreatePhraseSet"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreatePhraseSet(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -306,10 +286,8 @@ SpeechTracingStub::AsyncUpdatePhraseSet( google::cloud::speech::v2::UpdatePhraseSetRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.speech.v2.Speech", "UpdatePhraseSet"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdatePhraseSet(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -321,10 +299,8 @@ SpeechTracingStub::AsyncDeletePhraseSet( google::cloud::speech::v2::DeletePhraseSetRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.speech.v2.Speech", "DeletePhraseSet"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeletePhraseSet(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -336,10 +312,8 @@ SpeechTracingStub::AsyncUndeletePhraseSet( google::cloud::speech::v2::UndeletePhraseSetRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.speech.v2.Speech", "UndeletePhraseSet"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUndeletePhraseSet(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -351,10 +325,8 @@ SpeechTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -365,10 +337,8 @@ future SpeechTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/sql/v1/internal/sql_instances_tracing_connection.cc b/google/cloud/sql/v1/internal/sql_instances_tracing_connection.cc index 3bf9981260cc..5da9817be085 100644 --- a/google/cloud/sql/v1/internal/sql_instances_tracing_connection.cc +++ b/google/cloud/sql/v1/internal/sql_instances_tracing_connection.cc @@ -125,7 +125,7 @@ StreamRange SqlInstancesServiceTracingConnection::List( google::cloud::sql::v1::SqlInstancesListRequest request) { auto span = internal::MakeSpan("sql_v1::SqlInstancesServiceConnection::List"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->List(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::sql::v1::DatabaseInstance>(std::move(span), std::move(sr)); diff --git a/google/cloud/sql/v1/internal/sql_operations_tracing_connection.cc b/google/cloud/sql/v1/internal/sql_operations_tracing_connection.cc index 84b00baf8901..6aa45a073898 100644 --- a/google/cloud/sql/v1/internal/sql_operations_tracing_connection.cc +++ b/google/cloud/sql/v1/internal/sql_operations_tracing_connection.cc @@ -45,7 +45,7 @@ SqlOperationsServiceTracingConnection::List( google::cloud::sql::v1::SqlOperationsListRequest request) { auto span = internal::MakeSpan("sql_v1::SqlOperationsServiceConnection::List"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->List(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); diff --git a/google/cloud/storage/internal/storage_tracing_stub.cc b/google/cloud/storage/internal/storage_tracing_stub.cc index 1ad3d59cfbab..a71371a4045a 100644 --- a/google/cloud/storage/internal/storage_tracing_stub.cc +++ b/google/cloud/storage/internal/storage_tracing_stub.cc @@ -282,7 +282,7 @@ StorageTracingStub::AsyncBidiWriteObject( CompletionQueue const& cq, std::shared_ptr context) { auto span = internal::MakeSpanGrpc("google.storage.v2.Storage", "BidiWriteObject"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); internal::InjectTraceContext(*context, *propagator_); auto stream = child_->AsyncBidiWriteObject(cq, context); return std::make_uniqueAsyncComposeObject(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -429,10 +427,8 @@ future StorageTracingStub::AsyncDeleteObject( google::storage::v2::DeleteObjectRequest const& request) { auto span = internal::MakeSpanGrpc("google.storage.v2.Storage", "DeleteObject"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteObject(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -444,7 +440,7 @@ StorageTracingStub::AsyncReadObject( std::shared_ptr context, google::storage::v2::ReadObjectRequest const& request) { auto span = internal::MakeSpanGrpc("google.storage.v2.Storage", "ReadObject"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); internal::InjectTraceContext(*context, *propagator_); auto stream = child_->AsyncReadObject(cq, context, request); return std::make_unique context) { auto span = internal::MakeSpanGrpc("google.storage.v2.Storage", "WriteObject"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); internal::InjectTraceContext(*context, *propagator_); auto stream = child_->AsyncWriteObject(cq, context); return std::make_uniqueAsyncStartResumableWrite(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -491,10 +485,8 @@ StorageTracingStub::AsyncQueryWriteStatus( google::storage::v2::QueryWriteStatusRequest const& request) { auto span = internal::MakeSpanGrpc("google.storage.v2.Storage", "QueryWriteStatus"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncQueryWriteStatus(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/storageinsights/v1/internal/storage_insights_tracing_connection.cc b/google/cloud/storageinsights/v1/internal/storage_insights_tracing_connection.cc index e18b322de53a..d553c2e8c914 100644 --- a/google/cloud/storageinsights/v1/internal/storage_insights_tracing_connection.cc +++ b/google/cloud/storageinsights/v1/internal/storage_insights_tracing_connection.cc @@ -37,7 +37,7 @@ StorageInsightsTracingConnection::ListReportConfigs( google::cloud::storageinsights::v1::ListReportConfigsRequest request) { auto span = internal::MakeSpan( "storageinsights_v1::StorageInsightsConnection::ListReportConfigs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListReportConfigs(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::storageinsights::v1::ReportConfig>(std::move(span), @@ -87,7 +87,7 @@ StorageInsightsTracingConnection::ListReportDetails( google::cloud::storageinsights::v1::ListReportDetailsRequest request) { auto span = internal::MakeSpan( "storageinsights_v1::StorageInsightsConnection::ListReportDetails"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListReportDetails(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::storageinsights::v1::ReportDetail>(std::move(span), diff --git a/google/cloud/storagetransfer/v1/internal/storage_transfer_tracing_connection.cc b/google/cloud/storagetransfer/v1/internal/storage_transfer_tracing_connection.cc index d5dadc191233..bea18e655e01 100644 --- a/google/cloud/storagetransfer/v1/internal/storage_transfer_tracing_connection.cc +++ b/google/cloud/storagetransfer/v1/internal/storage_transfer_tracing_connection.cc @@ -79,7 +79,7 @@ StorageTransferServiceTracingConnection::ListTransferJobs( google::storagetransfer::v1::ListTransferJobsRequest request) { auto span = internal::MakeSpan( "storagetransfer_v1::StorageTransferServiceConnection::ListTransferJobs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListTransferJobs(std::move(request)); return internal::MakeTracedStreamRange< google::storagetransfer::v1::TransferJob>(std::move(span), std::move(sr)); @@ -109,7 +109,7 @@ StorageTransferServiceTracingConnection::RunTransferJob( google::storagetransfer::v1::RunTransferJobRequest const& request) { auto span = internal::MakeSpan( "storagetransfer_v1::StorageTransferServiceConnection::RunTransferJob"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RunTransferJob(request)); } @@ -154,7 +154,7 @@ StorageTransferServiceTracingConnection::ListAgentPools( google::storagetransfer::v1::ListAgentPoolsRequest request) { auto span = internal::MakeSpan( "storagetransfer_v1::StorageTransferServiceConnection::ListAgentPools"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListAgentPools(std::move(request)); return internal::MakeTracedStreamRange< google::storagetransfer::v1::AgentPool>(std::move(span), std::move(sr)); diff --git a/google/cloud/storagetransfer/v1/internal/storage_transfer_tracing_stub.cc b/google/cloud/storagetransfer/v1/internal/storage_transfer_tracing_stub.cc index 91988dbf6dee..4506f9d4836f 100644 --- a/google/cloud/storagetransfer/v1/internal/storage_transfer_tracing_stub.cc +++ b/google/cloud/storagetransfer/v1/internal/storage_transfer_tracing_stub.cc @@ -124,10 +124,8 @@ StorageTransferServiceTracingStub::AsyncRunTransferJob( google::storagetransfer::v1::RunTransferJobRequest const& request) { auto span = internal::MakeSpanGrpc( "google.storagetransfer.v1.StorageTransferService", "RunTransferJob"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncRunTransferJob(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -209,10 +207,8 @@ StorageTransferServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -223,10 +219,8 @@ future StorageTransferServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/support/v2/internal/case_attachment_tracing_connection.cc b/google/cloud/support/v2/internal/case_attachment_tracing_connection.cc index 1e94a7221df0..b28fdfc9cb19 100644 --- a/google/cloud/support/v2/internal/case_attachment_tracing_connection.cc +++ b/google/cloud/support/v2/internal/case_attachment_tracing_connection.cc @@ -37,7 +37,7 @@ CaseAttachmentServiceTracingConnection::ListAttachments( google::cloud::support::v2::ListAttachmentsRequest request) { auto span = internal::MakeSpan( "support_v2::CaseAttachmentServiceConnection::ListAttachments"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListAttachments(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::support::v2::Attachment>(std::move(span), std::move(sr)); diff --git a/google/cloud/support/v2/internal/case_tracing_connection.cc b/google/cloud/support/v2/internal/case_tracing_connection.cc index 031e1a1f9e3d..949dcafc4d40 100644 --- a/google/cloud/support/v2/internal/case_tracing_connection.cc +++ b/google/cloud/support/v2/internal/case_tracing_connection.cc @@ -45,7 +45,7 @@ CaseServiceTracingConnection::ListCases( google::cloud::support::v2::ListCasesRequest request) { auto span = internal::MakeSpan("support_v2::CaseServiceConnection::ListCases"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListCases(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -56,7 +56,7 @@ CaseServiceTracingConnection::SearchCases( google::cloud::support::v2::SearchCasesRequest request) { auto span = internal::MakeSpan("support_v2::CaseServiceConnection::SearchCases"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->SearchCases(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -103,7 +103,7 @@ CaseServiceTracingConnection::SearchCaseClassifications( google::cloud::support::v2::SearchCaseClassificationsRequest request) { auto span = internal::MakeSpan( "support_v2::CaseServiceConnection::SearchCaseClassifications"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->SearchCaseClassifications(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::support::v2::CaseClassification>(std::move(span), diff --git a/google/cloud/support/v2/internal/comment_tracing_connection.cc b/google/cloud/support/v2/internal/comment_tracing_connection.cc index cd5ef9b06b1f..d4f639d24b64 100644 --- a/google/cloud/support/v2/internal/comment_tracing_connection.cc +++ b/google/cloud/support/v2/internal/comment_tracing_connection.cc @@ -37,7 +37,7 @@ CommentServiceTracingConnection::ListComments( google::cloud::support::v2::ListCommentsRequest request) { auto span = internal::MakeSpan("support_v2::CommentServiceConnection::ListComments"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListComments(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); diff --git a/google/cloud/talent/v4/internal/company_tracing_connection.cc b/google/cloud/talent/v4/internal/company_tracing_connection.cc index b31bc2b96f94..a7d85fed8766 100644 --- a/google/cloud/talent/v4/internal/company_tracing_connection.cc +++ b/google/cloud/talent/v4/internal/company_tracing_connection.cc @@ -72,7 +72,7 @@ CompanyServiceTracingConnection::ListCompanies( google::cloud::talent::v4::ListCompaniesRequest request) { auto span = internal::MakeSpan("talent_v4::CompanyServiceConnection::ListCompanies"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListCompanies(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); diff --git a/google/cloud/talent/v4/internal/job_tracing_connection.cc b/google/cloud/talent/v4/internal/job_tracing_connection.cc index c0130985bff7..b1ab8fdd9ca8 100644 --- a/google/cloud/talent/v4/internal/job_tracing_connection.cc +++ b/google/cloud/talent/v4/internal/job_tracing_connection.cc @@ -44,7 +44,7 @@ JobServiceTracingConnection::BatchCreateJobs( google::cloud::talent::v4::BatchCreateJobsRequest const& request) { auto span = internal::MakeSpan("talent_v4::JobServiceConnection::BatchCreateJobs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->BatchCreateJobs(request)); } @@ -67,7 +67,7 @@ JobServiceTracingConnection::BatchUpdateJobs( google::cloud::talent::v4::BatchUpdateJobsRequest const& request) { auto span = internal::MakeSpan("talent_v4::JobServiceConnection::BatchUpdateJobs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->BatchUpdateJobs(request)); } @@ -83,7 +83,7 @@ JobServiceTracingConnection::BatchDeleteJobs( google::cloud::talent::v4::BatchDeleteJobsRequest const& request) { auto span = internal::MakeSpan("talent_v4::JobServiceConnection::BatchDeleteJobs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->BatchDeleteJobs(request)); } @@ -91,7 +91,7 @@ StreamRange JobServiceTracingConnection::ListJobs( google::cloud::talent::v4::ListJobsRequest request) { auto span = internal::MakeSpan("talent_v4::JobServiceConnection::ListJobs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListJobs(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); diff --git a/google/cloud/talent/v4/internal/job_tracing_stub.cc b/google/cloud/talent/v4/internal/job_tracing_stub.cc index e0c0eff18adf..75f3880f8e14 100644 --- a/google/cloud/talent/v4/internal/job_tracing_stub.cc +++ b/google/cloud/talent/v4/internal/job_tracing_stub.cc @@ -47,10 +47,8 @@ JobServiceTracingStub::AsyncBatchCreateJobs( google::cloud::talent::v4::BatchCreateJobsRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.talent.v4.JobService", "BatchCreateJobs"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncBatchCreateJobs(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -82,10 +80,8 @@ JobServiceTracingStub::AsyncBatchUpdateJobs( google::cloud::talent::v4::BatchUpdateJobsRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.talent.v4.JobService", "BatchUpdateJobs"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncBatchUpdateJobs(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -107,10 +103,8 @@ JobServiceTracingStub::AsyncBatchDeleteJobs( google::cloud::talent::v4::BatchDeleteJobsRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.talent.v4.JobService", "BatchDeleteJobs"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncBatchDeleteJobs(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -157,10 +151,8 @@ JobServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -171,10 +163,8 @@ future JobServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/talent/v4/internal/tenant_tracing_connection.cc b/google/cloud/talent/v4/internal/tenant_tracing_connection.cc index c645e9cbb1be..716f0b56d3b0 100644 --- a/google/cloud/talent/v4/internal/tenant_tracing_connection.cc +++ b/google/cloud/talent/v4/internal/tenant_tracing_connection.cc @@ -72,7 +72,7 @@ TenantServiceTracingConnection::ListTenants( google::cloud::talent::v4::ListTenantsRequest request) { auto span = internal::MakeSpan("talent_v4::TenantServiceConnection::ListTenants"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListTenants(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); diff --git a/google/cloud/tasks/v2/internal/cloud_tasks_tracing_connection.cc b/google/cloud/tasks/v2/internal/cloud_tasks_tracing_connection.cc index 2b525334c6c6..0b4ccf2be337 100644 --- a/google/cloud/tasks/v2/internal/cloud_tasks_tracing_connection.cc +++ b/google/cloud/tasks/v2/internal/cloud_tasks_tracing_connection.cc @@ -36,7 +36,7 @@ StreamRange CloudTasksTracingConnection::ListQueues( google::cloud::tasks::v2::ListQueuesRequest request) { auto span = internal::MakeSpan("tasks_v2::CloudTasksConnection::ListQueues"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListQueues(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -125,7 +125,7 @@ StreamRange CloudTasksTracingConnection::ListTasks( google::cloud::tasks::v2::ListTasksRequest request) { auto span = internal::MakeSpan("tasks_v2::CloudTasksConnection::ListTasks"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListTasks(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); diff --git a/google/cloud/testing_util/opentelemetry_matchers.cc b/google/cloud/testing_util/opentelemetry_matchers.cc index 6fd5a40ad4f1..3e7c89f0ef65 100644 --- a/google/cloud/testing_util/opentelemetry_matchers.cc +++ b/google/cloud/testing_util/opentelemetry_matchers.cc @@ -15,6 +15,7 @@ #ifdef GOOGLE_CLOUD_CPP_HAVE_OPENTELEMETRY #include "google/cloud/testing_util/opentelemetry_matchers.h" #include "google/cloud/internal/absl_str_join_quiet.h" +#include "google/cloud/internal/opentelemetry_context.h" #include "google/cloud/opentelemetry_options.h" #include #include @@ -176,6 +177,12 @@ bool ThereIsAnActiveSpan() { return opentelemetry::trace::Tracer::GetCurrentSpan()->GetContext().IsValid(); } +bool OTelContextCaptured() { + if (internal::CurrentOTelContext().empty()) return false; + return internal::CurrentOTelContext().back() == + opentelemetry::context::RuntimeContext::GetCurrent(); +} + SpanCatcher::SpanCatcher() : previous_(opentelemetry::trace::Provider::GetTracerProvider()) { auto exporter = diff --git a/google/cloud/testing_util/opentelemetry_matchers.h b/google/cloud/testing_util/opentelemetry_matchers.h index 70762fd2275f..c71c45fa8620 100644 --- a/google/cloud/testing_util/opentelemetry_matchers.h +++ b/google/cloud/testing_util/opentelemetry_matchers.h @@ -88,8 +88,18 @@ std::string ToString(opentelemetry::trace::SpanContext const& span_context); std::string ToString(opentelemetry::trace::SpanId span_id); +// Returns true if there is an active span, as tracked by opentelemetry-cpp. bool ThereIsAnActiveSpan(); +/** + * Returns true if the current context, as tracked by opentelemetry-cpp, matches + * the current context, as tracked by google-cloud-cpp. + * + * This duplication is necessary for operations that might complete in a + * different thread than they are created. + */ +bool OTelContextCaptured(); + /** * Note that all spans created by a `NoopTracerProvider` will compare equal. To * avoid this, ensure that a trace exporter is set by the test fixture, e.g. by diff --git a/google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_tracing_connection.cc b/google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_tracing_connection.cc index 620e32e2abd1..466756441b85 100644 --- a/google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_tracing_connection.cc +++ b/google/cloud/timeseriesinsights/v1/internal/timeseries_insights_controller_tracing_connection.cc @@ -41,7 +41,7 @@ TimeseriesInsightsControllerTracingConnection::ListDataSets( auto span = internal::MakeSpan( "timeseriesinsights_v1::TimeseriesInsightsControllerConnection::" "ListDataSets"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListDataSets(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::timeseriesinsights::v1::DataSet>(std::move(span), diff --git a/google/cloud/tpu/v1/internal/tpu_tracing_connection.cc b/google/cloud/tpu/v1/internal/tpu_tracing_connection.cc index ba3534cc3542..e771d2826b8f 100644 --- a/google/cloud/tpu/v1/internal/tpu_tracing_connection.cc +++ b/google/cloud/tpu/v1/internal/tpu_tracing_connection.cc @@ -35,7 +35,7 @@ TpuTracingConnection::TpuTracingConnection( StreamRange TpuTracingConnection::ListNodes( google::cloud::tpu::v1::ListNodesRequest request) { auto span = internal::MakeSpan("tpu_v1::TpuConnection::ListNodes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListNodes(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -51,14 +51,14 @@ StatusOr TpuTracingConnection::GetNode( future> TpuTracingConnection::CreateNode( google::cloud::tpu::v1::CreateNodeRequest const& request) { auto span = internal::MakeSpan("tpu_v1::TpuConnection::CreateNode"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateNode(request)); } future> TpuTracingConnection::DeleteNode( google::cloud::tpu::v1::DeleteNodeRequest const& request) { auto span = internal::MakeSpan("tpu_v1::TpuConnection::DeleteNode"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteNode(request)); } @@ -66,21 +66,21 @@ future> TpuTracingConnection::ReimageNode( google::cloud::tpu::v1::ReimageNodeRequest const& request) { auto span = internal::MakeSpan("tpu_v1::TpuConnection::ReimageNode"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ReimageNode(request)); } future> TpuTracingConnection::StopNode( google::cloud::tpu::v1::StopNodeRequest const& request) { auto span = internal::MakeSpan("tpu_v1::TpuConnection::StopNode"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->StopNode(request)); } future> TpuTracingConnection::StartNode( google::cloud::tpu::v1::StartNodeRequest const& request) { auto span = internal::MakeSpan("tpu_v1::TpuConnection::StartNode"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->StartNode(request)); } @@ -89,7 +89,7 @@ TpuTracingConnection::ListTensorFlowVersions( google::cloud::tpu::v1::ListTensorFlowVersionsRequest request) { auto span = internal::MakeSpan("tpu_v1::TpuConnection::ListTensorFlowVersions"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListTensorFlowVersions(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::tpu::v1::TensorFlowVersion>(std::move(span), @@ -108,7 +108,7 @@ StreamRange TpuTracingConnection::ListAcceleratorTypes( google::cloud::tpu::v1::ListAcceleratorTypesRequest request) { auto span = internal::MakeSpan("tpu_v1::TpuConnection::ListAcceleratorTypes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListAcceleratorTypes(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::tpu::v1::AcceleratorType>(std::move(span), std::move(sr)); diff --git a/google/cloud/tpu/v1/internal/tpu_tracing_stub.cc b/google/cloud/tpu/v1/internal/tpu_tracing_stub.cc index 0a5210e4e96f..c17e8f482c81 100644 --- a/google/cloud/tpu/v1/internal/tpu_tracing_stub.cc +++ b/google/cloud/tpu/v1/internal/tpu_tracing_stub.cc @@ -53,10 +53,8 @@ TpuTracingStub::AsyncCreateNode( std::shared_ptr context, google::cloud::tpu::v1::CreateNodeRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.tpu.v1.Tpu", "CreateNode"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateNode(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -67,10 +65,8 @@ TpuTracingStub::AsyncDeleteNode( std::shared_ptr context, google::cloud::tpu::v1::DeleteNodeRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.tpu.v1.Tpu", "DeleteNode"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteNode(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -81,10 +77,8 @@ TpuTracingStub::AsyncReimageNode( std::shared_ptr context, google::cloud::tpu::v1::ReimageNodeRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.tpu.v1.Tpu", "ReimageNode"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncReimageNode(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -94,10 +88,8 @@ future> TpuTracingStub::AsyncStopNode( std::shared_ptr context, google::cloud::tpu::v1::StopNodeRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.tpu.v1.Tpu", "StopNode"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncStopNode(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -107,10 +99,8 @@ future> TpuTracingStub::AsyncStartNode( std::shared_ptr context, google::cloud::tpu::v1::StartNodeRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.tpu.v1.Tpu", "StartNode"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncStartNode(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -170,10 +160,8 @@ TpuTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -184,10 +172,8 @@ future TpuTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/tpu/v2/internal/tpu_tracing_connection.cc b/google/cloud/tpu/v2/internal/tpu_tracing_connection.cc index 73a808928392..f9d524aac579 100644 --- a/google/cloud/tpu/v2/internal/tpu_tracing_connection.cc +++ b/google/cloud/tpu/v2/internal/tpu_tracing_connection.cc @@ -35,7 +35,7 @@ TpuTracingConnection::TpuTracingConnection( StreamRange TpuTracingConnection::ListNodes( google::cloud::tpu::v2::ListNodesRequest request) { auto span = internal::MakeSpan("tpu_v2::TpuConnection::ListNodes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListNodes(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -51,7 +51,7 @@ StatusOr TpuTracingConnection::GetNode( future> TpuTracingConnection::CreateNode( google::cloud::tpu::v2::CreateNodeRequest const& request) { auto span = internal::MakeSpan("tpu_v2::TpuConnection::CreateNode"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateNode(request)); } @@ -59,28 +59,28 @@ future> TpuTracingConnection::DeleteNode( google::cloud::tpu::v2::DeleteNodeRequest const& request) { auto span = internal::MakeSpan("tpu_v2::TpuConnection::DeleteNode"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteNode(request)); } future> TpuTracingConnection::StopNode( google::cloud::tpu::v2::StopNodeRequest const& request) { auto span = internal::MakeSpan("tpu_v2::TpuConnection::StopNode"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->StopNode(request)); } future> TpuTracingConnection::StartNode( google::cloud::tpu::v2::StartNodeRequest const& request) { auto span = internal::MakeSpan("tpu_v2::TpuConnection::StartNode"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->StartNode(request)); } future> TpuTracingConnection::UpdateNode( google::cloud::tpu::v2::UpdateNodeRequest const& request) { auto span = internal::MakeSpan("tpu_v2::TpuConnection::UpdateNode"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateNode(request)); } @@ -97,7 +97,7 @@ StreamRange TpuTracingConnection::ListAcceleratorTypes( google::cloud::tpu::v2::ListAcceleratorTypesRequest request) { auto span = internal::MakeSpan("tpu_v2::TpuConnection::ListAcceleratorTypes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListAcceleratorTypes(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::tpu::v2::AcceleratorType>(std::move(span), std::move(sr)); @@ -115,7 +115,7 @@ StreamRange TpuTracingConnection::ListRuntimeVersions( google::cloud::tpu::v2::ListRuntimeVersionsRequest request) { auto span = internal::MakeSpan("tpu_v2::TpuConnection::ListRuntimeVersions"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListRuntimeVersions(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::tpu::v2::RuntimeVersion>(std::move(span), std::move(sr)); diff --git a/google/cloud/tpu/v2/internal/tpu_tracing_stub.cc b/google/cloud/tpu/v2/internal/tpu_tracing_stub.cc index a87d166d6155..d6a172328f3b 100644 --- a/google/cloud/tpu/v2/internal/tpu_tracing_stub.cc +++ b/google/cloud/tpu/v2/internal/tpu_tracing_stub.cc @@ -53,10 +53,8 @@ TpuTracingStub::AsyncCreateNode( std::shared_ptr context, google::cloud::tpu::v2::CreateNodeRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.tpu.v2.Tpu", "CreateNode"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateNode(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -67,10 +65,8 @@ TpuTracingStub::AsyncDeleteNode( std::shared_ptr context, google::cloud::tpu::v2::DeleteNodeRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.tpu.v2.Tpu", "DeleteNode"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteNode(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -80,10 +76,8 @@ future> TpuTracingStub::AsyncStopNode( std::shared_ptr context, google::cloud::tpu::v2::StopNodeRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.tpu.v2.Tpu", "StopNode"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncStopNode(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -93,10 +87,8 @@ future> TpuTracingStub::AsyncStartNode( std::shared_ptr context, google::cloud::tpu::v2::StartNodeRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.tpu.v2.Tpu", "StartNode"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncStartNode(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -107,10 +99,8 @@ TpuTracingStub::AsyncUpdateNode( std::shared_ptr context, google::cloud::tpu::v2::UpdateNodeRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.tpu.v2.Tpu", "UpdateNode"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateNode(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -194,10 +184,8 @@ TpuTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -208,10 +196,8 @@ future TpuTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/trace/v1/internal/trace_tracing_connection.cc b/google/cloud/trace/v1/internal/trace_tracing_connection.cc index 432b6af78792..4c2e9c72b20b 100644 --- a/google/cloud/trace/v1/internal/trace_tracing_connection.cc +++ b/google/cloud/trace/v1/internal/trace_tracing_connection.cc @@ -37,7 +37,7 @@ TraceServiceTracingConnection::ListTraces( google::devtools::cloudtrace::v1::ListTracesRequest request) { auto span = internal::MakeSpan("trace_v1::TraceServiceConnection::ListTraces"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListTraces(std::move(request)); return internal::MakeTracedStreamRange< google::devtools::cloudtrace::v1::Trace>(std::move(span), std::move(sr)); diff --git a/google/cloud/translate/v3/internal/translation_tracing_connection.cc b/google/cloud/translate/v3/internal/translation_tracing_connection.cc index b2580a7e661a..69ef44363197 100644 --- a/google/cloud/translate/v3/internal/translation_tracing_connection.cc +++ b/google/cloud/translate/v3/internal/translation_tracing_connection.cc @@ -74,7 +74,7 @@ TranslationServiceTracingConnection::BatchTranslateText( google::cloud::translation::v3::BatchTranslateTextRequest const& request) { auto span = internal::MakeSpan( "translate_v3::TranslationServiceConnection::BatchTranslateText"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->BatchTranslateText(request)); } @@ -85,7 +85,7 @@ TranslationServiceTracingConnection::BatchTranslateDocument( request) { auto span = internal::MakeSpan( "translate_v3::TranslationServiceConnection::BatchTranslateDocument"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->BatchTranslateDocument(request)); } @@ -95,7 +95,7 @@ TranslationServiceTracingConnection::CreateGlossary( google::cloud::translation::v3::CreateGlossaryRequest const& request) { auto span = internal::MakeSpan( "translate_v3::TranslationServiceConnection::CreateGlossary"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateGlossary(request)); } @@ -104,7 +104,7 @@ TranslationServiceTracingConnection::ListGlossaries( google::cloud::translation::v3::ListGlossariesRequest request) { auto span = internal::MakeSpan( "translate_v3::TranslationServiceConnection::ListGlossaries"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListGlossaries(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::translation::v3::Glossary>(std::move(span), std::move(sr)); @@ -124,7 +124,7 @@ TranslationServiceTracingConnection::DeleteGlossary( google::cloud::translation::v3::DeleteGlossaryRequest const& request) { auto span = internal::MakeSpan( "translate_v3::TranslationServiceConnection::DeleteGlossary"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteGlossary(request)); } diff --git a/google/cloud/translate/v3/internal/translation_tracing_stub.cc b/google/cloud/translate/v3/internal/translation_tracing_stub.cc index 2956de3e2f46..8df89becbc64 100644 --- a/google/cloud/translate/v3/internal/translation_tracing_stub.cc +++ b/google/cloud/translate/v3/internal/translation_tracing_stub.cc @@ -87,10 +87,8 @@ TranslationServiceTracingStub::AsyncBatchTranslateText( google::cloud::translation::v3::BatchTranslateTextRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.translation.v3.TranslationService", "BatchTranslateText"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncBatchTranslateText(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -104,10 +102,8 @@ TranslationServiceTracingStub::AsyncBatchTranslateDocument( auto span = internal::MakeSpanGrpc("google.cloud.translation.v3.TranslationService", "BatchTranslateDocument"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncBatchTranslateDocument(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -119,10 +115,8 @@ TranslationServiceTracingStub::AsyncCreateGlossary( google::cloud::translation::v3::CreateGlossaryRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.translation.v3.TranslationService", "CreateGlossary"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateGlossary(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -158,10 +152,8 @@ TranslationServiceTracingStub::AsyncDeleteGlossary( google::cloud::translation::v3::DeleteGlossaryRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.translation.v3.TranslationService", "DeleteGlossary"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteGlossary(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -173,10 +165,8 @@ TranslationServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -187,10 +177,8 @@ future TranslationServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/video/livestream/v1/internal/livestream_tracing_connection.cc b/google/cloud/video/livestream/v1/internal/livestream_tracing_connection.cc index fa5c642a71ab..4e75d1ce35b8 100644 --- a/google/cloud/video/livestream/v1/internal/livestream_tracing_connection.cc +++ b/google/cloud/video/livestream/v1/internal/livestream_tracing_connection.cc @@ -37,7 +37,7 @@ LivestreamServiceTracingConnection::CreateChannel( google::cloud::video::livestream::v1::CreateChannelRequest const& request) { auto span = internal::MakeSpan( "video_livestream_v1::LivestreamServiceConnection::CreateChannel"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateChannel(request)); } @@ -46,7 +46,7 @@ LivestreamServiceTracingConnection::ListChannels( google::cloud::video::livestream::v1::ListChannelsRequest request) { auto span = internal::MakeSpan( "video_livestream_v1::LivestreamServiceConnection::ListChannels"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListChannels(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::video::livestream::v1::Channel>(std::move(span), @@ -67,7 +67,7 @@ LivestreamServiceTracingConnection::DeleteChannel( google::cloud::video::livestream::v1::DeleteChannelRequest const& request) { auto span = internal::MakeSpan( "video_livestream_v1::LivestreamServiceConnection::DeleteChannel"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteChannel(request)); } @@ -76,7 +76,7 @@ LivestreamServiceTracingConnection::UpdateChannel( google::cloud::video::livestream::v1::UpdateChannelRequest const& request) { auto span = internal::MakeSpan( "video_livestream_v1::LivestreamServiceConnection::UpdateChannel"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateChannel(request)); } @@ -85,7 +85,7 @@ LivestreamServiceTracingConnection::StartChannel( google::cloud::video::livestream::v1::StartChannelRequest const& request) { auto span = internal::MakeSpan( "video_livestream_v1::LivestreamServiceConnection::StartChannel"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->StartChannel(request)); } @@ -94,7 +94,7 @@ LivestreamServiceTracingConnection::StopChannel( google::cloud::video::livestream::v1::StopChannelRequest const& request) { auto span = internal::MakeSpan( "video_livestream_v1::LivestreamServiceConnection::StopChannel"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->StopChannel(request)); } @@ -103,7 +103,7 @@ LivestreamServiceTracingConnection::CreateInput( google::cloud::video::livestream::v1::CreateInputRequest const& request) { auto span = internal::MakeSpan( "video_livestream_v1::LivestreamServiceConnection::CreateInput"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateInput(request)); } @@ -112,7 +112,7 @@ LivestreamServiceTracingConnection::ListInputs( google::cloud::video::livestream::v1::ListInputsRequest request) { auto span = internal::MakeSpan( "video_livestream_v1::LivestreamServiceConnection::ListInputs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListInputs(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::video::livestream::v1::Input>(std::move(span), @@ -133,7 +133,7 @@ LivestreamServiceTracingConnection::DeleteInput( google::cloud::video::livestream::v1::DeleteInputRequest const& request) { auto span = internal::MakeSpan( "video_livestream_v1::LivestreamServiceConnection::DeleteInput"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteInput(request)); } @@ -142,7 +142,7 @@ LivestreamServiceTracingConnection::UpdateInput( google::cloud::video::livestream::v1::UpdateInputRequest const& request) { auto span = internal::MakeSpan( "video_livestream_v1::LivestreamServiceConnection::UpdateInput"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateInput(request)); } @@ -160,7 +160,7 @@ LivestreamServiceTracingConnection::ListEvents( google::cloud::video::livestream::v1::ListEventsRequest request) { auto span = internal::MakeSpan( "video_livestream_v1::LivestreamServiceConnection::ListEvents"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListEvents(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::video::livestream::v1::Event>(std::move(span), @@ -189,7 +189,7 @@ LivestreamServiceTracingConnection::CreateAsset( google::cloud::video::livestream::v1::CreateAssetRequest const& request) { auto span = internal::MakeSpan( "video_livestream_v1::LivestreamServiceConnection::CreateAsset"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateAsset(request)); } @@ -198,7 +198,7 @@ LivestreamServiceTracingConnection::DeleteAsset( google::cloud::video::livestream::v1::DeleteAssetRequest const& request) { auto span = internal::MakeSpan( "video_livestream_v1::LivestreamServiceConnection::DeleteAsset"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteAsset(request)); } @@ -216,7 +216,7 @@ LivestreamServiceTracingConnection::ListAssets( google::cloud::video::livestream::v1::ListAssetsRequest request) { auto span = internal::MakeSpan( "video_livestream_v1::LivestreamServiceConnection::ListAssets"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListAssets(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::video::livestream::v1::Asset>(std::move(span), @@ -237,7 +237,7 @@ LivestreamServiceTracingConnection::UpdatePool( google::cloud::video::livestream::v1::UpdatePoolRequest const& request) { auto span = internal::MakeSpan( "video_livestream_v1::LivestreamServiceConnection::UpdatePool"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdatePool(request)); } diff --git a/google/cloud/video/livestream/v1/internal/livestream_tracing_stub.cc b/google/cloud/video/livestream/v1/internal/livestream_tracing_stub.cc index 228de0453795..28a4a0050671 100644 --- a/google/cloud/video/livestream/v1/internal/livestream_tracing_stub.cc +++ b/google/cloud/video/livestream/v1/internal/livestream_tracing_stub.cc @@ -37,10 +37,8 @@ LivestreamServiceTracingStub::AsyncCreateChannel( google::cloud::video::livestream::v1::CreateChannelRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.video.livestream.v1.LivestreamService", "CreateChannel"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateChannel(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -76,10 +74,8 @@ LivestreamServiceTracingStub::AsyncDeleteChannel( google::cloud::video::livestream::v1::DeleteChannelRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.video.livestream.v1.LivestreamService", "DeleteChannel"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteChannel(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -91,10 +87,8 @@ LivestreamServiceTracingStub::AsyncUpdateChannel( google::cloud::video::livestream::v1::UpdateChannelRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.video.livestream.v1.LivestreamService", "UpdateChannel"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateChannel(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -106,10 +100,8 @@ LivestreamServiceTracingStub::AsyncStartChannel( google::cloud::video::livestream::v1::StartChannelRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.video.livestream.v1.LivestreamService", "StartChannel"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncStartChannel(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -121,10 +113,8 @@ LivestreamServiceTracingStub::AsyncStopChannel( google::cloud::video::livestream::v1::StopChannelRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.video.livestream.v1.LivestreamService", "StopChannel"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncStopChannel(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -136,10 +126,8 @@ LivestreamServiceTracingStub::AsyncCreateInput( google::cloud::video::livestream::v1::CreateInputRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.video.livestream.v1.LivestreamService", "CreateInput"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateInput(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -174,10 +162,8 @@ LivestreamServiceTracingStub::AsyncDeleteInput( google::cloud::video::livestream::v1::DeleteInputRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.video.livestream.v1.LivestreamService", "DeleteInput"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteInput(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -189,10 +175,8 @@ LivestreamServiceTracingStub::AsyncUpdateInput( google::cloud::video::livestream::v1::UpdateInputRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.video.livestream.v1.LivestreamService", "UpdateInput"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateInput(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -250,10 +234,8 @@ LivestreamServiceTracingStub::AsyncCreateAsset( google::cloud::video::livestream::v1::CreateAssetRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.video.livestream.v1.LivestreamService", "CreateAsset"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateAsset(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -265,10 +247,8 @@ LivestreamServiceTracingStub::AsyncDeleteAsset( google::cloud::video::livestream::v1::DeleteAssetRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.video.livestream.v1.LivestreamService", "DeleteAsset"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteAsset(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -314,10 +294,8 @@ LivestreamServiceTracingStub::AsyncUpdatePool( google::cloud::video::livestream::v1::UpdatePoolRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.video.livestream.v1.LivestreamService", "UpdatePool"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdatePool(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -329,10 +307,8 @@ LivestreamServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -343,10 +319,8 @@ future LivestreamServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/video/stitcher/v1/internal/video_stitcher_tracing_connection.cc b/google/cloud/video/stitcher/v1/internal/video_stitcher_tracing_connection.cc index 6f7ef3937762..9555215d56b5 100644 --- a/google/cloud/video/stitcher/v1/internal/video_stitcher_tracing_connection.cc +++ b/google/cloud/video/stitcher/v1/internal/video_stitcher_tracing_connection.cc @@ -37,7 +37,7 @@ VideoStitcherServiceTracingConnection::CreateCdnKey( google::cloud::video::stitcher::v1::CreateCdnKeyRequest const& request) { auto span = internal::MakeSpan( "video_stitcher_v1::VideoStitcherServiceConnection::CreateCdnKey"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateCdnKey(request)); } @@ -46,7 +46,7 @@ VideoStitcherServiceTracingConnection::ListCdnKeys( google::cloud::video::stitcher::v1::ListCdnKeysRequest request) { auto span = internal::MakeSpan( "video_stitcher_v1::VideoStitcherServiceConnection::ListCdnKeys"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListCdnKeys(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::video::stitcher::v1::CdnKey>(std::move(span), @@ -67,7 +67,7 @@ VideoStitcherServiceTracingConnection::DeleteCdnKey( google::cloud::video::stitcher::v1::DeleteCdnKeyRequest const& request) { auto span = internal::MakeSpan( "video_stitcher_v1::VideoStitcherServiceConnection::DeleteCdnKey"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteCdnKey(request)); } @@ -76,7 +76,7 @@ VideoStitcherServiceTracingConnection::UpdateCdnKey( google::cloud::video::stitcher::v1::UpdateCdnKeyRequest const& request) { auto span = internal::MakeSpan( "video_stitcher_v1::VideoStitcherServiceConnection::UpdateCdnKey"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateCdnKey(request)); } @@ -105,7 +105,7 @@ VideoStitcherServiceTracingConnection::ListVodStitchDetails( auto span = internal::MakeSpan( "video_stitcher_v1::VideoStitcherServiceConnection::" "ListVodStitchDetails"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListVodStitchDetails(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::video::stitcher::v1::VodStitchDetail>(std::move(span), @@ -127,7 +127,7 @@ VideoStitcherServiceTracingConnection::ListVodAdTagDetails( google::cloud::video::stitcher::v1::ListVodAdTagDetailsRequest request) { auto span = internal::MakeSpan( "video_stitcher_v1::VideoStitcherServiceConnection::ListVodAdTagDetails"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListVodAdTagDetails(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::video::stitcher::v1::VodAdTagDetail>(std::move(span), @@ -150,7 +150,7 @@ VideoStitcherServiceTracingConnection::ListLiveAdTagDetails( auto span = internal::MakeSpan( "video_stitcher_v1::VideoStitcherServiceConnection::" "ListLiveAdTagDetails"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListLiveAdTagDetails(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::video::stitcher::v1::LiveAdTagDetail>(std::move(span), @@ -172,7 +172,7 @@ VideoStitcherServiceTracingConnection::CreateSlate( google::cloud::video::stitcher::v1::CreateSlateRequest const& request) { auto span = internal::MakeSpan( "video_stitcher_v1::VideoStitcherServiceConnection::CreateSlate"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateSlate(request)); } @@ -181,7 +181,7 @@ VideoStitcherServiceTracingConnection::ListSlates( google::cloud::video::stitcher::v1::ListSlatesRequest request) { auto span = internal::MakeSpan( "video_stitcher_v1::VideoStitcherServiceConnection::ListSlates"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListSlates(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::video::stitcher::v1::Slate>(std::move(span), @@ -202,7 +202,7 @@ VideoStitcherServiceTracingConnection::UpdateSlate( google::cloud::video::stitcher::v1::UpdateSlateRequest const& request) { auto span = internal::MakeSpan( "video_stitcher_v1::VideoStitcherServiceConnection::UpdateSlate"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateSlate(request)); } @@ -211,7 +211,7 @@ VideoStitcherServiceTracingConnection::DeleteSlate( google::cloud::video::stitcher::v1::DeleteSlateRequest const& request) { auto span = internal::MakeSpan( "video_stitcher_v1::VideoStitcherServiceConnection::DeleteSlate"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteSlate(request)); } @@ -240,7 +240,7 @@ VideoStitcherServiceTracingConnection::CreateLiveConfig( request) { auto span = internal::MakeSpan( "video_stitcher_v1::VideoStitcherServiceConnection::CreateLiveConfig"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateLiveConfig(request)); } @@ -249,7 +249,7 @@ VideoStitcherServiceTracingConnection::ListLiveConfigs( google::cloud::video::stitcher::v1::ListLiveConfigsRequest request) { auto span = internal::MakeSpan( "video_stitcher_v1::VideoStitcherServiceConnection::ListLiveConfigs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListLiveConfigs(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::video::stitcher::v1::LiveConfig>(std::move(span), @@ -271,7 +271,7 @@ VideoStitcherServiceTracingConnection::DeleteLiveConfig( request) { auto span = internal::MakeSpan( "video_stitcher_v1::VideoStitcherServiceConnection::DeleteLiveConfig"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteLiveConfig(request)); } diff --git a/google/cloud/video/stitcher/v1/internal/video_stitcher_tracing_stub.cc b/google/cloud/video/stitcher/v1/internal/video_stitcher_tracing_stub.cc index 055e049ce1b0..539c01b167d8 100644 --- a/google/cloud/video/stitcher/v1/internal/video_stitcher_tracing_stub.cc +++ b/google/cloud/video/stitcher/v1/internal/video_stitcher_tracing_stub.cc @@ -37,10 +37,8 @@ VideoStitcherServiceTracingStub::AsyncCreateCdnKey( google::cloud::video::stitcher::v1::CreateCdnKeyRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.video.stitcher.v1.VideoStitcherService", "CreateCdnKey"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateCdnKey(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -75,10 +73,8 @@ VideoStitcherServiceTracingStub::AsyncDeleteCdnKey( google::cloud::video::stitcher::v1::DeleteCdnKeyRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.video.stitcher.v1.VideoStitcherService", "DeleteCdnKey"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteCdnKey(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -90,10 +86,8 @@ VideoStitcherServiceTracingStub::AsyncUpdateCdnKey( google::cloud::video::stitcher::v1::UpdateCdnKeyRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.video.stitcher.v1.VideoStitcherService", "UpdateCdnKey"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateCdnKey(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -215,10 +209,8 @@ VideoStitcherServiceTracingStub::AsyncCreateSlate( google::cloud::video::stitcher::v1::CreateSlateRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.video.stitcher.v1.VideoStitcherService", "CreateSlate"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateSlate(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -253,10 +245,8 @@ VideoStitcherServiceTracingStub::AsyncUpdateSlate( google::cloud::video::stitcher::v1::UpdateSlateRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.video.stitcher.v1.VideoStitcherService", "UpdateSlate"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateSlate(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -268,10 +258,8 @@ VideoStitcherServiceTracingStub::AsyncDeleteSlate( google::cloud::video::stitcher::v1::DeleteSlateRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.video.stitcher.v1.VideoStitcherService", "DeleteSlate"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteSlate(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -311,10 +299,8 @@ VideoStitcherServiceTracingStub::AsyncCreateLiveConfig( auto span = internal::MakeSpanGrpc( "google.cloud.video.stitcher.v1.VideoStitcherService", "CreateLiveConfig"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateLiveConfig(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -352,10 +338,8 @@ VideoStitcherServiceTracingStub::AsyncDeleteLiveConfig( auto span = internal::MakeSpanGrpc( "google.cloud.video.stitcher.v1.VideoStitcherService", "DeleteLiveConfig"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteLiveConfig(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -367,10 +351,8 @@ VideoStitcherServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -381,10 +363,8 @@ future VideoStitcherServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/video/transcoder/v1/internal/transcoder_tracing_connection.cc b/google/cloud/video/transcoder/v1/internal/transcoder_tracing_connection.cc index 994cac888862..a79be34bbea0 100644 --- a/google/cloud/video/transcoder/v1/internal/transcoder_tracing_connection.cc +++ b/google/cloud/video/transcoder/v1/internal/transcoder_tracing_connection.cc @@ -46,7 +46,7 @@ TranscoderServiceTracingConnection::ListJobs( google::cloud::video::transcoder::v1::ListJobsRequest request) { auto span = internal::MakeSpan( "video_transcoder_v1::TranscoderServiceConnection::ListJobs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListJobs(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::video::transcoder::v1::Job>(std::move(span), @@ -85,7 +85,7 @@ TranscoderServiceTracingConnection::ListJobTemplates( google::cloud::video::transcoder::v1::ListJobTemplatesRequest request) { auto span = internal::MakeSpan( "video_transcoder_v1::TranscoderServiceConnection::ListJobTemplates"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListJobTemplates(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::video::transcoder::v1::JobTemplate>(std::move(span), diff --git a/google/cloud/videointelligence/v1/internal/video_intelligence_tracing_connection.cc b/google/cloud/videointelligence/v1/internal/video_intelligence_tracing_connection.cc index 295f3fbfeec6..008d2157fae8 100644 --- a/google/cloud/videointelligence/v1/internal/video_intelligence_tracing_connection.cc +++ b/google/cloud/videointelligence/v1/internal/video_intelligence_tracing_connection.cc @@ -40,7 +40,7 @@ VideoIntelligenceServiceTracingConnection::AnnotateVideo( auto span = internal::MakeSpan( "videointelligence_v1::VideoIntelligenceServiceConnection::" "AnnotateVideo"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->AnnotateVideo(request)); } diff --git a/google/cloud/videointelligence/v1/internal/video_intelligence_tracing_stub.cc b/google/cloud/videointelligence/v1/internal/video_intelligence_tracing_stub.cc index 8464a8755ec9..0cff97ececff 100644 --- a/google/cloud/videointelligence/v1/internal/video_intelligence_tracing_stub.cc +++ b/google/cloud/videointelligence/v1/internal/video_intelligence_tracing_stub.cc @@ -38,10 +38,8 @@ VideoIntelligenceServiceTracingStub::AsyncAnnotateVideo( auto span = internal::MakeSpanGrpc( "google.cloud.videointelligence.v1.VideoIntelligenceService", "AnnotateVideo"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncAnnotateVideo(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -53,10 +51,8 @@ VideoIntelligenceServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -67,10 +63,8 @@ future VideoIntelligenceServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/vision/v1/internal/image_annotator_tracing_connection.cc b/google/cloud/vision/v1/internal/image_annotator_tracing_connection.cc index 4b56cf9ea7e3..1455ef7045d5 100644 --- a/google/cloud/vision/v1/internal/image_annotator_tracing_connection.cc +++ b/google/cloud/vision/v1/internal/image_annotator_tracing_connection.cc @@ -54,7 +54,7 @@ ImageAnnotatorTracingConnection::AsyncBatchAnnotateImages( google::cloud::vision::v1::AsyncBatchAnnotateImagesRequest const& request) { auto span = internal::MakeSpan( "vision_v1::ImageAnnotatorConnection::AsyncBatchAnnotateImages"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->AsyncBatchAnnotateImages(request)); } @@ -64,7 +64,7 @@ ImageAnnotatorTracingConnection::AsyncBatchAnnotateFiles( google::cloud::vision::v1::AsyncBatchAnnotateFilesRequest const& request) { auto span = internal::MakeSpan( "vision_v1::ImageAnnotatorConnection::AsyncBatchAnnotateFiles"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->AsyncBatchAnnotateFiles(request)); } diff --git a/google/cloud/vision/v1/internal/image_annotator_tracing_stub.cc b/google/cloud/vision/v1/internal/image_annotator_tracing_stub.cc index ee335ed2f0d8..2fcaa13f5f8c 100644 --- a/google/cloud/vision/v1/internal/image_annotator_tracing_stub.cc +++ b/google/cloud/vision/v1/internal/image_annotator_tracing_stub.cc @@ -61,10 +61,8 @@ ImageAnnotatorTracingStub::AsyncAsyncBatchAnnotateImages( google::cloud::vision::v1::AsyncBatchAnnotateImagesRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.vision.v1.ImageAnnotator", "AsyncBatchAnnotateImages"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncAsyncBatchAnnotateImages(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -76,10 +74,8 @@ ImageAnnotatorTracingStub::AsyncAsyncBatchAnnotateFiles( google::cloud::vision::v1::AsyncBatchAnnotateFilesRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.vision.v1.ImageAnnotator", "AsyncBatchAnnotateFiles"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncAsyncBatchAnnotateFiles(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -91,10 +87,8 @@ ImageAnnotatorTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -105,10 +99,8 @@ future ImageAnnotatorTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/vision/v1/internal/product_search_tracing_connection.cc b/google/cloud/vision/v1/internal/product_search_tracing_connection.cc index 4d0178724c43..3054978cf13f 100644 --- a/google/cloud/vision/v1/internal/product_search_tracing_connection.cc +++ b/google/cloud/vision/v1/internal/product_search_tracing_connection.cc @@ -46,7 +46,7 @@ ProductSearchTracingConnection::ListProductSets( google::cloud::vision::v1::ListProductSetsRequest request) { auto span = internal::MakeSpan("vision_v1::ProductSearchConnection::ListProductSets"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListProductSets(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -92,7 +92,7 @@ ProductSearchTracingConnection::ListProducts( google::cloud::vision::v1::ListProductsRequest request) { auto span = internal::MakeSpan("vision_v1::ProductSearchConnection::ListProducts"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListProducts(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -146,7 +146,7 @@ ProductSearchTracingConnection::ListReferenceImages( google::cloud::vision::v1::ListReferenceImagesRequest request) { auto span = internal::MakeSpan( "vision_v1::ProductSearchConnection::ListReferenceImages"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListReferenceImages(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::vision::v1::ReferenceImage>(std::move(span), @@ -184,7 +184,7 @@ ProductSearchTracingConnection::ListProductsInProductSet( google::cloud::vision::v1::ListProductsInProductSetRequest request) { auto span = internal::MakeSpan( "vision_v1::ProductSearchConnection::ListProductsInProductSet"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListProductsInProductSet(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -195,7 +195,7 @@ ProductSearchTracingConnection::ImportProductSets( google::cloud::vision::v1::ImportProductSetsRequest const& request) { auto span = internal::MakeSpan( "vision_v1::ProductSearchConnection::ImportProductSets"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ImportProductSets(request)); } @@ -204,7 +204,7 @@ ProductSearchTracingConnection::PurgeProducts( google::cloud::vision::v1::PurgeProductsRequest const& request) { auto span = internal::MakeSpan("vision_v1::ProductSearchConnection::PurgeProducts"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PurgeProducts(request)); } diff --git a/google/cloud/vision/v1/internal/product_search_tracing_stub.cc b/google/cloud/vision/v1/internal/product_search_tracing_stub.cc index f86c034b3b0d..dd281e444738 100644 --- a/google/cloud/vision/v1/internal/product_search_tracing_stub.cc +++ b/google/cloud/vision/v1/internal/product_search_tracing_stub.cc @@ -237,10 +237,8 @@ ProductSearchTracingStub::AsyncImportProductSets( google::cloud::vision::v1::ImportProductSetsRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.vision.v1.ProductSearch", "ImportProductSets"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncImportProductSets(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -252,10 +250,8 @@ ProductSearchTracingStub::AsyncPurgeProducts( google::cloud::vision::v1::PurgeProductsRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.vision.v1.ProductSearch", "PurgeProducts"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncPurgeProducts(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -267,10 +263,8 @@ ProductSearchTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -281,10 +275,8 @@ future ProductSearchTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/vmmigration/v1/internal/vm_migration_tracing_connection.cc b/google/cloud/vmmigration/v1/internal/vm_migration_tracing_connection.cc index 88a73a498854..d3b763893d29 100644 --- a/google/cloud/vmmigration/v1/internal/vm_migration_tracing_connection.cc +++ b/google/cloud/vmmigration/v1/internal/vm_migration_tracing_connection.cc @@ -37,7 +37,7 @@ VmMigrationTracingConnection::ListSources( google::cloud::vmmigration::v1::ListSourcesRequest request) { auto span = internal::MakeSpan("vmmigration_v1::VmMigrationConnection::ListSources"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListSources(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::vmmigration::v1::Source>(std::move(span), std::move(sr)); @@ -57,7 +57,7 @@ VmMigrationTracingConnection::CreateSource( google::cloud::vmmigration::v1::CreateSourceRequest const& request) { auto span = internal::MakeSpan("vmmigration_v1::VmMigrationConnection::CreateSource"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateSource(request)); } @@ -66,7 +66,7 @@ VmMigrationTracingConnection::UpdateSource( google::cloud::vmmigration::v1::UpdateSourceRequest const& request) { auto span = internal::MakeSpan("vmmigration_v1::VmMigrationConnection::UpdateSource"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateSource(request)); } @@ -75,7 +75,7 @@ VmMigrationTracingConnection::DeleteSource( google::cloud::vmmigration::v1::DeleteSourceRequest const& request) { auto span = internal::MakeSpan("vmmigration_v1::VmMigrationConnection::DeleteSource"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteSource(request)); } @@ -93,7 +93,7 @@ VmMigrationTracingConnection::ListUtilizationReports( google::cloud::vmmigration::v1::ListUtilizationReportsRequest request) { auto span = internal::MakeSpan( "vmmigration_v1::VmMigrationConnection::ListUtilizationReports"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListUtilizationReports(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::vmmigration::v1::UtilizationReport>(std::move(span), @@ -116,7 +116,7 @@ VmMigrationTracingConnection::CreateUtilizationReport( request) { auto span = internal::MakeSpan( "vmmigration_v1::VmMigrationConnection::CreateUtilizationReport"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateUtilizationReport(request)); } @@ -127,7 +127,7 @@ VmMigrationTracingConnection::DeleteUtilizationReport( request) { auto span = internal::MakeSpan( "vmmigration_v1::VmMigrationConnection::DeleteUtilizationReport"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteUtilizationReport(request)); } @@ -137,7 +137,7 @@ VmMigrationTracingConnection::ListDatacenterConnectors( google::cloud::vmmigration::v1::ListDatacenterConnectorsRequest request) { auto span = internal::MakeSpan( "vmmigration_v1::VmMigrationConnection::ListDatacenterConnectors"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListDatacenterConnectors(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::vmmigration::v1::DatacenterConnector>(std::move(span), @@ -160,7 +160,7 @@ VmMigrationTracingConnection::CreateDatacenterConnector( request) { auto span = internal::MakeSpan( "vmmigration_v1::VmMigrationConnection::CreateDatacenterConnector"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateDatacenterConnector(request)); } @@ -171,7 +171,7 @@ VmMigrationTracingConnection::DeleteDatacenterConnector( request) { auto span = internal::MakeSpan( "vmmigration_v1::VmMigrationConnection::DeleteDatacenterConnector"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteDatacenterConnector(request)); } @@ -181,7 +181,7 @@ VmMigrationTracingConnection::UpgradeAppliance( google::cloud::vmmigration::v1::UpgradeApplianceRequest const& request) { auto span = internal::MakeSpan( "vmmigration_v1::VmMigrationConnection::UpgradeAppliance"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpgradeAppliance(request)); } @@ -190,7 +190,7 @@ VmMigrationTracingConnection::CreateMigratingVm( google::cloud::vmmigration::v1::CreateMigratingVmRequest const& request) { auto span = internal::MakeSpan( "vmmigration_v1::VmMigrationConnection::CreateMigratingVm"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateMigratingVm(request)); } @@ -199,7 +199,7 @@ VmMigrationTracingConnection::ListMigratingVms( google::cloud::vmmigration::v1::ListMigratingVmsRequest request) { auto span = internal::MakeSpan( "vmmigration_v1::VmMigrationConnection::ListMigratingVms"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListMigratingVms(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::vmmigration::v1::MigratingVm>(std::move(span), @@ -220,7 +220,7 @@ VmMigrationTracingConnection::UpdateMigratingVm( google::cloud::vmmigration::v1::UpdateMigratingVmRequest const& request) { auto span = internal::MakeSpan( "vmmigration_v1::VmMigrationConnection::UpdateMigratingVm"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateMigratingVm(request)); } @@ -229,7 +229,7 @@ VmMigrationTracingConnection::DeleteMigratingVm( google::cloud::vmmigration::v1::DeleteMigratingVmRequest const& request) { auto span = internal::MakeSpan( "vmmigration_v1::VmMigrationConnection::DeleteMigratingVm"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteMigratingVm(request)); } @@ -238,7 +238,7 @@ VmMigrationTracingConnection::StartMigration( google::cloud::vmmigration::v1::StartMigrationRequest const& request) { auto span = internal::MakeSpan( "vmmigration_v1::VmMigrationConnection::StartMigration"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->StartMigration(request)); } @@ -247,7 +247,7 @@ VmMigrationTracingConnection::ResumeMigration( google::cloud::vmmigration::v1::ResumeMigrationRequest const& request) { auto span = internal::MakeSpan( "vmmigration_v1::VmMigrationConnection::ResumeMigration"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ResumeMigration(request)); } @@ -256,7 +256,7 @@ VmMigrationTracingConnection::PauseMigration( google::cloud::vmmigration::v1::PauseMigrationRequest const& request) { auto span = internal::MakeSpan( "vmmigration_v1::VmMigrationConnection::PauseMigration"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->PauseMigration(request)); } @@ -265,7 +265,7 @@ VmMigrationTracingConnection::FinalizeMigration( google::cloud::vmmigration::v1::FinalizeMigrationRequest const& request) { auto span = internal::MakeSpan( "vmmigration_v1::VmMigrationConnection::FinalizeMigration"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->FinalizeMigration(request)); } @@ -274,7 +274,7 @@ VmMigrationTracingConnection::CreateCloneJob( google::cloud::vmmigration::v1::CreateCloneJobRequest const& request) { auto span = internal::MakeSpan( "vmmigration_v1::VmMigrationConnection::CreateCloneJob"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateCloneJob(request)); } @@ -283,7 +283,7 @@ VmMigrationTracingConnection::CancelCloneJob( google::cloud::vmmigration::v1::CancelCloneJobRequest const& request) { auto span = internal::MakeSpan( "vmmigration_v1::VmMigrationConnection::CancelCloneJob"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CancelCloneJob(request)); } @@ -292,7 +292,7 @@ VmMigrationTracingConnection::ListCloneJobs( google::cloud::vmmigration::v1::ListCloneJobsRequest request) { auto span = internal::MakeSpan( "vmmigration_v1::VmMigrationConnection::ListCloneJobs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListCloneJobs(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::vmmigration::v1::CloneJob>(std::move(span), std::move(sr)); @@ -312,7 +312,7 @@ VmMigrationTracingConnection::CreateCutoverJob( google::cloud::vmmigration::v1::CreateCutoverJobRequest const& request) { auto span = internal::MakeSpan( "vmmigration_v1::VmMigrationConnection::CreateCutoverJob"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateCutoverJob(request)); } @@ -321,7 +321,7 @@ VmMigrationTracingConnection::CancelCutoverJob( google::cloud::vmmigration::v1::CancelCutoverJobRequest const& request) { auto span = internal::MakeSpan( "vmmigration_v1::VmMigrationConnection::CancelCutoverJob"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CancelCutoverJob(request)); } @@ -330,7 +330,7 @@ VmMigrationTracingConnection::ListCutoverJobs( google::cloud::vmmigration::v1::ListCutoverJobsRequest request) { auto span = internal::MakeSpan( "vmmigration_v1::VmMigrationConnection::ListCutoverJobs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListCutoverJobs(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::vmmigration::v1::CutoverJob>(std::move(span), @@ -351,7 +351,7 @@ VmMigrationTracingConnection::ListGroups( google::cloud::vmmigration::v1::ListGroupsRequest request) { auto span = internal::MakeSpan("vmmigration_v1::VmMigrationConnection::ListGroups"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListGroups(std::move(request)); return internal::MakeTracedStreamRange( std::move(span), std::move(sr)); @@ -371,7 +371,7 @@ VmMigrationTracingConnection::CreateGroup( google::cloud::vmmigration::v1::CreateGroupRequest const& request) { auto span = internal::MakeSpan("vmmigration_v1::VmMigrationConnection::CreateGroup"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateGroup(request)); } @@ -380,7 +380,7 @@ VmMigrationTracingConnection::UpdateGroup( google::cloud::vmmigration::v1::UpdateGroupRequest const& request) { auto span = internal::MakeSpan("vmmigration_v1::VmMigrationConnection::UpdateGroup"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateGroup(request)); } @@ -389,7 +389,7 @@ VmMigrationTracingConnection::DeleteGroup( google::cloud::vmmigration::v1::DeleteGroupRequest const& request) { auto span = internal::MakeSpan("vmmigration_v1::VmMigrationConnection::DeleteGroup"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteGroup(request)); } @@ -398,7 +398,7 @@ VmMigrationTracingConnection::AddGroupMigration( google::cloud::vmmigration::v1::AddGroupMigrationRequest const& request) { auto span = internal::MakeSpan( "vmmigration_v1::VmMigrationConnection::AddGroupMigration"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->AddGroupMigration(request)); } @@ -408,7 +408,7 @@ VmMigrationTracingConnection::RemoveGroupMigration( request) { auto span = internal::MakeSpan( "vmmigration_v1::VmMigrationConnection::RemoveGroupMigration"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->RemoveGroupMigration(request)); } @@ -418,7 +418,7 @@ VmMigrationTracingConnection::ListTargetProjects( google::cloud::vmmigration::v1::ListTargetProjectsRequest request) { auto span = internal::MakeSpan( "vmmigration_v1::VmMigrationConnection::ListTargetProjects"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListTargetProjects(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::vmmigration::v1::TargetProject>(std::move(span), @@ -439,7 +439,7 @@ VmMigrationTracingConnection::CreateTargetProject( google::cloud::vmmigration::v1::CreateTargetProjectRequest const& request) { auto span = internal::MakeSpan( "vmmigration_v1::VmMigrationConnection::CreateTargetProject"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateTargetProject(request)); } @@ -449,7 +449,7 @@ VmMigrationTracingConnection::UpdateTargetProject( google::cloud::vmmigration::v1::UpdateTargetProjectRequest const& request) { auto span = internal::MakeSpan( "vmmigration_v1::VmMigrationConnection::UpdateTargetProject"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateTargetProject(request)); } @@ -459,7 +459,7 @@ VmMigrationTracingConnection::DeleteTargetProject( google::cloud::vmmigration::v1::DeleteTargetProjectRequest const& request) { auto span = internal::MakeSpan( "vmmigration_v1::VmMigrationConnection::DeleteTargetProject"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteTargetProject(request)); } @@ -469,7 +469,7 @@ VmMigrationTracingConnection::ListReplicationCycles( google::cloud::vmmigration::v1::ListReplicationCyclesRequest request) { auto span = internal::MakeSpan( "vmmigration_v1::VmMigrationConnection::ListReplicationCycles"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListReplicationCycles(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::vmmigration::v1::ReplicationCycle>(std::move(span), diff --git a/google/cloud/vmmigration/v1/internal/vm_migration_tracing_stub.cc b/google/cloud/vmmigration/v1/internal/vm_migration_tracing_stub.cc index 892d292ab824..99a91375866d 100644 --- a/google/cloud/vmmigration/v1/internal/vm_migration_tracing_stub.cc +++ b/google/cloud/vmmigration/v1/internal/vm_migration_tracing_stub.cc @@ -60,10 +60,8 @@ VmMigrationTracingStub::AsyncCreateSource( google::cloud::vmmigration::v1::CreateSourceRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.vmmigration.v1.VmMigration", "CreateSource"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateSource(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -75,10 +73,8 @@ VmMigrationTracingStub::AsyncUpdateSource( google::cloud::vmmigration::v1::UpdateSourceRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.vmmigration.v1.VmMigration", "UpdateSource"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateSource(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -90,10 +86,8 @@ VmMigrationTracingStub::AsyncDeleteSource( google::cloud::vmmigration::v1::DeleteSourceRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.vmmigration.v1.VmMigration", "DeleteSource"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteSource(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -144,10 +138,8 @@ VmMigrationTracingStub::AsyncCreateUtilizationReport( request) { auto span = internal::MakeSpanGrpc("google.cloud.vmmigration.v1.VmMigration", "CreateUtilizationReport"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateUtilizationReport(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -160,10 +152,8 @@ VmMigrationTracingStub::AsyncDeleteUtilizationReport( request) { auto span = internal::MakeSpanGrpc("google.cloud.vmmigration.v1.VmMigration", "DeleteUtilizationReport"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteUtilizationReport(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -202,10 +192,8 @@ VmMigrationTracingStub::AsyncCreateDatacenterConnector( request) { auto span = internal::MakeSpanGrpc("google.cloud.vmmigration.v1.VmMigration", "CreateDatacenterConnector"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateDatacenterConnector(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -218,10 +206,8 @@ VmMigrationTracingStub::AsyncDeleteDatacenterConnector( request) { auto span = internal::MakeSpanGrpc("google.cloud.vmmigration.v1.VmMigration", "DeleteDatacenterConnector"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteDatacenterConnector(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -233,10 +219,8 @@ VmMigrationTracingStub::AsyncUpgradeAppliance( google::cloud::vmmigration::v1::UpgradeApplianceRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.vmmigration.v1.VmMigration", "UpgradeAppliance"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpgradeAppliance(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -248,10 +232,8 @@ VmMigrationTracingStub::AsyncCreateMigratingVm( google::cloud::vmmigration::v1::CreateMigratingVmRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.vmmigration.v1.VmMigration", "CreateMigratingVm"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateMigratingVm(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -287,10 +269,8 @@ VmMigrationTracingStub::AsyncUpdateMigratingVm( google::cloud::vmmigration::v1::UpdateMigratingVmRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.vmmigration.v1.VmMigration", "UpdateMigratingVm"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateMigratingVm(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -302,10 +282,8 @@ VmMigrationTracingStub::AsyncDeleteMigratingVm( google::cloud::vmmigration::v1::DeleteMigratingVmRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.vmmigration.v1.VmMigration", "DeleteMigratingVm"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteMigratingVm(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -317,10 +295,8 @@ VmMigrationTracingStub::AsyncStartMigration( google::cloud::vmmigration::v1::StartMigrationRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.vmmigration.v1.VmMigration", "StartMigration"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncStartMigration(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -332,10 +308,8 @@ VmMigrationTracingStub::AsyncResumeMigration( google::cloud::vmmigration::v1::ResumeMigrationRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.vmmigration.v1.VmMigration", "ResumeMigration"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncResumeMigration(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -347,10 +321,8 @@ VmMigrationTracingStub::AsyncPauseMigration( google::cloud::vmmigration::v1::PauseMigrationRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.vmmigration.v1.VmMigration", "PauseMigration"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncPauseMigration(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -362,10 +334,8 @@ VmMigrationTracingStub::AsyncFinalizeMigration( google::cloud::vmmigration::v1::FinalizeMigrationRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.vmmigration.v1.VmMigration", "FinalizeMigration"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncFinalizeMigration(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -377,10 +347,8 @@ VmMigrationTracingStub::AsyncCreateCloneJob( google::cloud::vmmigration::v1::CreateCloneJobRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.vmmigration.v1.VmMigration", "CreateCloneJob"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateCloneJob(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -392,10 +360,8 @@ VmMigrationTracingStub::AsyncCancelCloneJob( google::cloud::vmmigration::v1::CancelCloneJobRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.vmmigration.v1.VmMigration", "CancelCloneJob"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelCloneJob(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -431,10 +397,8 @@ VmMigrationTracingStub::AsyncCreateCutoverJob( google::cloud::vmmigration::v1::CreateCutoverJobRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.vmmigration.v1.VmMigration", "CreateCutoverJob"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateCutoverJob(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -446,10 +410,8 @@ VmMigrationTracingStub::AsyncCancelCutoverJob( google::cloud::vmmigration::v1::CancelCutoverJobRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.vmmigration.v1.VmMigration", "CancelCutoverJob"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelCutoverJob(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -508,10 +470,8 @@ VmMigrationTracingStub::AsyncCreateGroup( google::cloud::vmmigration::v1::CreateGroupRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.vmmigration.v1.VmMigration", "CreateGroup"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateGroup(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -523,10 +483,8 @@ VmMigrationTracingStub::AsyncUpdateGroup( google::cloud::vmmigration::v1::UpdateGroupRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.vmmigration.v1.VmMigration", "UpdateGroup"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateGroup(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -538,10 +496,8 @@ VmMigrationTracingStub::AsyncDeleteGroup( google::cloud::vmmigration::v1::DeleteGroupRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.vmmigration.v1.VmMigration", "DeleteGroup"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteGroup(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -553,10 +509,8 @@ VmMigrationTracingStub::AsyncAddGroupMigration( google::cloud::vmmigration::v1::AddGroupMigrationRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.vmmigration.v1.VmMigration", "AddGroupMigration"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncAddGroupMigration(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -569,10 +523,8 @@ VmMigrationTracingStub::AsyncRemoveGroupMigration( request) { auto span = internal::MakeSpanGrpc("google.cloud.vmmigration.v1.VmMigration", "RemoveGroupMigration"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncRemoveGroupMigration(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -608,10 +560,8 @@ VmMigrationTracingStub::AsyncCreateTargetProject( google::cloud::vmmigration::v1::CreateTargetProjectRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.vmmigration.v1.VmMigration", "CreateTargetProject"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateTargetProject(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -623,10 +573,8 @@ VmMigrationTracingStub::AsyncUpdateTargetProject( google::cloud::vmmigration::v1::UpdateTargetProjectRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.vmmigration.v1.VmMigration", "UpdateTargetProject"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateTargetProject(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -638,10 +586,8 @@ VmMigrationTracingStub::AsyncDeleteTargetProject( google::cloud::vmmigration::v1::DeleteTargetProjectRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.vmmigration.v1.VmMigration", "DeleteTargetProject"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteTargetProject(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -678,10 +624,8 @@ VmMigrationTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -692,10 +636,8 @@ future VmMigrationTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/vmwareengine/v1/internal/vmware_engine_tracing_connection.cc b/google/cloud/vmwareengine/v1/internal/vmware_engine_tracing_connection.cc index 7b65851324d0..12f2db46d51c 100644 --- a/google/cloud/vmwareengine/v1/internal/vmware_engine_tracing_connection.cc +++ b/google/cloud/vmwareengine/v1/internal/vmware_engine_tracing_connection.cc @@ -37,7 +37,7 @@ VmwareEngineTracingConnection::ListPrivateClouds( google::cloud::vmwareengine::v1::ListPrivateCloudsRequest request) { auto span = internal::MakeSpan( "vmwareengine_v1::VmwareEngineConnection::ListPrivateClouds"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListPrivateClouds(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::vmwareengine::v1::PrivateCloud>(std::move(span), @@ -58,7 +58,7 @@ VmwareEngineTracingConnection::CreatePrivateCloud( google::cloud::vmwareengine::v1::CreatePrivateCloudRequest const& request) { auto span = internal::MakeSpan( "vmwareengine_v1::VmwareEngineConnection::CreatePrivateCloud"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreatePrivateCloud(request)); } @@ -68,7 +68,7 @@ VmwareEngineTracingConnection::UpdatePrivateCloud( google::cloud::vmwareengine::v1::UpdatePrivateCloudRequest const& request) { auto span = internal::MakeSpan( "vmwareengine_v1::VmwareEngineConnection::UpdatePrivateCloud"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdatePrivateCloud(request)); } @@ -78,7 +78,7 @@ VmwareEngineTracingConnection::DeletePrivateCloud( google::cloud::vmwareengine::v1::DeletePrivateCloudRequest const& request) { auto span = internal::MakeSpan( "vmwareengine_v1::VmwareEngineConnection::DeletePrivateCloud"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeletePrivateCloud(request)); } @@ -89,7 +89,7 @@ VmwareEngineTracingConnection::UndeletePrivateCloud( request) { auto span = internal::MakeSpan( "vmwareengine_v1::VmwareEngineConnection::UndeletePrivateCloud"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UndeletePrivateCloud(request)); } @@ -99,7 +99,7 @@ VmwareEngineTracingConnection::ListClusters( google::cloud::vmwareengine::v1::ListClustersRequest request) { auto span = internal::MakeSpan( "vmwareengine_v1::VmwareEngineConnection::ListClusters"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListClusters(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::vmwareengine::v1::Cluster>(std::move(span), std::move(sr)); @@ -119,7 +119,7 @@ VmwareEngineTracingConnection::CreateCluster( google::cloud::vmwareengine::v1::CreateClusterRequest const& request) { auto span = internal::MakeSpan( "vmwareengine_v1::VmwareEngineConnection::CreateCluster"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateCluster(request)); } @@ -128,7 +128,7 @@ VmwareEngineTracingConnection::UpdateCluster( google::cloud::vmwareengine::v1::UpdateClusterRequest const& request) { auto span = internal::MakeSpan( "vmwareengine_v1::VmwareEngineConnection::UpdateCluster"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateCluster(request)); } @@ -137,7 +137,7 @@ VmwareEngineTracingConnection::DeleteCluster( google::cloud::vmwareengine::v1::DeleteClusterRequest const& request) { auto span = internal::MakeSpan( "vmwareengine_v1::VmwareEngineConnection::DeleteCluster"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteCluster(request)); } @@ -146,7 +146,7 @@ VmwareEngineTracingConnection::ListSubnets( google::cloud::vmwareengine::v1::ListSubnetsRequest request) { auto span = internal::MakeSpan( "vmwareengine_v1::VmwareEngineConnection::ListSubnets"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListSubnets(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::vmwareengine::v1::Subnet>(std::move(span), std::move(sr)); @@ -166,7 +166,7 @@ VmwareEngineTracingConnection::UpdateSubnet( google::cloud::vmwareengine::v1::UpdateSubnetRequest const& request) { auto span = internal::MakeSpan( "vmwareengine_v1::VmwareEngineConnection::UpdateSubnet"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateSubnet(request)); } @@ -175,7 +175,7 @@ VmwareEngineTracingConnection::ListNodeTypes( google::cloud::vmwareengine::v1::ListNodeTypesRequest request) { auto span = internal::MakeSpan( "vmwareengine_v1::VmwareEngineConnection::ListNodeTypes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListNodeTypes(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::vmwareengine::v1::NodeType>(std::move(span), @@ -216,7 +216,7 @@ VmwareEngineTracingConnection::ResetNsxCredentials( request) { auto span = internal::MakeSpan( "vmwareengine_v1::VmwareEngineConnection::ResetNsxCredentials"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ResetNsxCredentials(request)); } @@ -227,7 +227,7 @@ VmwareEngineTracingConnection::ResetVcenterCredentials( request) { auto span = internal::MakeSpan( "vmwareengine_v1::VmwareEngineConnection::ResetVcenterCredentials"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->ResetVcenterCredentials(request)); } @@ -238,7 +238,7 @@ VmwareEngineTracingConnection::CreateHcxActivationKey( request) { auto span = internal::MakeSpan( "vmwareengine_v1::VmwareEngineConnection::CreateHcxActivationKey"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateHcxActivationKey(request)); } @@ -248,7 +248,7 @@ VmwareEngineTracingConnection::ListHcxActivationKeys( google::cloud::vmwareengine::v1::ListHcxActivationKeysRequest request) { auto span = internal::MakeSpan( "vmwareengine_v1::VmwareEngineConnection::ListHcxActivationKeys"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListHcxActivationKeys(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::vmwareengine::v1::HcxActivationKey>(std::move(span), @@ -279,7 +279,7 @@ VmwareEngineTracingConnection::ListNetworkPolicies( google::cloud::vmwareengine::v1::ListNetworkPoliciesRequest request) { auto span = internal::MakeSpan( "vmwareengine_v1::VmwareEngineConnection::ListNetworkPolicies"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListNetworkPolicies(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::vmwareengine::v1::NetworkPolicy>(std::move(span), @@ -292,7 +292,7 @@ VmwareEngineTracingConnection::CreateNetworkPolicy( request) { auto span = internal::MakeSpan( "vmwareengine_v1::VmwareEngineConnection::CreateNetworkPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateNetworkPolicy(request)); } @@ -303,7 +303,7 @@ VmwareEngineTracingConnection::UpdateNetworkPolicy( request) { auto span = internal::MakeSpan( "vmwareengine_v1::VmwareEngineConnection::UpdateNetworkPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateNetworkPolicy(request)); } @@ -314,7 +314,7 @@ VmwareEngineTracingConnection::DeleteNetworkPolicy( request) { auto span = internal::MakeSpan( "vmwareengine_v1::VmwareEngineConnection::DeleteNetworkPolicy"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteNetworkPolicy(request)); } @@ -325,7 +325,7 @@ VmwareEngineTracingConnection::CreateVmwareEngineNetwork( request) { auto span = internal::MakeSpan( "vmwareengine_v1::VmwareEngineConnection::CreateVmwareEngineNetwork"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateVmwareEngineNetwork(request)); } @@ -336,7 +336,7 @@ VmwareEngineTracingConnection::UpdateVmwareEngineNetwork( request) { auto span = internal::MakeSpan( "vmwareengine_v1::VmwareEngineConnection::UpdateVmwareEngineNetwork"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateVmwareEngineNetwork(request)); } @@ -347,7 +347,7 @@ VmwareEngineTracingConnection::DeleteVmwareEngineNetwork( request) { auto span = internal::MakeSpan( "vmwareengine_v1::VmwareEngineConnection::DeleteVmwareEngineNetwork"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteVmwareEngineNetwork(request)); } @@ -367,7 +367,7 @@ VmwareEngineTracingConnection::ListVmwareEngineNetworks( google::cloud::vmwareengine::v1::ListVmwareEngineNetworksRequest request) { auto span = internal::MakeSpan( "vmwareengine_v1::VmwareEngineConnection::ListVmwareEngineNetworks"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListVmwareEngineNetworks(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::vmwareengine::v1::VmwareEngineNetwork>(std::move(span), @@ -380,7 +380,7 @@ VmwareEngineTracingConnection::CreatePrivateConnection( request) { auto span = internal::MakeSpan( "vmwareengine_v1::VmwareEngineConnection::CreatePrivateConnection"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreatePrivateConnection(request)); } @@ -400,7 +400,7 @@ VmwareEngineTracingConnection::ListPrivateConnections( google::cloud::vmwareengine::v1::ListPrivateConnectionsRequest request) { auto span = internal::MakeSpan( "vmwareengine_v1::VmwareEngineConnection::ListPrivateConnections"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListPrivateConnections(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::vmwareengine::v1::PrivateConnection>(std::move(span), @@ -413,7 +413,7 @@ VmwareEngineTracingConnection::UpdatePrivateConnection( request) { auto span = internal::MakeSpan( "vmwareengine_v1::VmwareEngineConnection::UpdatePrivateConnection"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdatePrivateConnection(request)); } @@ -424,7 +424,7 @@ VmwareEngineTracingConnection::DeletePrivateConnection( request) { auto span = internal::MakeSpan( "vmwareengine_v1::VmwareEngineConnection::DeletePrivateConnection"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeletePrivateConnection(request)); } @@ -436,7 +436,7 @@ VmwareEngineTracingConnection::ListPrivateConnectionPeeringRoutes( auto span = internal::MakeSpan( "vmwareengine_v1::VmwareEngineConnection::" "ListPrivateConnectionPeeringRoutes"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListPrivateConnectionPeeringRoutes(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::vmwareengine::v1::PeeringRoute>(std::move(span), diff --git a/google/cloud/vmwareengine/v1/internal/vmware_engine_tracing_stub.cc b/google/cloud/vmwareengine/v1/internal/vmware_engine_tracing_stub.cc index e06e5e606bce..a8b35f3ca6bb 100644 --- a/google/cloud/vmwareengine/v1/internal/vmware_engine_tracing_stub.cc +++ b/google/cloud/vmwareengine/v1/internal/vmware_engine_tracing_stub.cc @@ -61,10 +61,8 @@ VmwareEngineTracingStub::AsyncCreatePrivateCloud( google::cloud::vmwareengine::v1::CreatePrivateCloudRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.vmwareengine.v1.VmwareEngine", "CreatePrivateCloud"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreatePrivateCloud(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -76,10 +74,8 @@ VmwareEngineTracingStub::AsyncUpdatePrivateCloud( google::cloud::vmwareengine::v1::UpdatePrivateCloudRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.vmwareengine.v1.VmwareEngine", "UpdatePrivateCloud"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdatePrivateCloud(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -91,10 +87,8 @@ VmwareEngineTracingStub::AsyncDeletePrivateCloud( google::cloud::vmwareengine::v1::DeletePrivateCloudRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.vmwareengine.v1.VmwareEngine", "DeletePrivateCloud"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeletePrivateCloud(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -107,10 +101,8 @@ VmwareEngineTracingStub::AsyncUndeletePrivateCloud( request) { auto span = internal::MakeSpanGrpc( "google.cloud.vmwareengine.v1.VmwareEngine", "UndeletePrivateCloud"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUndeletePrivateCloud(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -146,10 +138,8 @@ VmwareEngineTracingStub::AsyncCreateCluster( google::cloud::vmwareengine::v1::CreateClusterRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.vmwareengine.v1.VmwareEngine", "CreateCluster"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateCluster(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -161,10 +151,8 @@ VmwareEngineTracingStub::AsyncUpdateCluster( google::cloud::vmwareengine::v1::UpdateClusterRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.vmwareengine.v1.VmwareEngine", "UpdateCluster"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateCluster(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -176,10 +164,8 @@ VmwareEngineTracingStub::AsyncDeleteCluster( google::cloud::vmwareengine::v1::DeleteClusterRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.vmwareengine.v1.VmwareEngine", "DeleteCluster"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteCluster(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -214,10 +200,8 @@ VmwareEngineTracingStub::AsyncUpdateSubnet( google::cloud::vmwareengine::v1::UpdateSubnetRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.vmwareengine.v1.VmwareEngine", "UpdateSubnet"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateSubnet(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -279,10 +263,8 @@ VmwareEngineTracingStub::AsyncResetNsxCredentials( request) { auto span = internal::MakeSpanGrpc( "google.cloud.vmwareengine.v1.VmwareEngine", "ResetNsxCredentials"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncResetNsxCredentials(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -295,10 +277,8 @@ VmwareEngineTracingStub::AsyncResetVcenterCredentials( request) { auto span = internal::MakeSpanGrpc( "google.cloud.vmwareengine.v1.VmwareEngine", "ResetVcenterCredentials"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncResetVcenterCredentials(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -311,10 +291,8 @@ VmwareEngineTracingStub::AsyncCreateHcxActivationKey( request) { auto span = internal::MakeSpanGrpc( "google.cloud.vmwareengine.v1.VmwareEngine", "CreateHcxActivationKey"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateHcxActivationKey(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -378,10 +356,8 @@ VmwareEngineTracingStub::AsyncCreateNetworkPolicy( request) { auto span = internal::MakeSpanGrpc( "google.cloud.vmwareengine.v1.VmwareEngine", "CreateNetworkPolicy"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateNetworkPolicy(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -394,10 +370,8 @@ VmwareEngineTracingStub::AsyncUpdateNetworkPolicy( request) { auto span = internal::MakeSpanGrpc( "google.cloud.vmwareengine.v1.VmwareEngine", "UpdateNetworkPolicy"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateNetworkPolicy(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -410,10 +384,8 @@ VmwareEngineTracingStub::AsyncDeleteNetworkPolicy( request) { auto span = internal::MakeSpanGrpc( "google.cloud.vmwareengine.v1.VmwareEngine", "DeleteNetworkPolicy"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteNetworkPolicy(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -426,10 +398,8 @@ VmwareEngineTracingStub::AsyncCreateVmwareEngineNetwork( request) { auto span = internal::MakeSpanGrpc( "google.cloud.vmwareengine.v1.VmwareEngine", "CreateVmwareEngineNetwork"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateVmwareEngineNetwork(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -442,10 +412,8 @@ VmwareEngineTracingStub::AsyncUpdateVmwareEngineNetwork( request) { auto span = internal::MakeSpanGrpc( "google.cloud.vmwareengine.v1.VmwareEngine", "UpdateVmwareEngineNetwork"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateVmwareEngineNetwork(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -458,10 +426,8 @@ VmwareEngineTracingStub::AsyncDeleteVmwareEngineNetwork( request) { auto span = internal::MakeSpanGrpc( "google.cloud.vmwareengine.v1.VmwareEngine", "DeleteVmwareEngineNetwork"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteVmwareEngineNetwork(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -500,10 +466,8 @@ VmwareEngineTracingStub::AsyncCreatePrivateConnection( request) { auto span = internal::MakeSpanGrpc( "google.cloud.vmwareengine.v1.VmwareEngine", "CreatePrivateConnection"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreatePrivateConnection(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -542,10 +506,8 @@ VmwareEngineTracingStub::AsyncUpdatePrivateConnection( request) { auto span = internal::MakeSpanGrpc( "google.cloud.vmwareengine.v1.VmwareEngine", "UpdatePrivateConnection"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdatePrivateConnection(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -558,10 +520,8 @@ VmwareEngineTracingStub::AsyncDeletePrivateConnection( request) { auto span = internal::MakeSpanGrpc( "google.cloud.vmwareengine.v1.VmwareEngine", "DeletePrivateConnection"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeletePrivateConnection(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -589,10 +549,8 @@ VmwareEngineTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -603,10 +561,8 @@ future VmwareEngineTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/vpcaccess/v1/internal/vpc_access_tracing_connection.cc b/google/cloud/vpcaccess/v1/internal/vpc_access_tracing_connection.cc index 2f9243d35567..9010d6573f79 100644 --- a/google/cloud/vpcaccess/v1/internal/vpc_access_tracing_connection.cc +++ b/google/cloud/vpcaccess/v1/internal/vpc_access_tracing_connection.cc @@ -37,7 +37,7 @@ VpcAccessServiceTracingConnection::CreateConnector( google::cloud::vpcaccess::v1::CreateConnectorRequest const& request) { auto span = internal::MakeSpan( "vpcaccess_v1::VpcAccessServiceConnection::CreateConnector"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateConnector(request)); } @@ -55,7 +55,7 @@ VpcAccessServiceTracingConnection::ListConnectors( google::cloud::vpcaccess::v1::ListConnectorsRequest request) { auto span = internal::MakeSpan( "vpcaccess_v1::VpcAccessServiceConnection::ListConnectors"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListConnectors(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::vpcaccess::v1::Connector>(std::move(span), std::move(sr)); @@ -66,7 +66,7 @@ VpcAccessServiceTracingConnection::DeleteConnector( google::cloud::vpcaccess::v1::DeleteConnectorRequest const& request) { auto span = internal::MakeSpan( "vpcaccess_v1::VpcAccessServiceConnection::DeleteConnector"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteConnector(request)); } diff --git a/google/cloud/vpcaccess/v1/internal/vpc_access_tracing_stub.cc b/google/cloud/vpcaccess/v1/internal/vpc_access_tracing_stub.cc index 3d2de9c10636..3ba822faa26c 100644 --- a/google/cloud/vpcaccess/v1/internal/vpc_access_tracing_stub.cc +++ b/google/cloud/vpcaccess/v1/internal/vpc_access_tracing_stub.cc @@ -37,10 +37,8 @@ VpcAccessServiceTracingStub::AsyncCreateConnector( google::cloud::vpcaccess::v1::CreateConnectorRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.vpcaccess.v1.VpcAccessService", "CreateConnector"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateConnector(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -76,10 +74,8 @@ VpcAccessServiceTracingStub::AsyncDeleteConnector( google::cloud::vpcaccess::v1::DeleteConnectorRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.vpcaccess.v1.VpcAccessService", "DeleteConnector"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteConnector(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -91,10 +87,8 @@ VpcAccessServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -105,10 +99,8 @@ future VpcAccessServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/webrisk/v1/internal/web_risk_tracing_connection.cc b/google/cloud/webrisk/v1/internal/web_risk_tracing_connection.cc index dfcc3ae42618..2d6fb0e29551 100644 --- a/google/cloud/webrisk/v1/internal/web_risk_tracing_connection.cc +++ b/google/cloud/webrisk/v1/internal/web_risk_tracing_connection.cc @@ -72,7 +72,7 @@ WebRiskServiceTracingConnection::SubmitUri( google::cloud::webrisk::v1::SubmitUriRequest const& request) { auto span = internal::MakeSpan("webrisk_v1::WebRiskServiceConnection::SubmitUri"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->SubmitUri(request)); } diff --git a/google/cloud/webrisk/v1/internal/web_risk_tracing_stub.cc b/google/cloud/webrisk/v1/internal/web_risk_tracing_stub.cc index 0193151f2c07..4043981fde48 100644 --- a/google/cloud/webrisk/v1/internal/web_risk_tracing_stub.cc +++ b/google/cloud/webrisk/v1/internal/web_risk_tracing_stub.cc @@ -85,10 +85,8 @@ WebRiskServiceTracingStub::AsyncSubmitUri( google::cloud::webrisk::v1::SubmitUriRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.webrisk.v1.WebRiskService", "SubmitUri"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncSubmitUri(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -100,10 +98,8 @@ WebRiskServiceTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -114,10 +110,8 @@ future WebRiskServiceTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/websecurityscanner/v1/internal/web_security_scanner_tracing_connection.cc b/google/cloud/websecurityscanner/v1/internal/web_security_scanner_tracing_connection.cc index 53924c7b8ec2..fbaf687845ef 100644 --- a/google/cloud/websecurityscanner/v1/internal/web_security_scanner_tracing_connection.cc +++ b/google/cloud/websecurityscanner/v1/internal/web_security_scanner_tracing_connection.cc @@ -66,7 +66,7 @@ WebSecurityScannerTracingConnection::ListScanConfigs( google::cloud::websecurityscanner::v1::ListScanConfigsRequest request) { auto span = internal::MakeSpan( "websecurityscanner_v1::WebSecurityScannerConnection::ListScanConfigs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListScanConfigs(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::websecurityscanner::v1::ScanConfig>(std::move(span), @@ -106,7 +106,7 @@ WebSecurityScannerTracingConnection::ListScanRuns( google::cloud::websecurityscanner::v1::ListScanRunsRequest request) { auto span = internal::MakeSpan( "websecurityscanner_v1::WebSecurityScannerConnection::ListScanRuns"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListScanRuns(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::websecurityscanner::v1::ScanRun>(std::move(span), @@ -127,7 +127,7 @@ WebSecurityScannerTracingConnection::ListCrawledUrls( google::cloud::websecurityscanner::v1::ListCrawledUrlsRequest request) { auto span = internal::MakeSpan( "websecurityscanner_v1::WebSecurityScannerConnection::ListCrawledUrls"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListCrawledUrls(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::websecurityscanner::v1::CrawledUrl>(std::move(span), @@ -148,7 +148,7 @@ WebSecurityScannerTracingConnection::ListFindings( google::cloud::websecurityscanner::v1::ListFindingsRequest request) { auto span = internal::MakeSpan( "websecurityscanner_v1::WebSecurityScannerConnection::ListFindings"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListFindings(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::websecurityscanner::v1::Finding>(std::move(span), diff --git a/google/cloud/workflows/executions/v1/internal/executions_tracing_connection.cc b/google/cloud/workflows/executions/v1/internal/executions_tracing_connection.cc index b1e3f5604c71..e119338e0e86 100644 --- a/google/cloud/workflows/executions/v1/internal/executions_tracing_connection.cc +++ b/google/cloud/workflows/executions/v1/internal/executions_tracing_connection.cc @@ -37,7 +37,7 @@ ExecutionsTracingConnection::ListExecutions( google::cloud::workflows::executions::v1::ListExecutionsRequest request) { auto span = internal::MakeSpan( "workflows_executions_v1::ExecutionsConnection::ListExecutions"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListExecutions(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::workflows::executions::v1::Execution>(std::move(span), diff --git a/google/cloud/workflows/v1/internal/workflows_tracing_connection.cc b/google/cloud/workflows/v1/internal/workflows_tracing_connection.cc index c53bcc728740..95fd9654eb78 100644 --- a/google/cloud/workflows/v1/internal/workflows_tracing_connection.cc +++ b/google/cloud/workflows/v1/internal/workflows_tracing_connection.cc @@ -37,7 +37,7 @@ WorkflowsTracingConnection::ListWorkflows( google::cloud::workflows::v1::ListWorkflowsRequest request) { auto span = internal::MakeSpan("workflows_v1::WorkflowsConnection::ListWorkflows"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListWorkflows(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::workflows::v1::Workflow>(std::move(span), std::move(sr)); @@ -57,7 +57,7 @@ WorkflowsTracingConnection::CreateWorkflow( google::cloud::workflows::v1::CreateWorkflowRequest const& request) { auto span = internal::MakeSpan("workflows_v1::WorkflowsConnection::CreateWorkflow"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateWorkflow(request)); } @@ -66,7 +66,7 @@ WorkflowsTracingConnection::DeleteWorkflow( google::cloud::workflows::v1::DeleteWorkflowRequest const& request) { auto span = internal::MakeSpan("workflows_v1::WorkflowsConnection::DeleteWorkflow"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteWorkflow(request)); } @@ -75,7 +75,7 @@ WorkflowsTracingConnection::UpdateWorkflow( google::cloud::workflows::v1::UpdateWorkflowRequest const& request) { auto span = internal::MakeSpan("workflows_v1::WorkflowsConnection::UpdateWorkflow"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateWorkflow(request)); } diff --git a/google/cloud/workflows/v1/internal/workflows_tracing_stub.cc b/google/cloud/workflows/v1/internal/workflows_tracing_stub.cc index 125fb271e725..4ed75c2ff149 100644 --- a/google/cloud/workflows/v1/internal/workflows_tracing_stub.cc +++ b/google/cloud/workflows/v1/internal/workflows_tracing_stub.cc @@ -60,10 +60,8 @@ WorkflowsTracingStub::AsyncCreateWorkflow( google::cloud::workflows::v1::CreateWorkflowRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.workflows.v1.Workflows", "CreateWorkflow"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateWorkflow(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -75,10 +73,8 @@ WorkflowsTracingStub::AsyncDeleteWorkflow( google::cloud::workflows::v1::DeleteWorkflowRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.workflows.v1.Workflows", "DeleteWorkflow"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteWorkflow(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -90,10 +86,8 @@ WorkflowsTracingStub::AsyncUpdateWorkflow( google::cloud::workflows::v1::UpdateWorkflowRequest const& request) { auto span = internal::MakeSpanGrpc("google.cloud.workflows.v1.Workflows", "UpdateWorkflow"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateWorkflow(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -105,10 +99,8 @@ WorkflowsTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -119,10 +111,8 @@ future WorkflowsTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } diff --git a/google/cloud/workstations/v1/internal/workstations_tracing_connection.cc b/google/cloud/workstations/v1/internal/workstations_tracing_connection.cc index b3f1f1e95fcf..8052e9d135fe 100644 --- a/google/cloud/workstations/v1/internal/workstations_tracing_connection.cc +++ b/google/cloud/workstations/v1/internal/workstations_tracing_connection.cc @@ -47,7 +47,7 @@ WorkstationsTracingConnection::ListWorkstationClusters( google::cloud::workstations::v1::ListWorkstationClustersRequest request) { auto span = internal::MakeSpan( "workstations_v1::WorkstationsConnection::ListWorkstationClusters"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListWorkstationClusters(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::workstations::v1::WorkstationCluster>(std::move(span), @@ -60,7 +60,7 @@ WorkstationsTracingConnection::CreateWorkstationCluster( request) { auto span = internal::MakeSpan( "workstations_v1::WorkstationsConnection::CreateWorkstationCluster"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateWorkstationCluster(request)); } @@ -71,7 +71,7 @@ WorkstationsTracingConnection::UpdateWorkstationCluster( request) { auto span = internal::MakeSpan( "workstations_v1::WorkstationsConnection::UpdateWorkstationCluster"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateWorkstationCluster(request)); } @@ -82,7 +82,7 @@ WorkstationsTracingConnection::DeleteWorkstationCluster( request) { auto span = internal::MakeSpan( "workstations_v1::WorkstationsConnection::DeleteWorkstationCluster"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteWorkstationCluster(request)); } @@ -102,7 +102,7 @@ WorkstationsTracingConnection::ListWorkstationConfigs( google::cloud::workstations::v1::ListWorkstationConfigsRequest request) { auto span = internal::MakeSpan( "workstations_v1::WorkstationsConnection::ListWorkstationConfigs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListWorkstationConfigs(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::workstations::v1::WorkstationConfig>(std::move(span), @@ -115,7 +115,7 @@ WorkstationsTracingConnection::ListUsableWorkstationConfigs( request) { auto span = internal::MakeSpan( "workstations_v1::WorkstationsConnection::ListUsableWorkstationConfigs"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListUsableWorkstationConfigs(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::workstations::v1::WorkstationConfig>(std::move(span), @@ -128,7 +128,7 @@ WorkstationsTracingConnection::CreateWorkstationConfig( request) { auto span = internal::MakeSpan( "workstations_v1::WorkstationsConnection::CreateWorkstationConfig"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateWorkstationConfig(request)); } @@ -139,7 +139,7 @@ WorkstationsTracingConnection::UpdateWorkstationConfig( request) { auto span = internal::MakeSpan( "workstations_v1::WorkstationsConnection::UpdateWorkstationConfig"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateWorkstationConfig(request)); } @@ -150,7 +150,7 @@ WorkstationsTracingConnection::DeleteWorkstationConfig( request) { auto span = internal::MakeSpan( "workstations_v1::WorkstationsConnection::DeleteWorkstationConfig"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteWorkstationConfig(request)); } @@ -169,7 +169,7 @@ WorkstationsTracingConnection::ListWorkstations( google::cloud::workstations::v1::ListWorkstationsRequest request) { auto span = internal::MakeSpan( "workstations_v1::WorkstationsConnection::ListWorkstations"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListWorkstations(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::workstations::v1::Workstation>(std::move(span), @@ -181,7 +181,7 @@ WorkstationsTracingConnection::ListUsableWorkstations( google::cloud::workstations::v1::ListUsableWorkstationsRequest request) { auto span = internal::MakeSpan( "workstations_v1::WorkstationsConnection::ListUsableWorkstations"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); auto sr = child_->ListUsableWorkstations(std::move(request)); return internal::MakeTracedStreamRange< google::cloud::workstations::v1::Workstation>(std::move(span), @@ -193,7 +193,7 @@ WorkstationsTracingConnection::CreateWorkstation( google::cloud::workstations::v1::CreateWorkstationRequest const& request) { auto span = internal::MakeSpan( "workstations_v1::WorkstationsConnection::CreateWorkstation"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->CreateWorkstation(request)); } @@ -202,7 +202,7 @@ WorkstationsTracingConnection::UpdateWorkstation( google::cloud::workstations::v1::UpdateWorkstationRequest const& request) { auto span = internal::MakeSpan( "workstations_v1::WorkstationsConnection::UpdateWorkstation"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->UpdateWorkstation(request)); } @@ -211,7 +211,7 @@ WorkstationsTracingConnection::DeleteWorkstation( google::cloud::workstations::v1::DeleteWorkstationRequest const& request) { auto span = internal::MakeSpan( "workstations_v1::WorkstationsConnection::DeleteWorkstation"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->DeleteWorkstation(request)); } @@ -220,7 +220,7 @@ WorkstationsTracingConnection::StartWorkstation( google::cloud::workstations::v1::StartWorkstationRequest const& request) { auto span = internal::MakeSpan( "workstations_v1::WorkstationsConnection::StartWorkstation"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->StartWorkstation(request)); } @@ -229,7 +229,7 @@ WorkstationsTracingConnection::StopWorkstation( google::cloud::workstations::v1::StopWorkstationRequest const& request) { auto span = internal::MakeSpan( "workstations_v1::WorkstationsConnection::StopWorkstation"); - auto scope = opentelemetry::trace::Scope(span); + internal::OTelScope scope(span); return internal::EndSpan(std::move(span), child_->StopWorkstation(request)); } diff --git a/google/cloud/workstations/v1/internal/workstations_tracing_stub.cc b/google/cloud/workstations/v1/internal/workstations_tracing_stub.cc index 927e185d9d22..c4f275f0f9d0 100644 --- a/google/cloud/workstations/v1/internal/workstations_tracing_stub.cc +++ b/google/cloud/workstations/v1/internal/workstations_tracing_stub.cc @@ -64,10 +64,8 @@ WorkstationsTracingStub::AsyncCreateWorkstationCluster( request) { auto span = internal::MakeSpanGrpc( "google.cloud.workstations.v1.Workstations", "CreateWorkstationCluster"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateWorkstationCluster(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -80,10 +78,8 @@ WorkstationsTracingStub::AsyncUpdateWorkstationCluster( request) { auto span = internal::MakeSpanGrpc( "google.cloud.workstations.v1.Workstations", "UpdateWorkstationCluster"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateWorkstationCluster(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -96,10 +92,8 @@ WorkstationsTracingStub::AsyncDeleteWorkstationCluster( request) { auto span = internal::MakeSpanGrpc( "google.cloud.workstations.v1.Workstations", "DeleteWorkstationCluster"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteWorkstationCluster(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -152,10 +146,8 @@ WorkstationsTracingStub::AsyncCreateWorkstationConfig( request) { auto span = internal::MakeSpanGrpc( "google.cloud.workstations.v1.Workstations", "CreateWorkstationConfig"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateWorkstationConfig(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -168,10 +160,8 @@ WorkstationsTracingStub::AsyncUpdateWorkstationConfig( request) { auto span = internal::MakeSpanGrpc( "google.cloud.workstations.v1.Workstations", "UpdateWorkstationConfig"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateWorkstationConfig(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -184,10 +174,8 @@ WorkstationsTracingStub::AsyncDeleteWorkstationConfig( request) { auto span = internal::MakeSpanGrpc( "google.cloud.workstations.v1.Workstations", "DeleteWorkstationConfig"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteWorkstationConfig(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -236,10 +224,8 @@ WorkstationsTracingStub::AsyncCreateWorkstation( google::cloud::workstations::v1::CreateWorkstationRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.workstations.v1.Workstations", "CreateWorkstation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCreateWorkstation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -251,10 +237,8 @@ WorkstationsTracingStub::AsyncUpdateWorkstation( google::cloud::workstations::v1::UpdateWorkstationRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.workstations.v1.Workstations", "UpdateWorkstation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncUpdateWorkstation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -266,10 +250,8 @@ WorkstationsTracingStub::AsyncDeleteWorkstation( google::cloud::workstations::v1::DeleteWorkstationRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.workstations.v1.Workstations", "DeleteWorkstation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncDeleteWorkstation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -281,10 +263,8 @@ WorkstationsTracingStub::AsyncStartWorkstation( google::cloud::workstations::v1::StartWorkstationRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.workstations.v1.Workstations", "StartWorkstation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncStartWorkstation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -296,10 +276,8 @@ WorkstationsTracingStub::AsyncStopWorkstation( google::cloud::workstations::v1::StopWorkstationRequest const& request) { auto span = internal::MakeSpanGrpc( "google.cloud.workstations.v1.Workstations", "StopWorkstation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncStopWorkstation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -324,10 +302,8 @@ WorkstationsTracingStub::AsyncGetOperation( google::longrunning::GetOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "GetOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncGetOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); } @@ -338,10 +314,8 @@ future WorkstationsTracingStub::AsyncCancelOperation( google::longrunning::CancelOperationRequest const& request) { auto span = internal::MakeSpanGrpc("google.longrunning.Operations", "CancelOperation"); - { - auto scope = opentelemetry::trace::Scope(span); - internal::InjectTraceContext(*context, *propagator_); - } + internal::OTelScope scope(span); + internal::InjectTraceContext(*context, *propagator_); auto f = child_->AsyncCancelOperation(cq, context, request); return internal::EndSpan(std::move(context), std::move(span), std::move(f)); }