Skip to content

Commit d5f8ede

Browse files
committed
Revert "added README.md for SigV4 Exporter"
This reverts commit 1239478.
1 parent 9776453 commit d5f8ede

File tree

5 files changed

+14
-44
lines changed

5 files changed

+14
-44
lines changed

awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/AwsApplicationSignalsCustomizerProvider.java

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
import java.util.logging.Level;
5353
import java.util.logging.Logger;
5454
import java.util.regex.Pattern;
55-
import software.amazon.opentelemetry.javaagent.providers.exporter.OtlpAwsSpanExporterBuilder;
5655

5756
/**
5857
* This customizer performs the following customizations:
@@ -195,18 +194,16 @@ private boolean isApplicationSignalsRuntimeEnabled(ConfigProperties configProps)
195194
}
196195

197196
private Map<String, String> customizeProperties(ConfigProperties configProps) {
198-
Map<String, String> propsOverride = new HashMap<>();
199197
boolean isLambdaEnvironment = isLambdaEnvironment();
198+
Map<String, String> propsOverride = new HashMap<>();
200199

201200
// Enable AWS Resource Providers
202201
propsOverride.put(OTEL_RESOURCE_PROVIDERS_AWS_ENABLED, "true");
203-
204202
if (!isLambdaEnvironment) {
205-
propsOverride.put(
206-
OTEL_DISABLED_RESOURCE_PROVIDERS_CONFIG,
207-
this.disableResourceProvider(
208-
configProps,
209-
List.of("io.opentelemetry.contrib.aws.resource.LambdaResourceProvider")));
203+
this.disableAwsResourceProvider(
204+
propsOverride,
205+
configProps,
206+
List.of("io.opentelemetry.contrib.aws.resource.LambdaResourceProvider"));
210207
}
211208

212209
if (isApplicationSignalsEnabled(configProps)) {
@@ -264,9 +261,7 @@ private Map<String, String> customizeLambdaEnvProperties(ConfigProperties config
264261
"io.opentelemetry.contrib.aws.resource.EcsResourceProvider",
265262
"io.opentelemetry.contrib.aws.resource.EksResourceProvider");
266263

267-
propsOverride.put(
268-
OTEL_DISABLED_RESOURCE_PROVIDERS_CONFIG,
269-
this.disableResourceProvider(configProperties, disabledResourceProviders));
264+
this.disableAwsResourceProvider(propsOverride, configProperties, disabledResourceProviders);
270265

271266
// Set the max export batch size for BatchSpanProcessors
272267
propsOverride.put(
@@ -277,12 +272,14 @@ private Map<String, String> customizeLambdaEnvProperties(ConfigProperties config
277272
return Collections.emptyMap();
278273
}
279274

280-
private String disableResourceProvider(
281-
ConfigProperties oldProps, List<String> resourceProviders) {
275+
private void disableAwsResourceProvider(
276+
Map<String, String> newProps, ConfigProperties oldProps, List<String> resourceProviders) {
277+
282278
List<String> list = oldProps.getList(OTEL_DISABLED_RESOURCE_PROVIDERS_CONFIG);
283-
Set<String> disabledResourceProviders = new HashSet<>(list);
279+
List<String> disabledResourceProviders = new ArrayList<>(list);
284280
disabledResourceProviders.addAll(resourceProviders);
285-
return String.join(",", disabledResourceProviders);
281+
newProps.put(
282+
OTEL_DISABLED_RESOURCE_PROVIDERS_CONFIG, String.join(",", disabledResourceProviders));
286283
}
287284

288285
private Resource customizeResource(Resource resource, ConfigProperties configProps) {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* permissions and limitations under the License.
1414
*/
1515

16-
package software.amazon.opentelemetry.javaagent.providers.exporter;
16+
package software.amazon.opentelemetry.javaagent.providers;
1717

1818
import io.opentelemetry.exporter.internal.otlp.traces.TraceRequestMarshaler;
1919
import io.opentelemetry.exporter.otlp.http.trace.OtlpHttpSpanExporter;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* permissions and limitations under the License.
1414
*/
1515

16-
package software.amazon.opentelemetry.javaagent.providers.exporter;
16+
package software.amazon.opentelemetry.javaagent.providers;
1717

1818
import io.opentelemetry.exporter.otlp.http.trace.OtlpHttpSpanExporter;
1919

awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/exporter/README.md

Lines changed: 0 additions & 26 deletions
This file was deleted.

awsagentprovider/src/test/java/software/amazon/opentelemetry/javaagent/providers/OtlpAwsSpanExporterTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
import software.amazon.awssdk.http.auth.spi.signer.SignRequest.Builder;
4747
import software.amazon.awssdk.http.auth.spi.signer.SignedRequest;
4848
import software.amazon.awssdk.identity.spi.AwsCredentialsIdentity;
49-
import software.amazon.opentelemetry.javaagent.providers.exporter.OtlpAwsSpanExporterBuilder;
5049

5150
@ExtendWith(MockitoExtension.class)
5251
public class OtlpAwsSpanExporterTest {

0 commit comments

Comments
 (0)