Skip to content

Commit 88b83d3

Browse files
committed
Использование serverInfo.version как release name в Sentry
1 parent 432bbc7 commit 88b83d3

File tree

8 files changed

+19
-20
lines changed

8 files changed

+19
-20
lines changed

.github/workflows/sentry-ref.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,3 @@ jobs:
1919
with:
2020
environment: production
2121
version: ${{ github.ref }}
22-
version_prefix: v

build.gradle.kts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ plugins {
2020
id("com.github.ben-manes.versions") version "0.52.0"
2121
id("org.springframework.boot") version "3.4.2"
2222
id("io.spring.dependency-management") version "1.1.7"
23+
id("io.sentry.jvm.gradle") version "5.1.0"
2324
id("io.github.1c-syntax.bslls-dev-tools") version "0.8.1"
2425
id("ru.vyarus.pom") version "3.0.0"
2526
id("com.gorylenko.gradle-git-properties") version "2.4.2"
@@ -127,10 +128,6 @@ dependencies {
127128
// SARIF serialization
128129
implementation("com.contrastsecurity", "java-sarif", "2.0")
129130

130-
// Sentry
131-
implementation("io.sentry:sentry-spring-boot-starter-jakarta")
132-
implementation("io.sentry:sentry-logback")
133-
134131
// CONSTRAINTS
135132
implementation("com.google.guava:guava") {
136133
version {

lombok.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
lombok.anyConstructor.addConstructorProperties=true
22
lombok.copyableannotations+=org.springframework.beans.factory.annotation.Qualifier
3+
lombok.copyableannotations+=org.springframework.beans.factory.annotation.Value
34
lombok.addLombokGeneratedAnnotation=true
45
lombok.log.fieldName=LOGGER
56
lombok.extern.findbugs.addSuppressFBWarnings = true

src/main/java/com/github/_1c_syntax/bsl/languageserver/aop/sentry/SentryScopeConfigurer.java

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,10 @@
2424
import io.sentry.IScope;
2525
import io.sentry.Sentry;
2626
import io.sentry.protocol.User;
27-
import io.sentry.spring.boot.jakarta.SentryProperties;
2827
import jakarta.annotation.PostConstruct;
2928
import lombok.RequiredArgsConstructor;
3029
import org.eclipse.lsp4j.ServerInfo;
31-
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
32-
import org.springframework.context.annotation.DependsOn;
30+
import org.springframework.beans.factory.annotation.Value;
3331
import org.springframework.stereotype.Component;
3432

3533
import java.util.UUID;
@@ -41,24 +39,33 @@
4139
*/
4240
@Component
4341
@RequiredArgsConstructor
44-
@ConditionalOnBean(name = "sentryHub")
45-
@DependsOn("sentryHub")
4642
public class SentryScopeConfigurer {
4743

4844
private final ServerInfo serverInfo;
49-
private final SentryProperties sentryProperties;
45+
46+
@Value("${sentry.dsn}")
47+
private final String dsn;
48+
49+
@Value("${sentry.environment}")
50+
private final String environment;
5051

5152
@PostConstruct
5253
public void init() {
54+
if (dsn != null && !dsn.isEmpty()) {
55+
Sentry.init(options -> {
56+
options.setDsn(dsn);
57+
options.setEnvironment(environment);
58+
options.setRelease(serverInfo.getVersion());
59+
options.setTag("server.version", serverInfo.getVersion());
60+
options.setAttachServerName(false);
61+
});
62+
}
63+
5364
Sentry.configureScope((IScope scope) -> {
5465
var user = new User();
5566
user.setId(UUID.randomUUID().toString());
5667
scope.setUser(user);
57-
58-
scope.setTag("server.version", serverInfo.getVersion());
5968
});
60-
61-
sentryProperties.setRelease(serverInfo.getVersion());
6269
}
6370

6471
}

src/main/resources/application.properties

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,5 @@ logging.level.org.eclipse.lsp4j.jsonrpc.RemoteEndpoint=fatal
1919
app.websocket.lsp-path=/lsp
2020
sentry.dsn=https://03ebc809fae749d297327b8140d3cad0@o745542.ingest.sentry.io/5790531
2121
sentry.environment=production
22-
sentry.attach-server-name=false
23-
sentry.logging.minimum-breadcrumb-level=debug
2422
sentry.use-git-commit-id-as-release=false
2523
picocli.disable.closures=true

src/test/resources/application-measures.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,4 @@ app.globalConfiguration.path=
2222
app.configuration.path=
2323
app.websocket.lsp-path=/lsp
2424
sentry.environment=measures
25-
sentry.logging.minimum-breadcrumb-level=debug
2625
sentry.use-git-commit-id-as-release=false

src/test/resources/application-websocket.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,4 @@ app.globalConfiguration.path=
2020
app.configuration.path=
2121
app.websocket.lsp-path=/lsp
2222
sentry.environment=test
23-
sentry.logging.minimum-breadcrumb-level=debug
2423
sentry.use-git-commit-id-as-release=false

src/test/resources/application.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,4 @@ app.globalConfiguration.path=
2121
app.configuration.path=
2222
app.websocket.lsp-path=/lsp
2323
sentry.environment=test
24-
sentry.logging.minimum-breadcrumb-level=debug
2524
sentry.use-git-commit-id-as-release=false

0 commit comments

Comments
 (0)