Skip to content

Commit c56281f

Browse files
committed
Remove o11yphant dependencies
1 parent fc5a981 commit c56281f

27 files changed

+1722
-715
lines changed

addons-client/folo/client-java/src/main/java/org/commonjava/indy/folo/client/IndyFoloAdminClientModule.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,6 @@ public void clearTrackingRecord( final String trackingId, final StoreType type,
144144
public boolean sealTrackingRecord( String trackingId )
145145
throws IndyClientException
146146
{
147-
http.connect();
148-
149147
HttpPost request = http.newRawPost( UrlUtils.buildUrl( http.getBaseUrl(), "/folo/admin", trackingId, "record" ) );
150148
HttpResources resources = null;
151149
try

core-java/pom.xml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,20 +37,20 @@
3737
<artifactId>jhttpc</artifactId>
3838
</dependency>
3939
<dependency>
40-
<groupId>org.commonjava.util</groupId>
41-
<artifactId>o11yphant-trace-api</artifactId>
40+
<groupId>io.opentelemetry</groupId>
41+
<artifactId>opentelemetry-api</artifactId>
4242
</dependency>
4343
<dependency>
44-
<groupId>org.commonjava.util</groupId>
45-
<artifactId>o11yphant-trace-otel</artifactId>
44+
<groupId>io.opentelemetry</groupId>
45+
<artifactId>opentelemetry-sdk</artifactId>
4646
</dependency>
4747
<dependency>
48-
<groupId>org.commonjava.util</groupId>
49-
<artifactId>o11yphant-trace-helper-jhttpc</artifactId>
48+
<groupId>io.opentelemetry</groupId>
49+
<artifactId>opentelemetry-exporter-logging</artifactId>
5050
</dependency>
5151
<dependency>
52-
<groupId>org.commonjava.util</groupId>
53-
<artifactId>o11yphant-metrics-common</artifactId>
52+
<groupId>io.opentelemetry</groupId>
53+
<artifactId>opentelemetry-exporter-otlp</artifactId>
5454
</dependency>
5555
<dependency>
5656
<groupId>org.apache.httpcomponents</groupId>
@@ -65,9 +65,8 @@
6565
<artifactId>commons-io</artifactId>
6666
</dependency>
6767
<dependency>
68-
<groupId>org.commonjava.indy</groupId>
69-
<artifactId>indy-test-fixtures-core</artifactId>
70-
<scope>test</scope>
68+
<groupId>org.apache.commons</groupId>
69+
<artifactId>commons-lang3</artifactId>
7170
</dependency>
7271
</dependencies>
7372

core-java/src/main/java/org/commonjava/indy/client/core/Indy.java

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,10 @@
1919
import org.commonjava.indy.client.core.auth.IndyClientAuthenticator;
2020
import org.commonjava.indy.client.core.module.IndyContentClientModule;
2121
import org.commonjava.indy.client.core.module.IndyStoresClientModule;
22+
import org.commonjava.indy.client.core.o11y.trace.ClientTracerConfiguration;
2223
import org.commonjava.indy.inject.IndyVersioningProvider;
2324
import org.commonjava.indy.model.core.io.IndyObjectMapper;
2425
import org.commonjava.indy.stats.IndyVersioning;
25-
import org.commonjava.o11yphant.trace.TraceManager;
26-
import org.commonjava.o11yphant.trace.TracerConfiguration;
2726
import org.commonjava.util.jhttpc.auth.PasswordManager;
2827
import org.commonjava.util.jhttpc.model.SiteConfig;
2928

@@ -213,9 +212,7 @@ public static final class Builder
213212

214213
private Map<String, String> mdcCopyMappings;
215214

216-
private TracerConfiguration existedTraceConfig;
217-
218-
private TraceManager existedTraceManager;
215+
private ClientTracerConfiguration traceConfig;
219216

220217
private Builder()
221218
{
@@ -252,18 +249,6 @@ public Builder setObjectMapper( IndyObjectMapper objectMapper )
252249
return this;
253250
}
254251

255-
public Builder setExistedTraceConfig( TracerConfiguration existedTraceConfig )
256-
{
257-
this.existedTraceConfig = existedTraceConfig;
258-
return this;
259-
}
260-
261-
public Builder setExistedTraceManager( TraceManager traceManager )
262-
{
263-
this.existedTraceManager = traceManager;
264-
return this;
265-
}
266-
267252
public Builder setAuthenticator( IndyClientAuthenticator authenticator )
268253
{
269254
this.authenticator = authenticator;
@@ -276,6 +261,12 @@ public Builder setMdcCopyMappings( Map<String, String> mdcCopyMappings )
276261
return this;
277262
}
278263

264+
public Builder setTraceConfiguration( ClientTracerConfiguration traceConfig )
265+
{
266+
this.traceConfig = traceConfig;
267+
return this;
268+
}
269+
279270
public Indy build()
280271
throws IndyClientException
281272
{
@@ -290,9 +281,8 @@ public Indy build()
290281
.setAuthenticator( this.authenticator )
291282
.setApiVersion( indy.getApiVersion() )
292283
.setLocation( this.location )
284+
.setTracerConfiguration( this.traceConfig )
293285
.setPasswordManager( this.passwordManager )
294-
.setExistedTraceConfig( this.existedTraceConfig )
295-
.setExistedTraceManager( this.existedTraceManager )
296286
.setMdcCopyMappings( this.mdcCopyMappings )
297287
.setObjectMapper( this.objectMapper )
298288
.build();

0 commit comments

Comments
 (0)