Change to SIGNALFX_ env vars (#145)

* change to signalfx vars

Signed-off-by: RassK <[email protected]>

* revert ultimate pipeline

Signed-off-by: RassK <[email protected]>

* fix some additional namings

* update docs

* fix some additional namings

* fix copyright

Co-authored-by: Paulo Janotti <[email protected]>

Author: RassK

.azure-pipelines/mininal-pipeline.yml

@@ -57,8 +57,8 @@ variables:
   ddTracerHome: $(System.DefaultWorkingDirectory)/tracer/src/bin/dd-tracer-home
   tracerHome: $(System.DefaultWorkingDirectory)/tracer/src/bin/windows-tracer-home
   artifacts: $(System.DefaultWorkingDirectory)/tracer/src/bin/artifacts
-  ddApiKey: $(DD_API_KEY)
-  DD_DOTNET_TRACER_MSBUILD:
+  ddApiKey: $(SIGNALFX_API_KEY)
+  SIGNALFX_DOTNET_TRACER_MSBUILD:
   NugetPackageDirectory: $(System.DefaultWorkingDirectory)/packages
   relativeNugetPackageDirectory: packages
   # For scheduled builds, only run benchmarks and crank (and deps).
@@ -74,8 +74,8 @@ resources:
     ports:
     - 8126:8126
     env:
-      DD_API_KEY: $(ddApiKey)
-      DD_INSIDE_CI: true
+      SIGNALFX_API_KEY: $(ddApiKey)
+      SIGNALFX_INSIDE_CI: true
 
 # Stages
 stages:

.azure-pipelines/setup_tracer.ps1

@@ -2,81 +2,81 @@ $ProgressPreference = 'SilentlyContinue'
 
 echo "Getting latest release version"
 # Get the latest release tag from the github release page
-$release_version = (Invoke-WebRequest https://api.github.com/repos/datadog/dd-trace-dotnet/releases | ConvertFrom-Json)[0].tag_name.SubString(1)
+$release_version = (Invoke-WebRequest https://api.github.com/repos/signalfx/signalfx-dotnet-tracing/releases | ConvertFrom-Json)[0].tag_name.SubString(1)
 
-$otel_tracer_workingfolder = $env:OTEL_TRACER_WORKINGFOLDER
-$otel_tracer_home = ""
-$otel_tracer_msbuild = ""
-$otel_tracer_integrations = ""
-$otel_tracer_profiler_32 = ""
-$otel_tracer_profiler_64 = ""
+$signalfx_tracer_workingfolder = $env:SIGNALFX_TRACER_WORKINGFOLDER
+$signalfx_tracer_home = ""
+$signalfx_tracer_msbuild = ""
+$signalfx_tracer_integrations = ""
+$signalfx_tracer_profiler_32 = ""
+$signalfx_tracer_profiler_64 = ""
 
 
 # Download the binary file depending of the current operating system and extract the content to the "release" folder 
 echo "Downloading tracer v$release_version"
 if ($env:os -eq "Windows_NT") 
 {
-    $url = "https://github.com/DataDog/dd-trace-dotnet/releases/download/v$($release_version)/windows-tracer-home.zip"
+    $url = "https://github.com/signalfx/signalfx-dotnet-tracing/releases/download/v$($release_version)/windows-tracer-home.zip"
 
     Invoke-WebRequest -Uri $url -OutFile windows.zip
     echo "Extracting windows.zip"
     Expand-Archive windows.zip -DestinationPath .\release
     Remove-Item windows.zip
 
-    if ([string]::IsNullOrEmpty($otel_tracer_workingfolder)) {
-        $otel_tracer_home = "$(pwd)\release"
+    if ([string]::IsNullOrEmpty($signalfx_tracer_workingfolder)) {
+        $signalfx_tracer_home = "$(pwd)\release"
     } else {
-        $otel_tracer_home = "$otel_tracer_workingfolder\release"
+        $signalfx_tracer_home = "$signalfx_tracer_workingfolder\release"
     }
 
-    $otel_tracer_msbuild = "$otel_tracer_home\netstandard2.0\OpenTelemetry.AutoInstrumentation.MSBuild.dll"
-    $otel_tracer_integrations = "$otel_tracer_home\integrations.json"
-    $otel_tracer_profiler_32 = "$otel_tracer_home\win-x86\OpenTelemetry.AutoInstrumentation.ClrProfiler.Native.dll"
-    $otel_tracer_profiler_64 = "$otel_tracer_home\win-x64\OpenTelemetry.AutoInstrumentation.ClrProfiler.Native.dll"
+    $signalfx_tracer_msbuild = "$signalfx_tracer_home\netstandard2.0\OpenTelemetry.AutoInstrumentation.MSBuild.dll"
+    $signalfx_tracer_integrations = "$signalfx_tracer_home\integrations.json"
+    $signalfx_tracer_profiler_32 = "$signalfx_tracer_home\win-x86\OpenTelemetry.AutoInstrumentation.ClrProfiler.Native.dll"
+    $signalfx_tracer_profiler_64 = "$signalfx_tracer_home\win-x64\OpenTelemetry.AutoInstrumentation.ClrProfiler.Native.dll"
 } 
 else 
 {
     # File version is the same as the release version without the prerelease suffix.
     $file_version = $release_version.replace("-prerelease", "")
 
-    $url = "https://github.com/DataDog/dd-trace-dotnet/releases/download/v$($release_version)/datadog-dotnet-apm-$($file_version).tar.gz"
+    $url = "https://github.com/signalfx/signalfx-dotnet-tracing/releases/download/v$($release_version)/signalfx-dotnet-tracing-$($file_version).tar.gz"
 
     Invoke-WebRequest -Uri $url -OutFile linux.tar.gz
     mkdir release
     echo "Extracting linux.tar.gz"
     tar -xvzf linux.tar.gz -C ./release
     Remove-Item linux.tar.gz
     # Ensure the profiler can write the native log profiler
-    sudo mkdir -p /var/log/opentelemetry/dotnet
-    sudo chmod -R 777 /var/log/opentelemetry/dotnet
+    sudo mkdir -p /var/log/signalfx/dotnet
+    sudo chmod -R 777 /var/log/signalfx/dotnet
 
-    if ([string]::IsNullOrEmpty($otel_tracer_workingfolder)) {
-        $otel_tracer_home = "$(pwd)/release"
+    if ([string]::IsNullOrEmpty($signalfx_tracer_workingfolder)) {
+        $signalfx_tracer_home = "$(pwd)/release"
     } else {
-        $otel_tracer_home = "$otel_tracer_workingfolder/release"
+        $signalfx_tracer_home = "$signalfx_tracer_workingfolder/release"
     }
 
-    $otel_tracer_msbuild = "$otel_tracer_home/netstandard2.0/OpenTelemetry.AutoInstrumentation.MSBuild.dll"
-    $otel_tracer_integrations = "$otel_tracer_home/integrations.json"
-    $otel_tracer_profiler_64 = "$otel_tracer_home/OpenTelemetry.AutoInstrumentation.ClrProfiler.Native.so"
+    $signalfx_tracer_msbuild = "$signalfx_tracer_home/netstandard2.0/OpenTelemetry.AutoInstrumentation.MSBuild.dll"
+    $signalfx_tracer_integrations = "$signalfx_tracer_home/integrations.json"
+    $signalfx_tracer_profiler_64 = "$signalfx_tracer_home/OpenTelemetry.AutoInstrumentation.ClrProfiler.Native.so"
 }
 
 # Set all environment variables to attach the profiler to the following pipeline steps
 echo "Setting environment variables..."
 
-echo "##vso[task.setvariable variable=OTEL_ENV]CI"
-echo "##vso[task.setvariable variable=OTEL_DOTNET_TRACER_HOME]$otel_tracer_home"
-echo "##vso[task.setvariable variable=OTEL_DOTNET_TRACER_MSBUILD]$otel_tracer_msbuild"
-echo "##vso[task.setvariable variable=OTEL_INTEGRATIONS]$otel_tracer_integrations"
+echo "##vso[task.setvariable variable=SIGNALFX_ENV]CI"
+echo "##vso[task.setvariable variable=SIGNALFX_DOTNET_TRACER_HOME]$signalfx_tracer_home"
+echo "##vso[task.setvariable variable=SIGNALFX_DOTNET_TRACER_MSBUILD]$signalfx_tracer_msbuild"
+echo "##vso[task.setvariable variable=SIGNALFX_INTEGRATIONS]$signalfx_tracer_integrations"
 
 echo "##vso[task.setvariable variable=CORECLR_ENABLE_PROFILING]1"
 echo "##vso[task.setvariable variable=CORECLR_PROFILER]{918728DD-259F-4A6A-AC2B-B85E1B658318}"
-echo "##vso[task.setvariable variable=CORECLR_PROFILER_PATH_32]$otel_tracer_profiler_32"
-echo "##vso[task.setvariable variable=CORECLR_PROFILER_PATH_64]$otel_tracer_profiler_64"
+echo "##vso[task.setvariable variable=CORECLR_PROFILER_PATH_32]$signalfx_tracer_profiler_32"
+echo "##vso[task.setvariable variable=CORECLR_PROFILER_PATH_64]$signalfx_tracer_profiler_64"
 
 echo "##vso[task.setvariable variable=COR_ENABLE_PROFILING]1"
 echo "##vso[task.setvariable variable=COR_PROFILER]{918728DD-259F-4A6A-AC2B-B85E1B658318}"
-echo "##vso[task.setvariable variable=COR_PROFILER_PATH_32]$otel_tracer_profiler_32"
-echo "##vso[task.setvariable variable=COR_PROFILER_PATH_64]$otel_tracer_profiler_64"
+echo "##vso[task.setvariable variable=COR_PROFILER_PATH_32]$signalfx_tracer_profiler_32"
+echo "##vso[task.setvariable variable=COR_PROFILER_PATH_64]$signalfx_tracer_profiler_64"
 
 echo "Done."

.azure-pipelines/steps/run-in-docker.yml

@@ -30,7 +30,7 @@ steps:
         --env NugetPackageDirectory=/project/$(relativeNugetPackageDirectory) \
         --env tracerHome=/project/$(relativeTracerHome) \
         --env artifacts=/project/$(relativeArtifacts) \
-        --env OTEL_CLR_ENABLE_NGEN=$(OTEL_CLR_ENABLE_NGEN) \
+        --env SIGNALFX_CLR_ENABLE_NGEN=$(SIGNALFX_CLR_ENABLE_NGEN) \
         dd-trace-dotnet/${{ parameters.baseImage }}-${{ parameters.target }} \
         dotnet /build/bin/Debug/_build.dll ${{ parameters.command }}
   displayName: Run '${{ parameters.command }}' in Docker

.azure-pipelines/third-party-test-suites.yml

@@ -13,8 +13,8 @@ schedules:
 variables:
   buildConfiguration: Release
   dotnetCoreSdk5Version: 5.0.103
-  ddApiKey: $(DD_API_KEY)
-  DD_DOTNET_TRACER_MSBUILD:
+  ddApiKey: $(SIGNALFX_API_KEY)
+  SIGNALFX_DOTNET_TRACER_MSBUILD:
   NugetPackageDirectory: $(System.DefaultWorkingDirectory)/packages
   relativeNugetPackageDirectory: packages
   dotnetToolTag: build-dotnet-tool
@@ -28,8 +28,8 @@ resources:
     ports:
     - 8126:8126
     env:
-      DD_API_KEY: $(ddApiKey)
-      DD_INSIDE_CI: true
+      SIGNALFX_API_KEY: $(ddApiKey)
+      SIGNALFX_INSIDE_CI: true
 
 stages:
 - stage: run_tests

.github/ISSUE_TEMPLATE/bug_report.md

@@ -33,6 +33,6 @@ Add any other context about the problem here.
 NOTE: To contact our support team, see https://www.datadoghq.com/support/
 When contacting support, please include the information requested above.
 If possible, also include the tracer log files found (by default) in:
-Windows: %ProgramData%\Datadog .NET Tracer\logs\
-Linux: /var/log/datadog/dotnet/
+Windows: %ProgramData%\SignalFx .NET Tracing\logs\
+Linux: /var/log/signalfx/dotnet/
 --!>

.github/workflows/workflow.yml

@@ -35,7 +35,7 @@ jobs:
           --env NugetPackageDirectory=/project/packages \
           --env tracerHome=/project/tracer/bin/tracer-home \
           --env artifacts=/project/tracer/src/bin/artifacts \
-          --env OTEL_CLR_ENABLE_NGEN=${OTEL_CLR_ENABLE_NGEN} \
+          --env SIGNALFX_CLR_ENABLE_NGEN=${SIGNALFX_CLR_ENABLE_NGEN} \
           dd-trace-dotnet/${baseImage}-builder \
           dotnet /build/bin/Debug/_build.dll Clean BuildTracerHome ZipTracerHome
     - uses: actions/upload-artifact@v2

copyright.ps1

@@ -0,0 +1,25 @@
+param(
+    [Parameter(Mandatory=$true)]
+    [string]$HASH
+)
+
+$files = git diff --name-only --diff-filter=M $HASH
+
+foreach($file in $files){
+    $content = Get-Content $file;
+    $new = @();
+    $changed = $false;
+
+    foreach($line in $content){
+        $new += $line;
+
+        if(-not $changed -and $line -match "copyright>"){
+            $new += "`r`n// Modified by Splunk Inc."
+            $changed = $true;
+        }
+    }
+
+    if($changed) {
+        Set-Content $file -Value $new
+    }
+}

defaults.env

@@ -1,5 +1,5 @@
 export CORECLR_ENABLE_PROFILING=1
 export CORECLR_PROFILER='{918728DD-259F-4A6A-AC2B-B85E1B658318}'
-export CORECLR_PROFILER_PATH=/opt/opentelemetry-dotnet-autoinstrumentation/OpenTelemetry.AutoInstrumentation.ClrProfiler.Native.so
-export OTEL_INTEGRATIONS=/opt/opentelemetry-dotnet-autoinstrumentation/integrations.json
-export OTEL_DOTNET_TRACER_HOME=/opt/opentelemetry-dotnet-autoinstrumentation
+export CORECLR_PROFILER_PATH=/opt/signalfx/OpenTelemetry.AutoInstrumentation.ClrProfiler.Native.so
+export SIGNALFX_INTEGRATIONS=/opt/signalfx/integrations.json
+export SIGNALFX_DOTNET_TRACER_HOME=/opt/signalfx

dev/envvars.sh

@@ -34,12 +34,12 @@ export CORECLR_PROFILER="{918728DD-259F-4A6A-AC2B-B85E1B658318}"
 export CORECLR_PROFILER_PATH="${PWD}/src/Datadog.Trace.ClrProfiler.Native/bin/Debug/x64/OpenTelemetry.AutoInstrumentation.ClrProfiler.Native.${SUFIX}"
 
 # Configure OpenTelemetry Tracer 
-export OTEL_DOTNET_TRACER_HOME="${PWD}/src/Datadog.Trace.ClrProfiler.Native/bin/Debug/x64"
-export OTEL_INTEGRATIONS="${PWD}/integrations.json"
-export OTEL_VERSION="1.0.0"
-export OTEL_TRACE_AGENT_URL="http://localhost:9411/api/v2/spans"
-export OTEL_TRACE_DEBUG="1"
-export OTEL_EXPORTER="Zipkin"
-export OTEL_DUMP_ILREWRITE_ENABLED="0"
-export OTEL_CLR_ENABLE_INLINING="1"
-export OTEL_CONVENTION="OpenTelemetry"
+export SIGNALFX_DOTNET_TRACER_HOME="${PWD}/src/Datadog.Trace.ClrProfiler.Native/bin/Debug/x64"
+export SIGNALFX_INTEGRATIONS="${PWD}/integrations.json"
+export SIGNALFX_VERSION="1.0.0"
+export SIGNALFX_TRACE_AGENT_URL="http://localhost:9411/api/v2/spans"
+export SIGNALFX_TRACE_DEBUG="1"
+export SIGNALFX_EXPORTER="Zipkin"
+export SIGNALFX_DUMP_ILREWRITE_ENABLED="0"
+export SIGNALFX_CLR_ENABLE_INLINING="1"
+export SIGNALFX_CONVENTION="OpenTelemetry"

devenv.bat

@@ -52,14 +52,14 @@ rem Enable .NET Core Profiling API
 SET CORECLR_ENABLE_PROFILING=1
 SET CORECLR_PROFILER={918728DD-259F-4A6A-AC2B-B85E1B658318}
 SET CORECLR_PROFILER_PATH=%~dp0\src\Datadog.Trace.ClrProfiler.Native\bin\%profiler_configuration%\%profiler_platform%\OpenTelemetry.AutoInstrumentation.ClrProfiler.Native.dll
-SET OTEL_APPSEC_ENABLED=false
+SET SIGNALFX_APPSEC_ENABLED=false
 
 rem Don't attach the profiler to these processes
-SET OTEL_PROFILER_EXCLUDE_PROCESSES=devenv.exe;JetBrains.DPA.Runner.exe;JetBrains.Debugger.Worker.exe;Rider.Backend64.exe;Microsoft.ServiceHub.Controller.exe;ServiceHub.Host.CLR.exe;ServiceHub.TestWindowStoreHost.exe;ServiceHub.DataWarehouseHost.exe;sqlservr.exe;VBCSCompiler.exe;iisexpresstray.exe;msvsmon.exe;PerfWatson2.exe;ServiceHub.IdentityHost.exe;ServiceHub.VSDetouredHost.exe;ServiceHub.SettingsHost.exe;ServiceHub.Host.CLR.x86.exe;vstest.console.exe;ServiceHub.RoslynCodeAnalysisService32.exe;testhost.x86.exe;MSBuild.exe;ServiceHub.ThreadedWaitDialog.exe
+SET SIGNALFX_PROFILER_EXCLUDE_PROCESSES=devenv.exe;JetBrains.DPA.Runner.exe;JetBrains.Debugger.Worker.exe;Rider.Backend64.exe;Microsoft.ServiceHub.Controller.exe;ServiceHub.Host.CLR.exe;ServiceHub.TestWindowStoreHost.exe;ServiceHub.DataWarehouseHost.exe;sqlservr.exe;VBCSCompiler.exe;iisexpresstray.exe;msvsmon.exe;PerfWatson2.exe;ServiceHub.IdentityHost.exe;ServiceHub.VSDetouredHost.exe;ServiceHub.SettingsHost.exe;ServiceHub.Host.CLR.x86.exe;vstest.console.exe;ServiceHub.RoslynCodeAnalysisService32.exe;testhost.x86.exe;MSBuild.exe;ServiceHub.ThreadedWaitDialog.exe
 
 rem Set dotnet tracer home path
-SET OTEL_DOTNET_TRACER_HOME=%~dp0
-SET OTEL_INTEGRATIONS=%OTEL_DOTNET_TRACER_HOME%\integrations.json
+SET SIGNALFX_DOTNET_TRACER_HOME=%~dp0
+SET SIGNALFX_INTEGRATIONS=%SIGNALFX_DOTNET_TRACER_HOME%\integrations.json
 
 if "%start_visual_studio%" == "true" (
     echo Starting Visual Studio...

docker-compose.yml

@@ -266,7 +266,7 @@ services:
     ports:
     - "8080:80"
     environment:
-      - OTEL_CLR_ENABLE_NGEN=${OTEL_CLR_ENABLE_NGEN:-0}
+      - SIGNALFX_CLR_ENABLE_NGEN=${SIGNALFX_CLR_ENABLE_NGEN:-0}
 
   IntegrationTests:
     build:
@@ -284,7 +284,7 @@ services:
       - artifacts=/project/${relativeArtifacts:-src/bin/artifacts}
       - framework=${framework:-netcoreapp3.1}
       - baseImage=${baseImage:-default}
-      - OTEL_CLR_ENABLE_NGEN=${OTEL_CLR_ENABLE_NGEN:-0}
+      - SIGNALFX_CLR_ENABLE_NGEN=${SIGNALFX_CLR_ENABLE_NGEN:-0}
       - MONGO_HOST=mongo
       - SERVICESTACK_REDIS_HOST=servicestackredis:6379
       - STACKEXCHANGE_REDIS_HOST=stackexchangeredis:6379
@@ -353,7 +353,7 @@ services:
       - artifacts=/project/${relativeArtifacts:-src/bin/artifacts}
       - framework=${framework:-netcoreapp3.1}
       - baseImage=${baseImage:-debian}
-      - OTEL_CLR_ENABLE_NGEN=${OTEL_CLR_ENABLE_NGEN:-0}
+      - SIGNALFX_CLR_ENABLE_NGEN=${SIGNALFX_CLR_ENABLE_NGEN:-0}
       - MONGO_HOST=mongo_arm64
       - SERVICESTACK_REDIS_HOST=servicestackredis_arm64:6379
       - STACKEXCHANGE_REDIS_HOST=stackexchangeredis_arm64:6379