Skip to content

Commit

Permalink
Renaming
Browse files Browse the repository at this point in the history
  • Loading branch information
rafaelldi committed Dec 21, 2023
1 parent cdf16e5 commit bd2a881
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,11 @@ class AspireHostExecutorFactory(

val debugSessionToken = UUID.randomUUID().toString()
val debugSessionPort = NetUtils.findFreePort(67800)
val otlpEndpointPort = NetUtils.findFreePort(87800)
val openTelemetryProtocolEndpointPort = NetUtils.findFreePort(87800)
envs[DEBUG_SESSION_TOKEN] = debugSessionToken
envs[DEBUG_SESSION_PORT] = "localhost:$debugSessionPort"
if (AspireSettings.getInstance().collectTelemetry)
envs[DOTNET_DASHBOARD_OTLP_ENDPOINT_URL] = "http://localhost:$otlpEndpointPort"
envs[DOTNET_DASHBOARD_OTLP_ENDPOINT_URL] = "http://localhost:$openTelemetryProtocolEndpointPort"

return DotNetExecutable(
projectOutput.exePath,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ class AspireHostProgramRunner : DotNetProgramRunner() {

val dashboardUrl = environmentVariables[ASPNETCORE_URLS]
LOG.trace("Found $ASPNETCORE_URLS $dashboardUrl")
val otlpEndpointUrl = environmentVariables[DOTNET_DASHBOARD_OTLP_ENDPOINT_URL]
LOG.trace("Found $DOTNET_DASHBOARD_OTLP_ENDPOINT_URL $otlpEndpointUrl")
val openTelemetryProtocolUrl = environmentVariables[DOTNET_DASHBOARD_OTLP_ENDPOINT_URL]
LOG.trace("Found $DOTNET_DASHBOARD_OTLP_ENDPOINT_URL $openTelemetryProtocolUrl")

val runProfileName = environment.runProfile.name
val isDebug = environment.executor.id == DefaultDebugExecutor.EXECUTOR_ID
Expand All @@ -69,7 +69,7 @@ class AspireHostProgramRunner : DotNetProgramRunner() {
debugSessionPort,
openTelemetryPort,
dashboardUrl,
otlpEndpointUrl
openTelemetryProtocolUrl
)
LOG.trace("Aspire session host config: $config")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ data class AspireSessionHostConfig(
val debugSessionPort: Int,
val openTelemetryPort: Int,
val dashboardUrl: String?,
val otlpEndpointUrl: String?
val openTelemetryProtocolUrl: String?
)
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ class AspireSessionHostRunner {
put(RIDER_OTEL_PORT, hostConfig.openTelemetryPort.toString())
put(RIDER_RD_PORT, "${protocol.wire.serverPort}")
put(RIDER_PARENT_PROCESS_PID, ProcessHandle.current().pid().toString())
if (hostConfig.otlpEndpointUrl != null)
put(DOTNET_OTLP_ENDPOINT_URL, hostConfig.otlpEndpointUrl)
if (hostConfig.openTelemetryProtocolUrl != null)
put(DOTNET_OTLP_ENDPOINT_URL, hostConfig.openTelemetryProtocolUrl)
}
)
LOG.trace("Host command line: ${commandLine.commandLineString}")
Expand Down

0 comments on commit bd2a881

Please sign in to comment.