Skip to content

Commit 03d274d

Browse files
kshmidt-digmakshmidt-digma
committed
Merge branch 'main' into update-ui-2
2 parents 34d4f90 + 290ac6e commit 03d274d

File tree

58 files changed

+933
-175
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+933
-175
lines changed

‎.run/Run IDEA Community - 2025.1.run.xml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Run IDEA Community - 2025.1" type="GradleRunConfiguration" factoryName="Gradle">
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/build/idea-sandbox/system/log/idea_IC.log" />
4+
<ExternalSystemSettings>
5+
<option name="executionName" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$" />
7+
<option name="externalSystemIdString" value="GRADLE" />
8+
<option name="scriptParameters" value="-PbuildProfile=p251" />
9+
<option name="taskDescriptions">
10+
<list />
11+
</option>
12+
<option name="taskNames">
13+
<list>
14+
<option value="buildPlugin" />
15+
<option value="runIde" />
16+
</list>
17+
</option>
18+
<option name="vmOptions" value="" />
19+
</ExternalSystemSettings>
20+
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
21+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
22+
<DebugAllEnabled>false</DebugAllEnabled>
23+
<RunAsTest>false</RunAsTest>
24+
<method v="2" />
25+
</configuration>
26+
</component>

‎.run/Run IDEA Ultimate - 2025.1.run.xml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Run IDEA Ultimate - 2025.1" type="GradleRunConfiguration" factoryName="Gradle">
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/build/idea-sandbox/system/log/idea_IU.log" />
4+
<ExternalSystemSettings>
5+
<option name="executionName" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$" />
7+
<option name="externalSystemIdString" value="GRADLE" />
8+
<option name="scriptParameters" value="-PbuildWIthUltimate=true -PbuildProfile=p251" />
9+
<option name="taskDescriptions">
10+
<list />
11+
</option>
12+
<option name="taskNames">
13+
<list>
14+
<option value="buildPlugin" />
15+
<option value="runIde" />
16+
</list>
17+
</option>
18+
<option name="vmOptions" value="" />
19+
</ExternalSystemSettings>
20+
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
21+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
22+
<DebugAllEnabled>false</DebugAllEnabled>
23+
<RunAsTest>false</RunAsTest>
24+
<method v="2" />
25+
</configuration>
26+
</component>

‎.run/Run Rider - 2025.1.run.xml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Run Rider - 2025.1" type="GradleRunConfiguration" factoryName="Gradle">
3+
<log_file alias="idea.log" path="$PROJECT_DIR$/build/idea-sandbox/system/log/idea_RD.log" />
4+
<ExternalSystemSettings>
5+
<option name="executionName" />
6+
<option name="externalProjectPath" value="$PROJECT_DIR$" />
7+
<option name="externalSystemIdString" value="GRADLE" />
8+
<option name="scriptParameters" value="-PbuildWithRider=true -PbuildProfile=p243" />
9+
<option name="taskDescriptions">
10+
<list />
11+
</option>
12+
<option name="taskNames">
13+
<list>
14+
<option value="buildPlugin" />
15+
<option value="runIde" />
16+
</list>
17+
</option>
18+
<option name="vmOptions" value="" />
19+
</ExternalSystemSettings>
20+
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
21+
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
22+
<DebugAllEnabled>false</DebugAllEnabled>
23+
<RunAsTest>false</RunAsTest>
24+
<method v="2" />
25+
</configuration>
26+
</component>

‎analytics-provider/src/main/java/org/digma/intellij/plugin/analytics/AnalyticsProvider.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.digma.intellij.plugin.model.rest.assets.AssetDisplayInfo;
66
import org.digma.intellij.plugin.model.rest.codelens.*;
77
import org.digma.intellij.plugin.model.rest.codespans.CodeContextSpans;
8-
import org.digma.intellij.plugin.model.rest.common.SpanHistogramQuery;
8+
import org.digma.intellij.plugin.model.rest.common.*;
99
import org.digma.intellij.plugin.model.rest.debugger.DebuggerEventRequest;
1010
import org.digma.intellij.plugin.model.rest.env.*;
1111
import org.digma.intellij.plugin.model.rest.environment.Env;
@@ -172,4 +172,6 @@ public interface AnalyticsProvider extends Closeable {
172172
List<SpanEnvironment> getSpanEnvironmentsStats(String spanCodeObjectId);
173173

174174
DiscoveredDataResponse getDiscoveredData();
175+
176+
SpanInfoByUid resolveSpanByUid(String uid);
175177
}

‎analytics-provider/src/main/java/org/digma/intellij/plugin/analytics/RestAnalyticsProvider.java‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import org.digma.intellij.plugin.model.rest.assets.AssetDisplayInfo;
1212
import org.digma.intellij.plugin.model.rest.codelens.*;
1313
import org.digma.intellij.plugin.model.rest.codespans.CodeContextSpans;
14-
import org.digma.intellij.plugin.model.rest.common.SpanHistogramQuery;
14+
import org.digma.intellij.plugin.model.rest.common.*;
1515
import org.digma.intellij.plugin.model.rest.debugger.DebuggerEventRequest;
1616
import org.digma.intellij.plugin.model.rest.env.*;
1717
import org.digma.intellij.plugin.model.rest.environment.Env;
@@ -489,6 +489,11 @@ public DiscoveredDataResponse getDiscoveredData() {
489489
return execute(client.analyticsProvider::getDiscoveredData);
490490
}
491491

492+
@Override
493+
public SpanInfoByUid resolveSpanByUid(String uid){
494+
return execute(() -> client.analyticsProvider.resolveSpanByUid(uid));
495+
}
496+
492497
@Override
493498
public HttpResponse lowLevelCall(HttpRequest request) {
494499

@@ -1284,5 +1289,11 @@ Call<Void> setInsightCustomStartTime(
12841289
})
12851290
@GET("CodeAnalytics/discovered-data")
12861291
Call<DiscoveredDataResponse> getDiscoveredData();
1292+
1293+
@Headers({
1294+
"Content-Type:application/json"
1295+
})
1296+
@GET("spans/spanCodeObjectId/{uid}")
1297+
Call<SpanInfoByUid> resolveSpanByUid(@Path("uid") String uid);
12871298
}
12881299
}

‎build.gradle.kts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ tasks {
253253
//to upgrade gradle change the version here and run:
254254
//./gradlew wrapper --gradle-version 8.8
255255
//check that gradle/wrapper/gradle-wrapper.properties was changed
256-
gradleVersion = "8.10"
256+
gradleVersion = "8.11"
257257
distributionType = Wrapper.DistributionType.ALL
258258
distributionBase = Wrapper.PathBase.GRADLE_USER_HOME
259259
distributionPath = "wrapper/dists"
@@ -316,7 +316,7 @@ tasks {
316316
"org.digma.plugin.auth.debug" to "true",
317317

318318
//see https://kotlin.github.io/analysis-api/testing-in-k2-locally.html
319-
"idea.kotlin.plugin.use.k2" to "true"
319+
"idea.kotlin.plugin.use.k2" to "true",
320320

321321
// "idea.ProcessCanceledException" to "disabled"
322322

@@ -331,6 +331,10 @@ tasks {
331331
//"org.digma.otel.extensionUrl" to "some url
332332
//"org.digma.otel.digmaAgentUrl" to "some url
333333

334+
335+
//custom compose file url
336+
//"org.digma.plugin.custom.docker-compose.url" to "https://raw.githubusercontent.com/digma-ai/digma/refs/heads/0.2.73/docker/docker-compose.yml"
337+
334338
)
335339

336340
//to simulate external user. don't change the value it's used in UniqueGeneratedUserId

‎common-build-logic/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ dependencies {
1414
//when updating intellij-platform-gradle-plugin update also org.jetbrains.intellij.platform.settings plugin
1515
// in settings file to the same version. we need to maintain it in two places, unfortunately.
1616
implementation("org.jetbrains.intellij.platform:intellij-platform-gradle-plugin:2.1.0") // Update also org.jetbrains.intellij.platform.settings in settings.gradle.kts
17-
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.20")
17+
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21")
1818
implementation("com.glovoapp.gradle:versioning:1.1.10")
1919
implementation("de.undercouch:gradle-download-task:5.6.0")
2020
}
@@ -26,7 +26,7 @@ java {
2626

2727
kotlin {
2828
jvmToolchain {
29-
(this as JavaToolchainSpec).languageVersion.set(JavaLanguageVersion.of("17"))
29+
this.languageVersion.set(JavaLanguageVersion.of("17"))
3030
}
3131
}
3232

‎common-build-logic/src/main/kotlin/common/BuildProfile.kt‎

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ fun Project.useBinaryInstaller(): Boolean = !this.currentProfile().isEAP
7878
object BuildProfiles {
7979

8080
@Suppress("EnumEntryName")
81-
enum class Profile { p231, p232, p233, p241, p242, p243 }
81+
enum class Profile { p231, p232, p233, p241, p242, p243, p251 }
8282

8383
fun Profile.greaterThan(other:Profile):Boolean{
8484
val thisNumber = this.name.substring(1).toInt()
@@ -112,8 +112,8 @@ object BuildProfiles {
112112
//update this list as new profiles are added or removed
113113
private val profileAliases = mapOf(
114114
"lowest" to Profile.p231.name,
115-
"latest" to Profile.p242.name,
116-
"eap" to Profile.p243.name,
115+
"latest" to Profile.p243.name,
116+
"eap" to Profile.p251.name,
117117
)
118118

119119

@@ -217,12 +217,27 @@ object BuildProfiles {
217217
),
218218

219219
Profile.p243 to BuildProfile(
220+
profile = Profile.p243,
221+
platformVersion = "2024.3",
222+
riderVersion = "2024.3",
223+
pycharmVersion = "2024.3",
224+
riderTargetFramework = "net8.0",
225+
riderResharperVersionConstant = "PROFILE_2023_2;PROFILE_2024_3",
226+
platformVersionCode = "243",
227+
pluginSinceBuild = "243",
228+
pluginUntilBuild = "243.*",
229+
kotlinTarget = KotlinVersion.KOTLIN_2_0,
230+
kotlinJvmTarget = JvmTarget.JVM_21,
231+
javaVersion = JavaVersion.VERSION_21.majorVersion,
232+
),
233+
234+
//todo: next EAP
235+
Profile.p251 to BuildProfile(
220236
isEAP = true,
221237
profile = Profile.p243,
222-
platformVersion = "243.21565-EAP-CANDIDATE-SNAPSHOT",
223-
//todo: Digma.Rider.Tests is disabled because it doesn't compile with 2024.3-EAP1-SNAPSHOT, there is mismatch with jetbrains packages try to build it with next snapshots.
224-
riderVersion = "2024.3-EAP5-SNAPSHOT",
225-
pycharmVersion = "243-EAP-SNAPSHOT",
238+
platformVersion = "2024.3",
239+
riderVersion = "2024.3",
240+
pycharmVersion = "2024.3",
226241
riderTargetFramework = "net8.0",
227242
riderResharperVersionConstant = "PROFILE_2023_2;PROFILE_2024_3",
228243
platformVersionCode = "243",

‎common-build-logic/src/main/kotlin/common/rider/RiderCommon.kt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ fun rdGenVersionByProfile(profile: BuildProfiles.Profile): String {
2424
BuildProfiles.Profile.p233 -> "2023.3.2"
2525
BuildProfiles.Profile.p241 -> "2023.3.2"
2626
BuildProfiles.Profile.p242 -> "2024.1.1"
27-
//todo: for rider 2024.3 needs a new rdgen, 2024.3
28-
// update the version when new one comes out
29-
BuildProfiles.Profile.p243 -> "2024.3-pre2"
27+
BuildProfiles.Profile.p243 -> "2024.3.1"
28+
BuildProfiles.Profile.p251 -> "2024.3.1"
3029
}
3130
}

‎gradle.properties‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@ pluginRepositoryUrl=https://github.com/digma-ai/digma-intellij-plugin.git
99
##change buildProfile to load the profile dependencies in the IDE. refresh gradle after change.
1010
##it is necessary when need to debug something in a specific version of intellij. changing the profile here
1111
## will load that version's dependencies to the IDE
12-
#buildProfile=p231 - its the default so not necessary
12+
#buildProfile=p231 - it's the default
1313
#buildProfile=p232
1414
#buildProfile=p233
1515
#buildProfile=p241
1616
#buildProfile=p242
17+
#buildProfile=p243
1718

1819
##build with real ide, will load the ide dependencies in the project. refresh gradle after change.
1920
##its is necessary when need to debug something for a specific IDE

0 commit comments

Comments
 (0)