Skip to content

Commit e100214

Browse files
committed
Add @WithSpan for tracing LDAP
1 parent 781b1f1 commit e100214

File tree

2 files changed

+50
-0
lines changed

2 files changed

+50
-0
lines changed

pom.xml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,13 @@
3131
<type>pom</type>
3232
<scope>import</scope>
3333
</dependency>
34+
<dependency>
35+
<groupId>io.opentelemetry</groupId>
36+
<artifactId>opentelemetry-bom</artifactId>
37+
<version>1.37.0</version>
38+
<type>pom</type>
39+
<scope>import</scope>
40+
</dependency>
3441
</dependencies>
3542
</dependencyManagement>
3643

@@ -80,6 +87,43 @@
8087
<groupId>io.ktor</groupId>
8188
<artifactId>ktor-metrics-micrometer</artifactId>
8289
</dependency>
90+
91+
92+
<dependency>
93+
<groupId>io.opentelemetry</groupId>
94+
<artifactId>opentelemetry-api</artifactId>
95+
</dependency>
96+
<dependency>
97+
<groupId>io.opentelemetry.instrumentation</groupId>
98+
<artifactId>opentelemetry-instrumentation-annotations</artifactId>
99+
<version>2.3.0</version>
100+
</dependency>
101+
102+
<!-- Probably not needed
103+
<dependency>
104+
<groupId>io.opentelemetry</groupId>
105+
<artifactId>opentelemetry-sdk</artifactId>
106+
</dependency>
107+
<dependency>
108+
<groupId>io.opentelemetry</groupId>
109+
<artifactId>opentelemetry-exporter-logging</artifactId>
110+
</dependency>
111+
<dependency>
112+
<groupId>io.opentelemetry.semconv</groupId>
113+
<artifactId>opentelemetry-semconv</artifactId>
114+
<version>1.25.0-alpha</version>
115+
</dependency>
116+
117+
118+
<dependency>
119+
<groupId>io.opentelemetry</groupId>
120+
<artifactId>opentelemetry-sdk-extension-autoconfigure</artifactId>
121+
</dependency>
122+
<dependency>
123+
<groupId>io.opentelemetry</groupId>
124+
<artifactId>opentelemetry-sdk-extension-autoconfigure-spi</artifactId>
125+
</dependency>
126+
-->
83127
<dependency>
84128
<groupId>io.micrometer</groupId>
85129
<artifactId>micrometer-registry-prometheus</artifactId>

src/main/kotlin/no/nav/navansatt/ActiveDirectoryClient.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
package no.nav.navansatt
22

3+
import io.opentelemetry.api.GlobalOpenTelemetry
34
import kotlinx.coroutines.Dispatchers
45
import kotlinx.coroutines.withContext
56
import org.apache.commons.text.StringEscapeUtils
7+
import io.opentelemetry.api.OpenTelemetry;
8+
import io.opentelemetry.api.trace.Tracer;
9+
import io.opentelemetry.instrumentation.annotations.WithSpan
610
import org.slf4j.LoggerFactory
711
import java.util.Hashtable
812
import java.util.regex.Pattern
@@ -41,6 +45,7 @@ class ActiveDirectoryClient(
4145
}
4246
}
4347

48+
@WithSpan
4449
suspend fun getUsers(idents: List<String>): List<User> = withContext(Dispatchers.IO) {
4550
val root = InitialLdapContext(env, null)
4651

@@ -89,6 +94,7 @@ class ActiveDirectoryClient(
8994
users
9095
}
9196

97+
@WithSpan
9298
suspend fun getUser(ident: String): User? = withContext(Dispatchers.IO) {
9399
val root = InitialLdapContext(env, null)
94100

0 commit comments

Comments
 (0)