Bump OTel .NET AutoInstrumentation to 0.5.0 - part 2 (#1274)

* Bump OTel .NET AutoInstrumentation to 0.5.0 * Update DOTNET_STARTUP_HOOKS * Update versions.txt Co-authored-by: Pavol Loffay <[email protected]>
open-telemetry · Nov 28, 2022 · ccd0b98 · ccd0b98
1 parent 30561f0
commit ccd0b98
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/autoinstrumentation/dotnet/Dockerfile b/autoinstrumentation/dotnet/Dockerfile
@@ -8,7 +8,7 @@
 #    CORECLR_PROFILER_PATH=%InstallationLocation%/OpenTelemetry.AutoInstrumentation.Native.so
 #    DOTNET_ADDITIONAL_DEPS=%InstallationLocation%/AdditionalDeps
 #    DOTNET_SHARED_STORE=%InstallationLocation%/store
-#    DOTNET_STARTUP_HOOKS=%InstallationLocation%/netcoreapp3.1/OpenTelemetry.AutoInstrumentation.StartupHook.dll 
+#    DOTNET_STARTUP_HOOKS=%InstallationLocation%/net/OpenTelemetry.AutoInstrumentation.StartupHook.dll 
 #    OTEL_DOTNET_AUTO_HOME=%InstallationLocation% 
 
 FROM busybox

diff --git a/pkg/instrumentation/dotnet.go b/pkg/instrumentation/dotnet.go
@@ -37,7 +37,7 @@ const (
 	dotNetAdditionalDepsPath            = "/otel-auto-instrumentation/AdditionalDeps"
 	dotNetOTelAutoHomePath              = "/otel-auto-instrumentation"
 	dotNetSharedStorePath               = "/otel-auto-instrumentation/store"
-	dotNetStartupHookPath               = "/otel-auto-instrumentation/netcoreapp3.1/OpenTelemetry.AutoInstrumentation.StartupHook.dll"
+	dotNetStartupHookPath               = "/otel-auto-instrumentation/net/OpenTelemetry.AutoInstrumentation.StartupHook.dll"
 )
 
 func injectDotNetSDK(dotNetSpec v1alpha1.DotNet, pod corev1.Pod, index int) (corev1.Pod, error) {

diff --git a/tests/e2e/instrumentation-dotnet-multicontainer/01-assert.yaml b/tests/e2e/instrumentation-dotnet-multicontainer/01-assert.yaml
@@ -20,7 +20,7 @@ spec:
     - name: CORECLR_PROFILER_PATH
       value: /otel-auto-instrumentation/OpenTelemetry.AutoInstrumentation.Native.so
     - name: DOTNET_STARTUP_HOOKS
-      value: /otel-auto-instrumentation/netcoreapp3.1/OpenTelemetry.AutoInstrumentation.StartupHook.dll
+      value: /otel-auto-instrumentation/net/OpenTelemetry.AutoInstrumentation.StartupHook.dll
     - name: DOTNET_ADDITIONAL_DEPS
       value: /otel-auto-instrumentation/AdditionalDeps
     - name: OTEL_DOTNET_AUTO_HOME
@@ -61,7 +61,7 @@ spec:
     - name: CORECLR_PROFILER_PATH
       value: /otel-auto-instrumentation/OpenTelemetry.AutoInstrumentation.Native.so
     - name: DOTNET_STARTUP_HOOKS
-      value: /otel-auto-instrumentation/netcoreapp3.1/OpenTelemetry.AutoInstrumentation.StartupHook.dll
+      value: /otel-auto-instrumentation/net/OpenTelemetry.AutoInstrumentation.StartupHook.dll
     - name: DOTNET_ADDITIONAL_DEPS
       value: /otel-auto-instrumentation/AdditionalDeps
     - name: OTEL_DOTNET_AUTO_HOME

diff --git a/tests/e2e/instrumentation-dotnet-multicontainer/02-assert.yaml b/tests/e2e/instrumentation-dotnet-multicontainer/02-assert.yaml
@@ -23,7 +23,7 @@ spec:
     - name: CORECLR_PROFILER_PATH
       value: /otel-auto-instrumentation/OpenTelemetry.AutoInstrumentation.Native.so
     - name: DOTNET_STARTUP_HOOKS
-      value: /otel-auto-instrumentation/netcoreapp3.1/OpenTelemetry.AutoInstrumentation.StartupHook.dll
+      value: /otel-auto-instrumentation/net/OpenTelemetry.AutoInstrumentation.StartupHook.dll
     - name: DOTNET_ADDITIONAL_DEPS
       value: /otel-auto-instrumentation/AdditionalDeps
     - name: OTEL_DOTNET_AUTO_HOME

diff --git a/tests/e2e/instrumentation-dotnet/01-assert.yaml b/tests/e2e/instrumentation-dotnet/01-assert.yaml
@@ -17,7 +17,7 @@ spec:
     - name: CORECLR_PROFILER_PATH
       value: /otel-auto-instrumentation/OpenTelemetry.AutoInstrumentation.Native.so
     - name: DOTNET_STARTUP_HOOKS
-      value: /otel-auto-instrumentation/netcoreapp3.1/OpenTelemetry.AutoInstrumentation.StartupHook.dll
+      value: /otel-auto-instrumentation/net/OpenTelemetry.AutoInstrumentation.StartupHook.dll
     - name: DOTNET_ADDITIONAL_DEPS
       value: /otel-auto-instrumentation/AdditionalDeps
     - name: OTEL_DOTNET_AUTO_HOME

diff --git a/versions.txt b/versions.txt
@@ -24,4 +24,4 @@ autoinstrumentation-python=0.34b0
 
 # Represents the current release of DotNet instrumentation.
 # Should match autoinstrumentation/dotnet/version.txt
-autoinstrumentation-dotnet=0.4.0-beta.1
+autoinstrumentation-dotnet=0.5.0