Skip to content

chore: Switch server tracing configs to use OTEL #37333

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

Merged
nidhi-nair merged 3 commits into from
Nov 12, 2024
Merged

chore: Switch server tracing configs to use OTEL #37333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cb0d3ff
chore: Switch server tracing configs to use OTEL
nidhi-nair Nov 12, 2024
9cf075a
chore: Switched server to use OTEL as tracing mechanism
nidhi-nair Nov 12, 2024
20454b5
Small clean up
nidhi-nair Nov 12, 2024
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
36 changes: 7 additions & 29 deletions app/server/appsmith-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,30 +32,14 @@
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-bom</artifactId>
<version>1.34.1</version>
<version>1.43.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>io.opentelemetry.instrumentation</groupId>
<artifactId>opentelemetry-micrometer-1.5</artifactId>
<version>2.0.0-alpha</version>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-sdk</artifactId>
<version>1.34.1</version>
</dependency>
<dependency>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-exporter-otlp</artifactId>
<version>1.34.1</version>
</dependency>

<!--
Ideally this dependency should have been added in the pom.xml file of GraphQLPlugin module, but it is
causing 'java.lang.NoClassDefFoundError' error. Hence, adding it here after many attempts of fixing it the right
Expand Down Expand Up @@ -216,23 +200,17 @@
<groupId>io.micrometer</groupId>
<artifactId>micrometer-registry-prometheus</artifactId>
</dependency>
<!-- https://mvnrepository.com/artifact/io.micrometer/micrometer-tracing-bridge-brave -->
<!-- https://mvnrepository.com/artifact/io.micrometer/micrometer-tracing-bridge-otel -->
<dependency>
<groupId>io.micrometer</groupId>
<artifactId>micrometer-tracing-bridge-brave</artifactId>
<version>1.3.4</version>
<artifactId>micrometer-tracing-bridge-otel</artifactId>
<version>1.3.5</version>
</dependency>
<dependency>
<groupId>io.zipkin.reporter2</groupId>
<artifactId>zipkin-reporter-brave</artifactId>
<groupId>io.opentelemetry</groupId>
<artifactId>opentelemetry-exporter-otlp</artifactId>
<version>1.43.0</version>
</dependency>
<!-- Commented out Loki dependency for now, since we haven't fixed associating logs to traces-->
<!-- <dependency>-->
<!-- <groupId>com.github.loki4j</groupId>-->
<!-- <artifactId>loki-logback-appender</artifactId>-->
<!-- <version>1.3.2</version>-->
<!-- </dependency>-->
<!-- Actual Junit5 implementation. Will transitively include junit-jupiter-api -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
Expand Down
122 changes: 0 additions & 122 deletions ...erver/appsmith-server/src/main/java/com/appsmith/server/configurations/MetricsConfig.java
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions .../src/main/java/com/appsmith/server/configurations/ZipkinMicrometerTraceConfiguration.java
View file
Open in desktop

This file was deleted.

9 changes: 5 additions & 4 deletions app/server/appsmith-server/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,16 +91,17 @@ github_repo = ${APPSMITH_GITHUB_REPO:}
# The following configurations are to help support prometheus scraping for monitoring
management.endpoints.web.exposure.include=prometheus,metrics
management.tracing.enabled=${APPSMITH_TRACING_ENABLED:false}
management.zipkin.tracing.endpoint=${APPSMITH_TRACING_ENDPOINT:http://localhost:9411/api/v2/spans}
management.otlp.tracing.endpoint=${APPSMITH_NEW_RELIC_OTEL_EXPORTER_OTLP_ENDPOINT:http://localhost:4318}/v1/traces
management.otlp.tracing.headers.api-key=${APPSMITH_NEW_RELIC_OTLP_LICENSE_KEY:}
management.opentelemetry.resource-attributes.service.name=appsmith-server
management.opentelemetry.resource-attributes.service.instance.id=${HOSTNAME:appsmith-0}
management.opentelemetry.resource-attributes.deployment.name=${APPSMITH_DEPLOYMENT_NAME:self-hosted}
management.tracing.sampling.probability=${APPSMITH_SAMPLING_PROBABILITY:0.1}
management.prometheus.metrics.export.descriptions=true
management.metrics.distribution.percentiles-histogram.http.server.requests=true

# Observability and Micrometer related configs
# Keeping this license key around, until later
appsmith.newrelic.licensekey=${APPSMITH_NEW_RELIC_OTLP_LICENSE_KEY:}
appsmith.observability.deployment.name=${APPSMITH_DEPLOYMENT_NAME:self-hosted}
appsmith.observability.service.instance.id=${HOSTNAME:appsmith-0}
appsmith.observability.metrics.enabled=${APPSMITH_MICROMETER_METRICS_ENABLED:false}
appsmith.observability.tracing.detail.enabled=${APPSMITH_ENABLE_TRACING_DETAIL:false}
appsmith.observability.metrics.detail.enabled=${APPSMITH_ENABLE_METRICS_DETAIL:false}
Expand Down