Skip to content
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

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

Merged
merged 5 commits into from
Nov 28, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c0850d8
Bump OTel .NET AutoInstrumentation to 0.5.0
pellared Nov 24, 2022
527cd76
Update DOTNET_STARTUP_HOOKS
pellared Nov 24, 2022
f20131c
Update versions.txt
pellared Nov 24, 2022
5e10455
Merge branch 'main' into patch-1
pavolloffay Nov 26, 2022
51038a8
Merge branch 'main' into patch-1
pellared Nov 26, 2022
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
2 changes: 1 addition & 1 deletion autoinstrumentation/dotnet/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/instrumentation/dotnet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions tests/e2e/instrumentation-dotnet-multicontainer/01-assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/instrumentation-dotnet-multicontainer/02-assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/instrumentation-dotnet/01-assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion versions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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