Skip to content

GH-49169: [C++] Add ApplicationId to AzureFileSystem for SDK calls #49301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kou merged 2 commits into from
Feb 18, 2026
+21 −11
Merged

GH-49169: [C++] Add ApplicationId to AzureFileSystem for SDK calls #49301

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
118d617
Add ApplicationId to AzureFileSystem for SDK calls
nateprewitt Feb 6, 2026
0cf4415
Consolidate ApplicationId construction to a helper
nateprewitt Feb 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 21 additions & 11 deletions cpp/src/arrow/filesystem/azurefs.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
#include <azure/storage/files/datalake.hpp>

#include "arrow/buffer.h"
#include "arrow/config.h"
#include "arrow/filesystem/path_util.h"
#include "arrow/filesystem/util_internal.h"
#include "arrow/io/util_internal.h"
Expand Down Expand Up @@ -303,6 +304,10 @@ Status ExceptionToStatus(const Azure::Core::RequestFailedException& exception,
return Status::IOError(std::forward<PrefixArgs>(prefix_args)..., " Azure Error: [",
exception.ErrorCode, "] ", exception.what());
}

std::string BuildApplicationId() {
return "azpartner-arrow/" + GetBuildInfo().version_string;
}
} // namespace

std::string AzureOptions::AccountBlobUrl(const std::string& account_name) const {
Expand Down Expand Up @@ -386,9 +391,12 @@ Result<std::unique_ptr<Blobs::BlobServiceClient>> AzureOptions::MakeBlobServiceC
return Status::Invalid("AzureOptions::blob_storage_scheme must be http or https: ",
blob_storage_scheme);
}
Blobs::BlobClientOptions client_options;
client_options.Telemetry.ApplicationId = BuildApplicationId();
switch (credential_kind_) {
case CredentialKind::kAnonymous:
return std::make_unique<Blobs::BlobServiceClient>(AccountBlobUrl(account_name));
return std::make_unique<Blobs::BlobServiceClient>(AccountBlobUrl(account_name),
client_options);
case CredentialKind::kDefault:
if (!token_credential_) {
token_credential_ = std::make_shared<Azure::Identity::DefaultAzureCredential>();
Expand All @@ -399,14 +407,14 @@ Result<std::unique_ptr<Blobs::BlobServiceClient>> AzureOptions::MakeBlobServiceC
case CredentialKind::kCLI:
case CredentialKind::kWorkloadIdentity:
case CredentialKind::kEnvironment:
return std::make_unique<Blobs::BlobServiceClient>(AccountBlobUrl(account_name),
token_credential_);
return std::make_unique<Blobs::BlobServiceClient>(
AccountBlobUrl(account_name), token_credential_, client_options);
case CredentialKind::kStorageSharedKey:
return std::make_unique<Blobs::BlobServiceClient>(AccountBlobUrl(account_name),
storage_shared_key_credential_);
return std::make_unique<Blobs::BlobServiceClient>(
AccountBlobUrl(account_name), storage_shared_key_credential_, client_options);
case CredentialKind::kSASToken:
return std::make_unique<Blobs::BlobServiceClient>(AccountBlobUrl(account_name) +
sas_token_);
return std::make_unique<Blobs::BlobServiceClient>(
AccountBlobUrl(account_name) + sas_token_, client_options);
}
return Status::Invalid("AzureOptions doesn't contain a valid auth configuration");
}
Expand All @@ -420,10 +428,12 @@ AzureOptions::MakeDataLakeServiceClient() const {
return Status::Invalid("AzureOptions::dfs_storage_scheme must be http or https: ",
dfs_storage_scheme);
}
DataLake::DataLakeClientOptions client_options;
client_options.Telemetry.ApplicationId = BuildApplicationId();
switch (credential_kind_) {
case CredentialKind::kAnonymous:
return std::make_unique<DataLake::DataLakeServiceClient>(
AccountDfsUrl(account_name));
AccountDfsUrl(account_name), client_options);
case CredentialKind::kDefault:
if (!token_credential_) {
token_credential_ = std::make_shared<Azure::Identity::DefaultAzureCredential>();
Expand All @@ -435,13 +445,13 @@ AzureOptions::MakeDataLakeServiceClient() const {
case CredentialKind::kWorkloadIdentity:
case CredentialKind::kEnvironment:
return std::make_unique<DataLake::DataLakeServiceClient>(
AccountDfsUrl(account_name), token_credential_);
AccountDfsUrl(account_name), token_credential_, client_options);
case CredentialKind::kStorageSharedKey:
return std::make_unique<DataLake::DataLakeServiceClient>(
AccountDfsUrl(account_name), storage_shared_key_credential_);
AccountDfsUrl(account_name), storage_shared_key_credential_, client_options);
case CredentialKind::kSASToken:
return std::make_unique<DataLake::DataLakeServiceClient>(
AccountBlobUrl(account_name) + sas_token_);
AccountBlobUrl(account_name) + sas_token_, client_options);
}
return Status::Invalid("AzureOptions doesn't contain a valid auth configuration");
}
Expand Down
Loading