Skip to content

Commit 7b56506

Browse files
jack-bergjack-berg
authored
Deprecate opentelemetry-sdk-extension-aws (#4749)
1 parent 3ee7bbd commit 7b56506

27 files changed

+114
-257
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ dependency as follows, replacing `{{artifact-id}}` with the value from the "Arti
271271
| [SDK Autoconfigure Extension](./sdk-extensions/autoconfigure) | Autoconfigure OpenTelemetry SDK from env vars, system properties, and SPI | `opentelemetry-sdk-extension-autoconfigure` | <!--VERSION_UNSTABLE-->1.18.0-alpha<!--/VERSION_UNSTABLE--> |
272272
| [SDK Autoconfigure SPI](./sdk-extensions/autoconfigure-spi) | Service Provider Interface (SPI) definitions for autoconfigure | `opentelemetry-sdk-extension-autoconfigure-spi` | <!--VERSION_STABLE-->1.18.0<!--/VERSION_STABLE--> |
273273
| [SDK Resources Extension](./sdk-extensions/resources) | Resource providers, including container, host, os, and process (deprecated) | `opentelemetry-sdk-extension-resources` | <!--VERSION_STABLE-->1.18.0<!--/VERSION_STABLE--> |
274-
| [SDK AWS Extension](./sdk-extensions/aws) | AWS resource providers, including beanstalk, ec2, ecs, eks, and lambda | `opentelemetry-sdk-extension-aws` | <!--VERSION_STABLE-->1.18.0<!--/VERSION_STABLE--> |
274+
| [SDK AWS Extension](./sdk-extensions/aws) | AWS resource providers, including beanstalk, ec2, ecs, eks, and lambda (deprecated) | `opentelemetry-sdk-extension-aws` | <!--VERSION_STABLE-->1.18.0<!--/VERSION_STABLE--> |
275275
| [SDK Jaeger Remote Sampler Extension](./sdk-extensions/jaeger-remote-sampler) | Sampler which obtains sampling configuration from remote Jaeger server | `opentelemetry-sdk-extension-jaeger-remote-sampler` | <!--VERSION_STABLE-->1.18.0<!--/VERSION_STABLE--> |
276276
| [SDK Incubator](./sdk-extensions/incubator) | SDK incubator, including YAML based view configuration, LeakDetectingSpanProcessor, and zPages | `opentelemetry-sdk-extension-incubator` | <!--VERSION_UNSTABLE-->1.18.0-alpha<!--/VERSION_UNSTABLE--> |
277277

‎docs/apidiffs/current_vs_latest/opentelemetry-sdk-extension-aws.txt

+30-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,31 @@
11
Comparing source compatibility of against
2-
No changes.
2+
=== UNCHANGED CLASS: PUBLIC FINAL io.opentelemetry.sdk.extension.aws.resource.BeanstalkResource (not serializable)
3+
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
4+
+++ NEW ANNOTATION: java.lang.Deprecated
5+
=== UNCHANGED CLASS: PUBLIC FINAL io.opentelemetry.sdk.extension.aws.resource.BeanstalkResourceProvider (not serializable)
6+
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
7+
+++ NEW ANNOTATION: java.lang.Deprecated
8+
=== UNCHANGED CLASS: PUBLIC FINAL io.opentelemetry.sdk.extension.aws.resource.Ec2Resource (not serializable)
9+
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
10+
+++ NEW ANNOTATION: java.lang.Deprecated
11+
=== UNCHANGED CLASS: PUBLIC FINAL io.opentelemetry.sdk.extension.aws.resource.Ec2ResourceProvider (not serializable)
12+
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
13+
+++ NEW ANNOTATION: java.lang.Deprecated
14+
=== UNCHANGED CLASS: PUBLIC FINAL io.opentelemetry.sdk.extension.aws.resource.EcsResource (not serializable)
15+
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
16+
+++ NEW ANNOTATION: java.lang.Deprecated
17+
=== UNCHANGED CLASS: PUBLIC FINAL io.opentelemetry.sdk.extension.aws.resource.EcsResourceProvider (not serializable)
18+
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
19+
+++ NEW ANNOTATION: java.lang.Deprecated
20+
=== UNCHANGED CLASS: PUBLIC FINAL io.opentelemetry.sdk.extension.aws.resource.EksResource (not serializable)
21+
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
22+
+++ NEW ANNOTATION: java.lang.Deprecated
23+
=== UNCHANGED CLASS: PUBLIC FINAL io.opentelemetry.sdk.extension.aws.resource.EksResourceProvider (not serializable)
24+
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
25+
+++ NEW ANNOTATION: java.lang.Deprecated
26+
=== UNCHANGED CLASS: PUBLIC FINAL io.opentelemetry.sdk.extension.aws.resource.LambdaResource (not serializable)
27+
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
28+
+++ NEW ANNOTATION: java.lang.Deprecated
29+
=== UNCHANGED CLASS: PUBLIC FINAL io.opentelemetry.sdk.extension.aws.resource.LambdaResourceProvider (not serializable)
30+
=== CLASS FILE FORMAT VERSION: 52.0 <- 52.0
31+
+++ NEW ANNOTATION: java.lang.Deprecated

‎sdk-extensions/aws/README.md

+6
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
[![Javadocs][javadoc-image]][javadoc-url]
44

5+
> **NOTICE**: This artifact is deprecated and its contents have been moved
6+
> to [io.opentelemetry.contrib:opentelemetry-aws-resources](https://github.com/open-telemetry/opentelemetry-java-contrib/tree/main/aws-resources).
7+
> Version 1.19.0 will be the last minor version published. However, it will continue to receive
8+
> patches for security vulnerabilities, and`io.opentelemetry:opentelemetry-bom` will reference the
9+
> last published version.
10+
511
---
612
#### Running micro-benchmarks
713
From the root of the repo run `./gradlew clean :opentelemetry-sdk-extension-aws:jmh` to run all the benchmarks

‎sdk-extensions/aws/src/main/java/io/opentelemetry/sdk/extension/aws/resource/BeanstalkResource.java

+4
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,11 @@
2020
/**
2121
* A factory for a {@link Resource} which provides information about the current EC2 instance if
2222
* running on AWS Elastic Beanstalk.
23+
*
24+
* @deprecated Moved to <a
25+
* href="https://github.com/open-telemetry/opentelemetry-java-contrib/tree/main/aws-resources">io.opentelemetry.contrib:opentelemetry-aws-resources</a>.
2326
*/
27+
@Deprecated
2428
public final class BeanstalkResource {
2529

2630
private static final Logger logger = Logger.getLogger(BeanstalkResource.class.getName());

‎sdk-extensions/aws/src/main/java/io/opentelemetry/sdk/extension/aws/resource/BeanstalkResourceProvider.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,13 @@
99
import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
1010
import io.opentelemetry.sdk.resources.Resource;
1111

12-
/** {@link ResourceProvider} for automatically configuring {@link BeanstalkResource}. */
12+
/**
13+
* {@link ResourceProvider} for automatically configuring {@link BeanstalkResource}.
14+
*
15+
* @deprecated Moved to <a
16+
* href="https://github.com/open-telemetry/opentelemetry-java-contrib/tree/main/aws-resources">io.opentelemetry.contrib:opentelemetry-aws-resources</a>.
17+
*/
18+
@Deprecated
1319
public final class BeanstalkResourceProvider implements ResourceProvider {
1420
@Override
1521
public Resource createResource(ConfigProperties config) {

‎sdk-extensions/aws/src/main/java/io/opentelemetry/sdk/extension/aws/resource/Ec2Resource.java

+4
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@
2323
/**
2424
* A factory for a {@link Resource} which provides information about the current EC2 instance if
2525
* running on AWS EC2.
26+
*
27+
* @deprecated Moved to <a
28+
* href="https://github.com/open-telemetry/opentelemetry-java-contrib/tree/main/aws-resources">io.opentelemetry.contrib:opentelemetry-aws-resources</a>.
2629
*/
30+
@Deprecated
2731
public final class Ec2Resource {
2832

2933
private static final Logger logger = Logger.getLogger(Ec2Resource.class.getName());

‎sdk-extensions/aws/src/main/java/io/opentelemetry/sdk/extension/aws/resource/Ec2ResourceProvider.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,13 @@
99
import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
1010
import io.opentelemetry.sdk.resources.Resource;
1111

12-
/** {@link ResourceProvider} for automatically configuring {@link Ec2Resource}. */
12+
/**
13+
* {@link ResourceProvider} for automatically configuring {@link Ec2Resource}.
14+
*
15+
* @deprecated Moved to <a
16+
* href="https://github.com/open-telemetry/opentelemetry-java-contrib/tree/main/aws-resources">io.opentelemetry.contrib:opentelemetry-aws-resources</a>.
17+
*/
18+
@Deprecated
1319
public final class Ec2ResourceProvider implements ResourceProvider {
1420
@Override
1521
public Resource createResource(ConfigProperties config) {

‎sdk-extensions/aws/src/main/java/io/opentelemetry/sdk/extension/aws/resource/EcsResource.java

+4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@
2525
/**
2626
* A factory for a {@link Resource} which provides information about the current ECS container if
2727
* running on AWS ECS.
28+
*
29+
* @deprecated Moved to <a
30+
* href="https://github.com/open-telemetry/opentelemetry-java-contrib/tree/main/aws-resources">io.opentelemetry.contrib:opentelemetry-aws-resources</a>.
2831
*/
32+
@Deprecated
2933
public final class EcsResource {
3034
private static final Logger logger = Logger.getLogger(EcsResource.class.getName());
3135
private static final JsonFactory JSON_FACTORY = new JsonFactory();

‎sdk-extensions/aws/src/main/java/io/opentelemetry/sdk/extension/aws/resource/EcsResourceProvider.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,13 @@
99
import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
1010
import io.opentelemetry.sdk.resources.Resource;
1111

12-
/** {@link ResourceProvider} for automatically configuring {@link EcsResource}. */
12+
/**
13+
* {@link ResourceProvider} for automatically configuring {@link EcsResource}.
14+
*
15+
* @deprecated Moved to <a
16+
* href="https://github.com/open-telemetry/opentelemetry-java-contrib/tree/main/aws-resources">io.opentelemetry.contrib:opentelemetry-aws-resources</a>.
17+
*/
18+
@Deprecated
1319
public final class EcsResourceProvider implements ResourceProvider {
1420
@Override
1521
public Resource createResource(ConfigProperties config) {

‎sdk-extensions/aws/src/main/java/io/opentelemetry/sdk/extension/aws/resource/EksResource.java

+4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@
2525
/**
2626
* A factory for a {@link Resource} which provides information about the current ECS container if
2727
* running on AWS EKS.
28+
*
29+
* @deprecated Moved to <a
30+
* href="https://github.com/open-telemetry/opentelemetry-java-contrib/tree/main/aws-resources">io.opentelemetry.contrib:opentelemetry-aws-resources</a>.
2831
*/
32+
@Deprecated
2933
public final class EksResource {
3034
private static final Logger logger = Logger.getLogger(EksResource.class.getName());
3135

‎sdk-extensions/aws/src/main/java/io/opentelemetry/sdk/extension/aws/resource/EksResourceProvider.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,13 @@
99
import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
1010
import io.opentelemetry.sdk.resources.Resource;
1111

12-
/** {@link ResourceProvider} for automatically configuring {@link EksResource}. */
12+
/**
13+
* {@link ResourceProvider} for automatically configuring {@link EksResource}.
14+
*
15+
* @deprecated Moved to <a
16+
* href="https://github.com/open-telemetry/opentelemetry-java-contrib/tree/main/aws-resources">io.opentelemetry.contrib:opentelemetry-aws-resources</a>.
17+
*/
18+
@Deprecated
1319
public final class EksResourceProvider implements ResourceProvider {
1420
@Override
1521
public Resource createResource(ConfigProperties config) {

‎sdk-extensions/aws/src/main/java/io/opentelemetry/sdk/extension/aws/resource/LambdaResource.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,13 @@
1212
import java.util.Map;
1313
import java.util.stream.Stream;
1414

15-
/** A factory for a {@link Resource} which provides information about the AWS Lambda function. */
15+
/**
16+
* A factory for a {@link Resource} which provides information about the AWS Lambda function.
17+
*
18+
* @deprecated Moved to <a
19+
* href="https://github.com/open-telemetry/opentelemetry-java-contrib/tree/main/aws-resources">io.opentelemetry.contrib:opentelemetry-aws-resources</a>.
20+
*/
21+
@Deprecated
1622
public final class LambdaResource {
1723

1824
private static final Resource INSTANCE = buildResource();

‎sdk-extensions/aws/src/main/java/io/opentelemetry/sdk/extension/aws/resource/LambdaResourceProvider.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,13 @@
99
import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
1010
import io.opentelemetry.sdk.resources.Resource;
1111

12-
/** {@link ResourceProvider} for automatically configuring {@link LambdaResource}. */
12+
/**
13+
* {@link ResourceProvider} for automatically configuring {@link LambdaResource}.
14+
*
15+
* @deprecated Moved to <a
16+
* href="https://github.com/open-telemetry/opentelemetry-java-contrib/tree/main/aws-resources">io.opentelemetry.contrib:opentelemetry-aws-resources</a>.
17+
*/
18+
@Deprecated
1319
public final class LambdaResourceProvider implements ResourceProvider {
1420
@Override
1521
public Resource createResource(ConfigProperties config) {

‎sdk-extensions/aws/src/test/java/io/opentelemetry/sdk/extension/aws/resource/BeanstalkResourceTest.java

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.junit.jupiter.api.Test;
2222
import org.junit.jupiter.api.io.TempDir;
2323

24+
@SuppressWarnings("deprecation") // Moved to contrib
2425
class BeanstalkResourceTest {
2526

2627
@Test

‎sdk-extensions/aws/src/test/java/io/opentelemetry/sdk/extension/aws/resource/Ec2ResourceTest.java

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.junit.jupiter.api.Test;
2323
import org.junit.jupiter.api.extension.RegisterExtension;
2424

25+
@SuppressWarnings("deprecation") // Moved to contrib
2526
class Ec2ResourceTest {
2627

2728
// From https://docs.amazonaws.cn/en_us/AWSEC2/latest/UserGuide/instance-identity-documents.html

‎sdk-extensions/aws/src/test/java/io/opentelemetry/sdk/extension/aws/resource/EcsResourceTest.java

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.mockito.Mock;
2727
import org.mockito.junit.jupiter.MockitoExtension;
2828

29+
@SuppressWarnings("deprecation") // Moved to contrib
2930
@ExtendWith(MockitoExtension.class)
3031
class EcsResourceTest {
3132
private static final String ECS_METADATA_KEY_V4 = "ECS_CONTAINER_METADATA_URI_V4";

‎sdk-extensions/aws/src/test/java/io/opentelemetry/sdk/extension/aws/resource/EksResourceTest.java

+15-5
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55

66
package io.opentelemetry.sdk.extension.aws.resource;
77

8-
import static io.opentelemetry.sdk.extension.aws.resource.EksResource.AUTH_CONFIGMAP_PATH;
9-
import static io.opentelemetry.sdk.extension.aws.resource.EksResource.CW_CONFIGMAP_PATH;
10-
import static io.opentelemetry.sdk.extension.aws.resource.EksResource.K8S_SVC_URL;
118
import static io.opentelemetry.sdk.testing.assertj.OpenTelemetryAssertions.assertThat;
129
import static org.assertj.core.api.Assertions.entry;
1310
import static org.mockito.ArgumentMatchers.any;
@@ -30,6 +27,7 @@
3027
import org.mockito.Mockito;
3128
import org.mockito.junit.jupiter.MockitoExtension;
3229

30+
@SuppressWarnings("deprecation") // Moved to contrib
3331
@ExtendWith(MockitoExtension.class)
3432
public class EksResourceTest {
3533

@@ -47,9 +45,21 @@ void testEks(@TempDir File tempFolder) throws IOException {
4745
String truststore = "truststore123";
4846
Files.write(truststore.getBytes(Charsets.UTF_8), mockK8sKeystoreFile);
4947

50-
when(httpClient.fetchString(any(), Mockito.eq(K8S_SVC_URL + AUTH_CONFIGMAP_PATH), any(), any()))
48+
when(httpClient.fetchString(
49+
any(),
50+
Mockito.eq(
51+
io.opentelemetry.sdk.extension.aws.resource.EksResource.K8S_SVC_URL
52+
+ io.opentelemetry.sdk.extension.aws.resource.EksResource.AUTH_CONFIGMAP_PATH),
53+
any(),
54+
any()))
5155
.thenReturn("not empty");
52-
when(httpClient.fetchString(any(), Mockito.eq(K8S_SVC_URL + CW_CONFIGMAP_PATH), any(), any()))
56+
when(httpClient.fetchString(
57+
any(),
58+
Mockito.eq(
59+
io.opentelemetry.sdk.extension.aws.resource.EksResource.K8S_SVC_URL
60+
+ io.opentelemetry.sdk.extension.aws.resource.EksResource.CW_CONFIGMAP_PATH),
61+
any(),
62+
any()))
5363
.thenReturn("{\"data\":{\"cluster.name\":\"my-cluster\"}}");
5464
when(mockDockerHelper.getContainerId()).thenReturn("0123456789A");
5565

‎sdk-extensions/aws/src/test/java/io/opentelemetry/sdk/extension/aws/resource/LambdaResourceTest.java

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import java.util.ServiceLoader;
2020
import org.junit.jupiter.api.Test;
2121

22+
@SuppressWarnings("deprecation") // Moved to contrib
2223
class LambdaResourceTest {
2324
@Test
2425
void shouldNotCreateResourceForNotLambda() {

‎sdk-extensions/aws/src/test/resources/get-sampling-rules-response.json

-45
This file was deleted.

‎sdk-extensions/aws/src/test/resources/get-sampling-targets-request.json

-20
This file was deleted.

‎sdk-extensions/aws/src/test/resources/get-sampling-targets-response.json

-23
This file was deleted.

‎sdk-extensions/aws/src/test/resources/sampling-rule-awslambda.json

-18
This file was deleted.

‎sdk-extensions/aws/src/test/resources/sampling-rule-exactmatch.json

-18
This file was deleted.

0 commit comments

Comments
 (0)