Merge branch 'main' into integration-test-hadoop

Author: robsunday

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -17,6 +17,7 @@ body:
         - jfr-connection
         - jfr-events
         - jmx-metrics
+        - jmx-scraper
         - maven-extension
         - micrometer-meter-provider
         - noop-api

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -17,6 +17,7 @@ body:
         - jfr-connection
         - jfr-events
         - jmx-metrics
+        - jmx-scraper
         - maven-extension
         - micrometer-meter-provider
         - noop-api

.github/renovate.json5

@@ -6,15 +6,14 @@
   "packageRules": [
     {
       "matchPackageNames": [
-        "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha",
-        "io.opentelemetry.semconv:opentelemetry-semconv",
-        "io.opentelemetry.semconv:opentelemetry-semconv-incubating",
-        "io.opentelemetry.proto:opentelemetry-proto"
+        "io.opentelemetry:**",
+        "io.opentelemetry.instrumentation:**",
+        "io.opentelemetry.semconv:**",
+        "io.opentelemetry.proto:**"
       ],
       // Renovate's default behavior is only to update from unstable -> unstable if it's for the
       // major.minor.patch, under the assumption that you would want to update to the stable version
       // of that release instead of the unstable version for a future release
-      // (TODO remove once the artifacts above release stable versions)
       "ignoreUnstable": false
     },
     {
@@ -25,10 +24,6 @@
       "matchPackagePrefixes": ["io.micrometer:"],
       "groupName": "micrometer packages"
     },
-    {
-      "matchPackagePrefixes": ["com.gradle.enterprise"],
-      "groupName": "gradle enterprise packages"
-    },
     {
       // prevent 3.0.1u2 -> 3.0.1
       "matchPackageNames": ["com.google.code.findbugs:annotations"],

.github/scripts/get-version.sh

@@ -1,3 +1,3 @@
 #!/bin/bash -e
 
-grep -Po "val stableVersion = \"\K[0-9]+.[0-9]+.[0-9]+" version.gradle.kts
+grep "val stableVersion = " version.gradle.kts | grep -Eo "[0-9]+.[0-9]+.[0-9]+"

.github/workflows/build.yml

@@ -30,8 +30,6 @@ jobs:
           cache-read-only: ${{ github.event_name == 'pull_request' }}
       - name: Gradle build and test
         run: ./gradlew build -x test
-        env:
-          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
 
   test:
     name: test (${{ matrix.test-java-version }})
@@ -71,8 +69,6 @@ jobs:
           -PtestJavaVersion=${{ matrix.test-java-version }}
           -Porg.gradle.java.installations.paths=${{ steps.setup-test-java.outputs.path }}
           -Porg.gradle.java.installations.auto-download=false
-        env:
-          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
 
   integration-test:
     runs-on: ubuntu-latest
@@ -89,10 +85,9 @@ jobs:
         uses: gradle/actions/setup-gradle@v4
         with:
           cache-read-only: ${{ github.event_name == 'pull_request' }}
+
       - name: Integration test
         run: ./gradlew integrationTest
-        env:
-          GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
 
       - name: Save integration test results
         uses: actions/upload-artifact@v4

CHANGELOG.md

@@ -2,8 +2,57 @@
 
 ## Unreleased
 
+## Version 1.42.0 (2024-12-13)
+
+### AWS X-Ray SDK support
+
+- Update semconv dependency version
+  ([#1585](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1585))
+
+### Baggage processor
+
+- [baggage-processor] Add BaggageLogRecordProcessor
+  ([#1576](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1576))
+
+### Disk buffering
+
+- Deserialization validation
+  ([#1571](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1571))
+
+### JMX metrics
+
+- Align HBase metric units to semconv
+  ([#1538](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1538))
+- Align Cassandra metric units to semconv
+  ([#1591](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1591))
+- Align Tomcat metric units to semconv
+  ([#1589](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1589))
+- Align JVM units to semconv
+  ([#1593](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1593))
+
+### JMX scraper - New 🌟
+
+The future of the [JMX metrics](./jmx-metrics/README.md) component,
+built on top of the
+[JMX metrics](https://github.com/open-telemetry/opentelemetry-java-instrumentation/tree/main/instrumentation/jmx-metrics/javaagent#jmx-metric-insight)
+component from the opentelemetry-java-instrumentation repository.
+
+### Maven extension
+
+- Load OTel SDK config from environment variables and system properties
+  ([#1434](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1434))
+- Workaround `NoClassDefFoundError` in `@PreDestroy` waiting for MNG-7056
+  ([#1431](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1431))
+
 ## Version 1.41.0 (2024-11-21)
 
+### JMX metrics
+
+- Align ActiveMQ metric units to semconv
+  ([#1553](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1553))
+- Align Jetty metric units to semconv
+  ([#1517](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1517))
+
 ### Inferred spans
 
 - Allow customization of parent-override behavior
@@ -107,7 +156,9 @@
 ### Inferred spans - New 🌟
 
 An OpenTelemetry extension for generating spans via profiling instead of instrumentation.
-This extension enhances traces by running [async-profiler](https://github.com/async-profiler/async-profiler) in wall-clock profiling mode
+This extension enhances traces by
+running [async-profiler](https://github.com/async-profiler/async-profiler) in wall-clock profiling
+mode
 whenever there is an active sampled OpenTelemetry span.
 
 The resulting profiling data is analyzed afterward and spans are "inferred".
@@ -171,7 +222,7 @@ This module provides a SpanProcessor that stamps baggage onto spans as attribute
 ### JMX metrics
 
 - Add support for newly named Tomcat MBean with Spring
-([#1269](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1269))
+  ([#1269](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1269))
 
 ### Span stack traces - New 🌟
 
@@ -239,7 +290,8 @@ This module provides GCP resource detectors for OpenTelemetry.
 
 ### Kafka exporter - New 🌟
 
-This module contains `KafkaSpanExporter`, which is an implementation of the `io.opentelemetry.sdk.trace.export.SpanExporter` interface.
+This module contains `KafkaSpanExporter`, which is an implementation of the
+`io.opentelemetry.sdk.trace.export.SpanExporter` interface.
 
 `KafkaSpanExporter` can be used for sending `SpanData` to a Kafka topic.
 
@@ -329,7 +381,7 @@ which can be sent later on demand.
 
 - Links based sampler
   ([#813](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/813),
-   [#903](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/903))
+  [#903](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/903))
 
 ## Version 1.26.0 (2023-05-17)
 

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

@@ -11,9 +11,9 @@
 import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CLOUD_PROVIDER;
 import static io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes.SERVICE_INSTANCE_ID;
 import static io.opentelemetry.semconv.incubating.ServiceIncubatingAttributes.SERVICE_NAMESPACE;
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.assertj.core.api.Assertions.entry;
 
-import com.google.common.base.Charsets;
 import com.google.common.io.Files;
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
@@ -33,7 +33,7 @@ void testCreateAttributes(@TempDir File tempFolder) throws IOException {
     String content =
         "{\"noise\": \"noise\", \"deployment_id\":4,\""
             + "version_label\":\"2\",\"environment_name\":\"HttpSubscriber-env\"}";
-    Files.write(content.getBytes(Charsets.UTF_8), file);
+    Files.write(content.getBytes(UTF_8), file);
     Resource resource = BeanstalkResource.buildResource(file.getPath());
     Attributes attributes = resource.getAttributes();
     assertThat(attributes)
@@ -59,7 +59,7 @@ void testBadConfigFile(@TempDir File tempFolder) throws IOException {
     String content =
         "\"deployment_id\":4,\"version_label\":\"2\",\""
             + "environment_name\":\"HttpSubscriber-env\"}";
-    Files.write(content.getBytes(Charsets.UTF_8), file);
+    Files.write(content.getBytes(UTF_8), file);
     Attributes attributes = BeanstalkResource.buildResource(file.getPath()).getAttributes();
     assertThat(attributes).isEmpty();
   }

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

@@ -5,9 +5,9 @@
 
 package io.opentelemetry.contrib.aws.resource;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import com.google.common.base.Charsets;
 import com.google.common.io.Files;
 import java.io.File;
 import java.io.IOException;
@@ -26,7 +26,7 @@ void testCgroupFileMissing() {
   void testContainerIdMissing(@TempDir File tempFolder) throws IOException {
     File file = new File(tempFolder, "no_container_id");
     String content = "13:pids:/\n" + "12:hugetlb:/\n" + "11:net_prio:/";
-    Files.write(content.getBytes(Charsets.UTF_8), file);
+    Files.write(content.getBytes(UTF_8), file);
 
     DockerHelper dockerHelper = new DockerHelper(file.getPath());
     assertThat(dockerHelper.getContainerId()).isEmpty();
@@ -37,7 +37,7 @@ void testGetContainerId(@TempDir File tempFolder) throws IOException {
     File file = new File(tempFolder, "cgroup");
     String expected = "386a1920640799b5bf5a39bd94e489e5159a88677d96ca822ce7c433ff350163";
     String content = "dummy\n11:devices:/ecs/bbc36dd0-5ee0-4007-ba96-c590e0b278d2/" + expected;
-    Files.write(content.getBytes(Charsets.UTF_8), file);
+    Files.write(content.getBytes(UTF_8), file);
 
     DockerHelper dockerHelper = new DockerHelper(file.getPath());
     assertThat(dockerHelper.getContainerId()).isEqualTo(expected);

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

@@ -13,11 +13,11 @@
 import static io.opentelemetry.semconv.incubating.CloudIncubatingAttributes.CLOUD_PROVIDER;
 import static io.opentelemetry.semconv.incubating.ContainerIncubatingAttributes.CONTAINER_ID;
 import static io.opentelemetry.semconv.incubating.K8sIncubatingAttributes.K8S_CLUSTER_NAME;
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.assertj.core.api.Assertions.entry;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
-import com.google.common.base.Charsets;
 import com.google.common.io.Files;
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.sdk.autoconfigure.spi.ResourceProvider;
@@ -44,10 +44,10 @@ public class EksResourceTest {
   void testEks(@TempDir File tempFolder) throws IOException {
     File mockK8sTokenFile = new File(tempFolder, "k8sToken");
     String token = "token123";
-    Files.write(token.getBytes(Charsets.UTF_8), mockK8sTokenFile);
+    Files.write(token.getBytes(UTF_8), mockK8sTokenFile);
     File mockK8sKeystoreFile = new File(tempFolder, "k8sCert");
     String truststore = "truststore123";
-    Files.write(truststore.getBytes(Charsets.UTF_8), mockK8sKeystoreFile);
+    Files.write(truststore.getBytes(UTF_8), mockK8sKeystoreFile);
 
     when(httpClient.fetchString(any(), Mockito.eq(K8S_SVC_URL + AUTH_CONFIGMAP_PATH), any(), any()))
         .thenReturn("not empty");

aws-xray/build.gradle.kts

@@ -13,7 +13,8 @@ dependencies {
   compileOnly("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
 
   implementation("com.squareup.okhttp3:okhttp")
-  implementation("io.opentelemetry:opentelemetry-semconv")
+  implementation("io.opentelemetry.semconv:opentelemetry-semconv")
+  implementation("io.opentelemetry.semconv:opentelemetry-semconv-incubating")
 
   annotationProcessor("com.google.auto.service:auto-service")
   testImplementation("com.google.auto.service:auto-service")
@@ -45,10 +46,3 @@ testing {
     }
   }
 }
-
-configurations.all {
-  resolutionStrategy {
-    // TODO this module still needs to be updated to the latest semconv
-    force("io.opentelemetry:opentelemetry-semconv:1.28.0-alpha")
-  }
-}