Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-contrib into jmx-test-config-sources

Author: SylvainJuge

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -28,7 +28,6 @@ body:
         - resource-providers
         - runtime-attach
         - samplers
-        - static-instrumenter
   - type: textarea
     attributes:
       label: What happened?

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -28,7 +28,6 @@ body:
         - resource-providers
         - runtime-attach
         - samplers
-        - static-instrumenter
   - type: textarea
     attributes:
       label: Is your feature request related to a problem? Please describe.

.github/component_owners.yml

@@ -25,6 +25,8 @@ components:
   baggage-processor:
     - mikegoldsmith
     - zeitlinger
+  cloudfoundry-resources:
+    - KarstenSchnitter
   compressors:
     - jack-berg
   consistent-sampling:
@@ -74,8 +76,6 @@ components:
   samplers:
     - trask
     - jack-berg
-  static-instrumenter:
-    - anosek-an
   kafka-exporter:
     - spockz
     - vincentfree

.github/scripts/draft-change-log-entries.sh

@@ -29,6 +29,7 @@ component_names["aws-xray/"]="AWS X-Ray SDK support"
 component_names["aws-xray-propagator/"]="AWS X-Ray propagator"
 component_names["azure-resources/"]="Azure resources"
 component_names["baggage-processor/"]="Baggage processor"
+component_names["cloudfoundry-resources/"]="CloudFoundry resources"
 component_names["compressors/"]="Compressors"
 component_names["consistent-sampling/"]="Consistent sampling"
 component_names["disk-buffering/"]="Disk buffering"
@@ -49,7 +50,6 @@ component_names["runtime-attach/"]="Runtime attach"
 component_names["resource-providers/"]="Resource providers"
 component_names["samplers/"]="Samplers"
 component_names["span-stacktrace/"]="Span stack traces"
-component_names["static-instrumenter/"]="Static instrumenter"
 
 echo "## Unreleased"
 echo

CHANGELOG.md

@@ -2,6 +2,78 @@
 
 ## Unreleased
 
+## Version 1.44.0 (2025-02-21)
+
+### AWS resources
+
+- Changed resource attribute `container.image.tag` to `container.image.tags`
+  ([#1736](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1736))
+
+### AWS X-Ray propagator
+
+- Make `xray-lambda` propagator available via SPI
+  ([#1669](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1669))
+- Support Lineage in XRay trace header and remove additional baggage from being added
+  ([#1671](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1671))
+
+### CloudFoundry resources - New 🌟
+
+CloudFoundry resource detector.
+
+### Disk buffering
+
+- Use delegate's temporality
+  ([#1672](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1672))
+
+### GCP authentication extension
+
+- Publish both shaded and unshaded variants
+  ([#1688](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1688))
+
+### JMX metrics
+
+- Updated Hadoop metric unit definitions to align with semantic conventions
+  ([#1675](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1675))
+- Updated Kafka metric unit definitions to align with semantic conventions
+  ([#1670](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1670))
+
+### JMX scraper
+
+- Use SDK autoconfigure module
+  ([#1651](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1651))
+- Rename `otel.jmx.custom.scraping.config` to `otel.jmx.config` in order to align
+  with `io.opentelemetry.instrumentation:opentelemetry-jmx-metrics`
+  ([#1678](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1678))
+- Hadoop metrics added
+  ([#1675](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1675))
+- Add a CLI option to test the connection
+  ([#1684](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1684))
+- Kafka server, producer, and consumer metrics added
+  ([#1670](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1670))
+- Add custom YAML support
+  ([#1741](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1741))
+- Add SSL support
+  ([#1710](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1710))
+- Replicate JMXMP/SASL config from the JMX metrics module
+  ([#1749](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1749))
+
+### Maven extension
+
+- Support Maven 4.0
+  ([#1679](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1679))
+
+### Processors
+
+- Changed `EventToSpanEventBridge` from reading `event.name` to reading the new LogRecord
+  [EventName](https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/logs/data-model.md#field-eventname)
+  field.
+  ([#1736](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1736))
+
+### Static instrumenter
+
+- Module has been removed
+  ([#1755](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1755))
+
 ## Version 1.43.0 (2025-01-17)
 
 ### Azure resources - New 🌟

CONTRIBUTING.md

@@ -1,12 +1,38 @@
-## Contributing
+# Contributing
 
-Pull requests for bug fixes are always welcome!
+Welcome to the OpenTelemetry Java Contrib Repository!
+
+## Introduction
+
+This repository focuses on providing tools and utilities for Java-based observability, such as remote JMX metric gathering and reporting. We’re excited to have you here! Whether you’re fixing a bug, adding a feature, or suggesting an idea, your contributions are invaluable.
 
 Before submitting new features or changes to current functionality, it is recommended to first
 [open an issue](https://github.com/open-telemetry/opentelemetry-java-contrib/issues/new)
 and discuss your ideas or propose the changes you wish to make.
 
-### Building
+Questions? Ask in the OpenTelemetry [java channel](https://cloud-native.slack.com/archives/C014L2KCTE3)
+
+Pull requests for bug fixes are always welcome!
+
+## Pre-requisites
+
+To work with this repository, ensure you have:
+
+### Tools:
+
+Java 17 or higher
+
+### Platform Notes:
+
+macOS/Linux: Ensure JAVA_HOME is set correctly.
+
+## Workflow
+
+1. Fork the repository
+2. Clone locally
+3. Create a branch before working on an issue
+
+## Local Run/Build
 
 In order to build and test this whole repository you need JDK 11+.
 
@@ -22,21 +48,35 @@ the Sonatype OSS snapshots repository at `https://oss.sonatype.org/content/repos
 Building using Java 11+:
 
 ```bash
-java -version
+$ java -version
+```
+
+```bash
+$ ./gradlew assemble
 ```
 
+## Testing
+
 ```bash
-./gradlew assemble
+$ ./gradlew test
 ```
 
-### Style guide
+### Some modules have integration tests
 
-See
-the [Style guide](https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/docs/contributing/style-guideline.md)
-from the opentelemetry-java-instrumentation repository.
+```
+$ ./gradlew integrationTest
+```
+
+Follow the Java Instrumentation [Style Guide](https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/docs/contributing/style-guideline.md) from the opentelemetry-java-instrumentation repository.
 
-### Gradle conventions
+Failure? Check logs for errors or mismatched dependencies.
+
+## Gradle conventions
 
 - Use kotlin instead of groovy
 - Plugin versions should be specified in `settings.gradle.kts`, not in individual modules
 - All modules use `plugins { id("otel.java-conventions") }`
+
+## Further Help
+
+Join [#otel-java](https://cloud-native.slack.com/archives/C014L2KCTE3) on OpenTelemetry Slack

README.md

@@ -40,7 +40,6 @@ feature or via instrumentation, this project is hopefully for you.
 | alpha   | [Runtime Attach](./runtime-attach/README.md)                      |
 | alpha   | [Samplers](./samplers/README.md)                                  |
 | beta    | [Span Stacktrace Capture](./span-stacktrace/README.md)            |
-| alpha   | [Static Instrumenter](./static-instrumenter/README.md)            |
 
 \* `alpha`, `beta` and `stable` are currently used to denote library status per [otep 0232](https://github.com/open-telemetry/oteps/blob/main/text/0232-maturity-of-otel.md).
 To reach stable status, the library needs to have stable APIs, stable semantic conventions, and be production ready.

aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/EcsResource.java

@@ -192,9 +192,8 @@ static void parseResponse(
           DockerImage parsedImage = DockerImage.parse(value);
           if (parsedImage != null) {
             attrBuilders.put(CONTAINER_IMAGE_NAME, parsedImage.getRepository());
-            // TODO: CONTAINER_IMAGE_TAG has been replaced with CONTAINER_IMAGE_TAGS
             attrBuilders.put(
-                io.opentelemetry.semconv.ResourceAttributes.CONTAINER_IMAGE_TAG,
+                io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CONTAINER_IMAGE_TAGS,
                 parsedImage.getTag());
           }
           break;

aws-resources/src/main/java/io/opentelemetry/contrib/aws/resource/IncubatingAttributes.java

@@ -26,6 +26,8 @@ private IncubatingAttributes() {}
   public static final AttributeKey<String> CLOUD_REGION = AttributeKey.stringKey("cloud.region");
   public static final AttributeKey<String> CLOUD_RESOURCE_ID =
       AttributeKey.stringKey("cloud.resource_id");
+  public static final AttributeKey<List<String>> CONTAINER_IMAGE_TAGS =
+      AttributeKey.stringArrayKey("container.image.tags");
 
   public static final class CloudPlatformIncubatingValues {
     public static final String AWS_EC2 = "aws_ec2";

aws-resources/src/test/java/io/opentelemetry/contrib/aws/resource/EcsResourceTest.java

@@ -24,7 +24,9 @@
 import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CLOUD_RESOURCE_ID;
 import static io.opentelemetry.semconv.incubating.ContainerIncubatingAttributes.CONTAINER_ID;
 import static io.opentelemetry.semconv.incubating.ContainerIncubatingAttributes.CONTAINER_IMAGE_NAME;
+import static io.opentelemetry.semconv.incubating.ContainerIncubatingAttributes.CONTAINER_IMAGE_TAGS;
 import static io.opentelemetry.semconv.incubating.ContainerIncubatingAttributes.CONTAINER_NAME;
+import static java.util.Collections.singletonList;
 import static org.assertj.core.api.Assertions.entry;
 import static org.mockito.Mockito.when;
 
@@ -52,8 +54,6 @@ class EcsResourceTest {
 
   @Mock private SimpleHttpClient mockHttpClient;
 
-  // Suppression is required for CONTAINER_IMAGE_TAG until we are ready to upgrade.
-  @SuppressWarnings("deprecation")
   @Test
   void testCreateAttributesV3() throws IOException {
     Map<String, String> mockSysEnv = new HashMap<>();
@@ -78,7 +78,7 @@ void testCreateAttributesV3() throws IOException {
             entry(CONTAINER_NAME, "ecs-nginx-5-nginx-curl-ccccb9f49db0dfe0d901"),
             entry(CONTAINER_ID, "43481a6ce4842eec8fe72fc28500c6b52edcc0917f105b83379f88cac1ff3946"),
             entry(CONTAINER_IMAGE_NAME, "nrdlngr/nginx-curl"),
-            entry(io.opentelemetry.semconv.ResourceAttributes.CONTAINER_IMAGE_TAG, "latest"),
+            entry(CONTAINER_IMAGE_TAGS, singletonList("latest")),
             entry(AWS_ECS_CLUSTER_ARN, "arn:aws:ecs:us-east-2:012345678910:cluster/default"),
             entry(
                 AttributeKey.stringKey("aws.ecs.container.image.id"),
@@ -90,8 +90,6 @@ void testCreateAttributesV3() throws IOException {
             entry(AWS_ECS_TASK_REVISION, "5"));
   }
 
-  // Suppression is required for CONTAINER_IMAGE_TAG until we are ready to upgrade.
-  @SuppressWarnings("deprecation")
   @Test
   void testCreateAttributesV4() throws IOException {
     Map<String, String> mockSysEnv = new HashMap<>();
@@ -119,25 +117,22 @@ void testCreateAttributesV4() throws IOException {
             entry(CONTAINER_NAME, "ecs-curltest-26-curl-cca48e8dcadd97805600"),
             entry(CONTAINER_ID, "ea32192c8553fbff06c9340478a2ff089b2bb5646fb718b4ee206641c9086d66"),
             entry(CONTAINER_IMAGE_NAME, "111122223333.dkr.ecr.us-west-2.amazonaws.com/curltest"),
-            entry(io.opentelemetry.semconv.ResourceAttributes.CONTAINER_IMAGE_TAG, "latest"),
+            entry(CONTAINER_IMAGE_TAGS, singletonList("latest")),
             entry(
                 AttributeKey.stringKey("aws.ecs.container.image.id"),
                 "sha256:d691691e9652791a60114e67b365688d20d19940dde7c4736ea30e660d8d3553"),
             entry(AWS_ECS_CLUSTER_ARN, "arn:aws:ecs:us-west-2:111122223333:cluster/default"),
             entry(
                 AWS_ECS_CONTAINER_ARN,
                 "arn:aws:ecs:us-west-2:111122223333:container/0206b271-b33f-47ab-86c6-a0ba208a70a9"),
-            entry(AWS_LOG_GROUP_NAMES, Collections.singletonList("/ecs/metadata")),
+            entry(AWS_LOG_GROUP_NAMES, singletonList("/ecs/metadata")),
             entry(
                 AWS_LOG_GROUP_ARNS,
-                Collections.singletonList(
-                    "arn:aws:logs:us-west-2:111122223333:log-group:/ecs/metadata")),
-            entry(
-                AWS_LOG_STREAM_NAMES,
-                Collections.singletonList("ecs/curl/8f03e41243824aea923aca126495f665")),
+                singletonList("arn:aws:logs:us-west-2:111122223333:log-group:/ecs/metadata")),
+            entry(AWS_LOG_STREAM_NAMES, singletonList("ecs/curl/8f03e41243824aea923aca126495f665")),
             entry(
                 AWS_LOG_STREAM_ARNS,
-                Collections.singletonList(
+                singletonList(
                     "arn:aws:logs:us-west-2:111122223333:log-group:/ecs/metadata:log-stream:ecs/curl/8f03e41243824aea923aca126495f665")),
             entry(
                 AWS_ECS_TASK_ARN,