Skip to content

Commit

Permalink
#198 - Remove aws-xray sdk
Browse files Browse the repository at this point in the history
  • Loading branch information
@mfriesen
mfriesen committed Dec 4, 2023
1 parent a370fd0 commit b7fb2f8
Show file tree
Hide file tree
Showing 12 changed files with 25 additions and 30 deletions.
2 changes: 1 addition & 1 deletion aws-dynamodb/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ dependencies {

api group: 'software.amazon.awssdk', name: 'dynamodb', version: '2.20.140'
implementation project(':fkq-lambda-services')
implementation project(':aws-xray')
//implementation project(':aws-xray')
implementation group: 'software.amazon.awssdk', name: 'url-connection-client', version: '2.20.140'
implementation group: 'com.formkiq', name: 'graalvm-annotations', version: '1.2.0'

Expand Down
7 changes: 3 additions & 4 deletions aws-dynamodb/src/main/java/com/formkiq/aws/dynamodb/DynamoDbConnectionBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
package com.formkiq.aws.dynamodb;

import java.net.URI;
import com.amazonaws.xray.interceptors.TracingInterceptor;
import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
import software.amazon.awssdk.auth.credentials.ProfileCredentialsProvider;
import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration;
Expand Down Expand Up @@ -55,9 +54,9 @@ public DynamoDbConnectionBuilder(final boolean enableAwsXray) {
"software.amazon.awssdk.http.urlconnection.UrlConnectionSdkHttpService");
Builder clientConfig = ClientOverrideConfiguration.builder();

if (enableAwsXray) {
clientConfig.addExecutionInterceptor(new TracingInterceptor());
}
// if (enableAwsXray) {
// clientConfig.addExecutionInterceptor(new TracingInterceptor());
// }

this.builder = DynamoDbClient.builder().overrideConfiguration(clientConfig.build());
}
Expand Down
2 changes: 1 addition & 1 deletion aws-s3/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dependencies {
api group: 'software.amazon.awssdk', name: 's3', version: '2.20.140'
implementation group: 'software.amazon.awssdk', name: 'url-connection-client', version: '2.20.140'
implementation project(':fkq-lambda-services')
implementation project(':aws-xray')
//implementation project(':aws-xray')

configurations.all {
exclude group: 'software.amazon.awssdk', module: 'apache-client'
Expand Down
7 changes: 3 additions & 4 deletions aws-s3/src/main/java/com/formkiq/aws/s3/S3ConnectionBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
package com.formkiq.aws.s3;

import java.net.URI;
import com.amazonaws.xray.interceptors.TracingInterceptor;
import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
import software.amazon.awssdk.auth.credentials.EnvironmentVariableCredentialsProvider;
import software.amazon.awssdk.auth.credentials.ProfileCredentialsProvider;
Expand Down Expand Up @@ -60,9 +59,9 @@ public S3ConnectionBuilder(final boolean enableAwsXray) {

ClientOverrideConfiguration.Builder clientConfig = ClientOverrideConfiguration.builder();

if (enableAwsXray) {
clientConfig.addExecutionInterceptor(new TracingInterceptor());
}
// if (enableAwsXray) {
// clientConfig.addExecutionInterceptor(new TracingInterceptor());
// }

this.builder = S3Client.builder().overrideConfiguration(clientConfig.build())
.httpClientBuilder(UrlConnectionHttpClient.builder())
Expand Down
2 changes: 1 addition & 1 deletion aws-ses/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dependencies {
api group: 'software.amazon.awssdk', name: 'ses', version: '2.20.140'
implementation group: 'software.amazon.awssdk', name: 'url-connection-client', version: '2.20.140'
implementation project(':fkq-lambda-services')
implementation project(':aws-xray')
//implementation project(':aws-xray')

testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version:'5.10.0'

Expand Down
8 changes: 4 additions & 4 deletions aws-ses/src/main/java/com/formkiq/aws/ses/SesConnectionBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
package com.formkiq.aws.ses;

import java.net.URI;
import com.amazonaws.xray.interceptors.TracingInterceptor;

import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
import software.amazon.awssdk.auth.credentials.EnvironmentVariableCredentialsProvider;
import software.amazon.awssdk.auth.credentials.ProfileCredentialsProvider;
Expand Down Expand Up @@ -57,9 +57,9 @@ public SesConnectionBuilder(final boolean enableAwsXray) {

ClientOverrideConfiguration.Builder clientConfig = ClientOverrideConfiguration.builder();

if (enableAwsXray) {
clientConfig.addExecutionInterceptor(new TracingInterceptor());
}
// if (enableAwsXray) {
// clientConfig.addExecutionInterceptor(new TracingInterceptor());
// }

this.builder = SesClient.builder().overrideConfiguration(clientConfig.build())
.httpClientBuilder(UrlConnectionHttpClient.builder())
Expand Down
2 changes: 1 addition & 1 deletion aws-sns/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description = "AWS SNS"
dependencies {
api 'software.amazon.awssdk:sns:2.20.140'
implementation group: 'software.amazon.awssdk', name: 'url-connection-client', version: '2.20.140'
implementation project(':aws-xray')
//implementation project(':aws-xray')
implementation project(':fkq-lambda-services')

configurations.all {
Expand Down
7 changes: 3 additions & 4 deletions aws-sns/src/main/java/com/formkiq/aws/sns/SnsConnectionBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
package com.formkiq.aws.sns;

import java.net.URI;
import com.amazonaws.xray.interceptors.TracingInterceptor;
import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
import software.amazon.awssdk.auth.credentials.EnvironmentVariableCredentialsProvider;
import software.amazon.awssdk.auth.credentials.ProfileCredentialsProvider;
Expand Down Expand Up @@ -58,9 +57,9 @@ public SnsConnectionBuilder(final boolean enableAwsXray) {

Builder clientConfig = ClientOverrideConfiguration.builder();

if (enableAwsXray) {
clientConfig.addExecutionInterceptor(new TracingInterceptor());
}
// if (enableAwsXray) {
// clientConfig.addExecutionInterceptor(new TracingInterceptor());
// }

this.builder = SnsClient.builder().overrideConfiguration(clientConfig.build())
.httpClientBuilder(UrlConnectionHttpClient.builder())
Expand Down
2 changes: 1 addition & 1 deletion aws-sqs/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ dependencies {

api 'software.amazon.awssdk:sqs:2.20.140'
implementation group: 'software.amazon.awssdk', name: 'url-connection-client', version: '2.20.140'
implementation project(':aws-xray')
//implementation project(':aws-xray')
implementation project(':fkq-lambda-services')

configurations.all {
Expand Down
7 changes: 3 additions & 4 deletions aws-sqs/src/main/java/com/formkiq/aws/sqs/SqsConnectionBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
package com.formkiq.aws.sqs;

import java.net.URI;
import com.amazonaws.xray.interceptors.TracingInterceptor;
import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
import software.amazon.awssdk.auth.credentials.EnvironmentVariableCredentialsProvider;
import software.amazon.awssdk.auth.credentials.ProfileCredentialsProvider;
Expand Down Expand Up @@ -58,9 +57,9 @@ public SqsConnectionBuilder(final boolean enableAwsXray) {

Builder clientConfig = ClientOverrideConfiguration.builder();

if (enableAwsXray) {
clientConfig.addExecutionInterceptor(new TracingInterceptor());
}
// if (enableAwsXray) {
// clientConfig.addExecutionInterceptor(new TracingInterceptor());
// }

this.builder = SqsClient.builder().overrideConfiguration(clientConfig.build())
.httpClientBuilder(UrlConnectionHttpClient.builder())
Expand Down
2 changes: 1 addition & 1 deletion aws-ssm/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description = "AWS SSM"
dependencies {
api group: 'software.amazon.awssdk', name: 'ssm', version: '2.20.140'
implementation group: 'software.amazon.awssdk', name: 'url-connection-client', version: '2.20.140'
implementation project(':aws-xray')
//implementation project(':aws-xray')
implementation project(':fkq-lambda-services')

configurations.all {
Expand Down
7 changes: 3 additions & 4 deletions aws-ssm/src/main/java/com/formkiq/aws/ssm/SsmConnectionBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
package com.formkiq.aws.ssm;

import java.net.URI;
import com.amazonaws.xray.interceptors.TracingInterceptor;
import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
import software.amazon.awssdk.auth.credentials.EnvironmentVariableCredentialsProvider;
import software.amazon.awssdk.auth.credentials.ProfileCredentialsProvider;
Expand Down Expand Up @@ -58,9 +57,9 @@ public SsmConnectionBuilder(final boolean enableAwsXray) {

Builder clientConfig = ClientOverrideConfiguration.builder();

if (enableAwsXray) {
clientConfig.addExecutionInterceptor(new TracingInterceptor());
}
// if (enableAwsXray) {
// clientConfig.addExecutionInterceptor(new TracingInterceptor());
// }

this.builder = SsmClient.builder().overrideConfiguration(clientConfig.build())
.httpClientBuilder(UrlConnectionHttpClient.builder())
Expand Down

0 comments on commit b7fb2f8

Please sign in to comment.