From d73e01e5b90be91150a3551eb6fa963c30f9fcaa Mon Sep 17 00:00:00 2001 From: Xiang Zhang Date: Mon, 27 Jul 2020 20:06:11 -0700 Subject: [PATCH] remove ENABLE_TELEMETRY macro (#4633) --- include/onnxruntime/core/platform/windows/TraceLoggingConfig.h | 2 +- .../github/azure-pipelines/templates/telemetry-steps.yml | 2 +- tools/ci_build/github/azure-pipelines/templates/win-ci-2019.yml | 2 +- tools/ci_build/github/azure-pipelines/templates/win-ci-arm.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/onnxruntime/core/platform/windows/TraceLoggingConfig.h b/include/onnxruntime/core/platform/windows/TraceLoggingConfig.h index 77114ecdf8..2ee92a8938 100644 --- a/include/onnxruntime/core/platform/windows/TraceLoggingConfig.h +++ b/include/onnxruntime/core/platform/windows/TraceLoggingConfig.h @@ -23,7 +23,7 @@ Environment: // Configuration macro for use in TRACELOGGING_DEFINE_PROVIDER. The definition // in this file configures the provider as a normal (non-telemetry) provider. -#ifndef ENABLE_TELEMETRY +#ifndef TraceLoggingOptionMicrosoftTelemetry #define TraceLoggingOptionMicrosoftTelemetry() \ TraceLoggingOptionGroup(0000000000, 00000, 00000, 0000, 0000, 0000, 0000, 0000, 000, 0000, 0000) // Empty definition for TraceLoggingOptionMicrosoftTelemetry diff --git a/tools/ci_build/github/azure-pipelines/templates/telemetry-steps.yml b/tools/ci_build/github/azure-pipelines/templates/telemetry-steps.yml index ed8b7f8f45..c309dd9fc5 100644 --- a/tools/ci_build/github/azure-pipelines/templates/telemetry-steps.yml +++ b/tools/ci_build/github/azure-pipelines/templates/telemetry-steps.yml @@ -12,7 +12,7 @@ steps: - powershell: | $length = $env:TELEMETRYGUID.length - $fileContent = "#define ENABLE_TELEMETRY`n#define TraceLoggingOptionMicrosoftTelemetry() \ + $fileContent = "#define TraceLoggingOptionMicrosoftTelemetry() \ TraceLoggingOptionGroup("+$env:TELEMETRYGUID.substring(1, $length-2)+")" New-Item -Path "$(Build.SourcesDirectory)\include\onnxruntime\core\platform\windows\TraceLoggingConfigPrivate.h" -ItemType "file" -Value "$fileContent" -Force displayName: 'Create TraceLoggingConfigPrivate.h For WinML Telemetry' diff --git a/tools/ci_build/github/azure-pipelines/templates/win-ci-2019.yml b/tools/ci_build/github/azure-pipelines/templates/win-ci-2019.yml index 9fa4134d12..8b22a8cadd 100644 --- a/tools/ci_build/github/azure-pipelines/templates/win-ci-2019.yml +++ b/tools/ci_build/github/azure-pipelines/templates/win-ci-2019.yml @@ -54,7 +54,7 @@ jobs: if($env:TELEMETRYGUID) { $length = $env:TELEMETRYGUID.length - $fileContent = "#define ENABLE_TELEMETRY`n#define TraceLoggingOptionMicrosoftTelemetry() \ + $fileContent = "#define TraceLoggingOptionMicrosoftTelemetry() \ TraceLoggingOptionGroup("+$env:TELEMETRYGUID.substring(1, $length-2)+")" New-Item -Path "$(Build.SourcesDirectory)\include\onnxruntime\core\platform\windows\TraceLoggingConfigPrivate.h" -ItemType "file" -Value "$fileContent" -Force Write-Output "Enabling TELEMETRY" diff --git a/tools/ci_build/github/azure-pipelines/templates/win-ci-arm.yml b/tools/ci_build/github/azure-pipelines/templates/win-ci-arm.yml index 947983f9f0..d2269c532d 100644 --- a/tools/ci_build/github/azure-pipelines/templates/win-ci-arm.yml +++ b/tools/ci_build/github/azure-pipelines/templates/win-ci-arm.yml @@ -34,7 +34,7 @@ jobs: if($env:TELEMETRYGUID) { $length = $env:TELEMETRYGUID.length - $fileContent = "#define ENABLE_TELEMETRY`n#define TraceLoggingOptionMicrosoftTelemetry() \ + $fileContent = "#define TraceLoggingOptionMicrosoftTelemetry() \ TraceLoggingOptionGroup("+$env:TELEMETRYGUID.substring(1, $length-2)+")" New-Item -Path "$(Build.SourcesDirectory)\include\onnxruntime\core\platform\windows\TraceLoggingConfigPrivate.h" -ItemType "file" -Value "$fileContent" -Force Write-Output "Enabling TELEMETRY"