Merge branch 'main' of github.com:dsgrieve/opentelemetry-java-contrib

Author: David Grieve

.github/component_owners.yml

@@ -41,6 +41,10 @@ components:
     - sfriberg
   jmx-metrics:
     - breedx-splk
+  jmx-scraper:
+    - breedx-splk
+    - robsunday
+    - sylvainjuge
   maven-extension:
     - cyrille-leclerc
     - kenfinnigan
@@ -61,6 +65,7 @@ components:
     - jeanbisutti
   samplers:
     - trask
+    - jack-berg
   static-instrumenter:
     - anosek-an
   kafka-exporter:
@@ -74,3 +79,5 @@ components:
     - jackshirazi
     - jonaskunz
     - sylvainjuge
+  opamp-client:
+    - LikeTheSalad

.github/config/markdown-link-check-config.json

@@ -1,5 +1,9 @@
 {
   "retryOn429": true,
+  "aliveStatusCodes": [
+    200,
+    403
+  ],
   "ignorePatterns": [
     {
       "pattern": "^https://developer\\.mend\\.io/github/open-telemetry/opentelemetry-java-contrib$"

.github/renovate.json5

@@ -28,6 +28,11 @@
       "matchPackagePrefixes": ["com.gradle.enterprise"],
       "groupName": "gradle enterprise packages"
     },
+    {
+      // prevent 3.0.1u2 -> 3.0.1
+      "matchPackageNames": ["com.google.code.findbugs:annotations"],
+      "allowedVersions": "!/^3\\.0\\.1$/"
+    },
     {
       // disruptor 4+ requires Java 11+
       "matchPackageNames": ["com.lmax:disruptor"],
@@ -46,6 +51,12 @@
       "matchUpdateTypes": ["major"],
       "enabled": false
     },
+    {
+      // agrona 1.23+ requires Java 17+
+      "matchPackageNames": ["org.agrona:agrona"],
+      "matchUpdateTypes": ["major", "minor"],
+      "enabled": false
+    },
     {
       // system-stubs-jupiter 2.1+ requires Java 11+
       "matchPackageNames": ["uk.org.webcompere:system-stubs-jupiter"],

.github/workflows/release.yml

@@ -132,10 +132,12 @@ jobs:
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
+          instrumentation_version=$(grep -Po "val otelInstrumentationVersion = \"\K[0-9]+.[0-9]+.[0-9]+" dependencyManagement/build.gradle.kts)
+
           # conditional blocks not indented because of the heredoc
           if [[ $VERSION == *.0 ]]; then
           cat > /tmp/release-notes.txt << EOF
-          This release targets the OpenTelemetry SDK $VERSION.
+          This release targets the OpenTelemetry Java Instrumentation [$instrumentation_version](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v$instrumentation_version).
 
           EOF
           else

CHANGELOG.md

@@ -2,6 +2,57 @@
 
 ## Unreleased
 
+## Version 1.39.0 (2024-09-17)
+
+### AWS X-Ray propagator
+
+- Handle too short `X-Amzn-Trace-Id` header
+  ([#1036](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1036))
+- Add declarative config support for aws xray propagators
+  ([#1442](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1442))
+
+### AWS X-Ray SDK support
+
+- Fix native mode error cause by static init of random
+  ([#862](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/862))
+
+### Consistent sampling
+
+- Composite Samplers prototype
+  ([#1443](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1443))
+
+### Disk buffering
+
+- Add debug mode for verbose logging
+  ([#1455](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1455))
+
+### GCP Resources
+
+- Fix incorrect `cloud.platform` value for GCF
+  ([#1454](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1454))
+
+### JMX metrics
+
+- Add option to aggregate across multiple MBeans
+  ([#1366](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1366))
+
+### Samplers
+
+- Add declarative config support for `RuleBasedRoutingSampler`
+  ([#1440](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1440))
+
+### Span stack traces
+
+- Add config option `otel.java.experimental.span-stacktrace.min.duration`
+  ([#1414](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1414))
+
+## Version 1.38.0 (2024-08-19)
+
+### JFR connection
+
+- Recording close should not throw exception
+  ([#1412](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1412))
+
 ## Version 1.37.0 (2024-07-18)
 
 ### AWS resources

README.md

@@ -9,22 +9,37 @@ feature or via instrumentation, this project is hopefully for you.
 
 ## Provided Libraries
 
-* [AWS Resources](./aws-resources/README.md)
-* [AWS X-Ray SDK Support](./aws-xray/README.md)
-* [AWS X-Ray Propagator](./aws-xray-propagator/README.md)
-* [zstd Compressor](./compressors/compressor-zstd/README.md)
-* [Consistent Sampling](./consistent-sampling/README.md)
-* [Disk Buffering](./disk-buffering/README.md)
-* [GCP Resources](./gcp-resources/README.md)
-* [JMX Metric Gatherer](./jmx-metrics/README.md)
-* [No-Op API](./noop-api/README.md)
-* [OpenTelemetry Maven Extension](./maven-extension/README.md)
-* [Prometheus Client Bridge](./prometheus-client-bridge/README.md)
-* [Resource Providers](./resource-providers/README.md)
-* [Runtime Attach](./runtime-attach/README.md)
-* [Samplers](./samplers/README.md)
-* [Static Instrumenter](./static-instrumenter/README.md)
-* [Kafka Support](./kafka-exporter/README.md)
+| Status* | Library                                                           |
+| ------- | ----------------------------------------------------------------- |
+| beta    | [AWS Resources](./aws-resources/README.md)                        |
+| stable  | [AWS X-Ray SDK Support](./aws-xray/README.md)                     |
+| alpha   | [AWS X-Ray Propagator](./aws-xray-propagator/README.md)           |
+| alpha   | [Baggage Span Processor](./baggage-processor/README.md)           |
+| alpha   | [zstd Compressor](./compressors/compressor-zstd/README.md)        |
+| alpha   | [Consistent Sampling](./consistent-sampling/README.md)            |
+| alpha   | [Disk Buffering](./disk-buffering/README.md)                      |
+| beta    | [GCP Resources](./gcp-resources/README.md)                        |
+| beta    | [Inferred Spans](./inferred-spans/README.md)                      |
+| alpha   | [JFR Connection](./jfr-connection/README.md)                      |
+| alpha   | [JFR Events](./jfr-events/README.md)                              |
+| alpha   | [JMX Metric Gatherer](./jmx-metrics/README.md)                    |
+| alpha   | [Kafka Support](./kafka-exporter/README.md)                       |
+| alpha   | [OpenTelemetry Maven Extension](./maven-extension/README.md)      |
+| alpha   | [Micrometer MeterProvider](./micrometer-meter-provider/README.md) |
+| alpha   | [No-Op API](./noop-api/README.md)                                 |
+| alpha   | [Intercept and Process Signals Globally](./processors/README.md)  |
+| alpha   | [Prometheus Client Bridge](./prometheus-client-bridge/README.md)  |
+| alpha   | [Resource Providers](./resource-providers/README.md)              |
+| 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.
+On reaching stable status, the `otel.stable` value in `gradle.properties` should be set to `true`.
+Note that currently all the libraries are released together with the version of this repo, so breaking changes (after stable
+status is reached) would bump the major version of all libraries together. This could get complicated so `stable` has a high bar.
 
 ## Getting Started
 

aws-xray-propagator/build.gradle.kts

@@ -13,5 +13,7 @@ dependencies {
   testImplementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure")
   testImplementation("io.opentelemetry:opentelemetry-sdk-trace")
   testImplementation("io.opentelemetry:opentelemetry-sdk-testing")
+
+  testImplementation("io.opentelemetry:opentelemetry-sdk-extension-incubator")
   testImplementation("uk.org.webcompere:system-stubs-jupiter:2.0.3")
 }

aws-xray-propagator/src/main/java/io/opentelemetry/contrib/awsxray/propagator/AwsXrayLambdaPropagator.java

@@ -79,6 +79,11 @@ public <C> Context extract(Context context, @Nullable C carrier, TextMapGetter<C
         MapGetter.INSTANCE);
   }
 
+  @Override
+  public String toString() {
+    return "AwsXrayLambdaPropagator";
+  }
+
   private static boolean isEmptyOrNull(@Nullable String value) {
     return value == null || value.isEmpty();
   }

aws-xray-propagator/src/main/java/io/opentelemetry/contrib/awsxray/propagator/AwsXrayPropagator.java

@@ -169,6 +169,11 @@ public <C> Context extract(Context context, @Nullable C carrier, TextMapGetter<C
     return getContextFromHeader(context, carrier, getter);
   }
 
+  @Override
+  public String toString() {
+    return "AwsXrayPropagator";
+  }
+
   private static <C> Context getContextFromHeader(
       Context context, @Nullable C carrier, TextMapGetter<C> getter) {
     String traceHeader = getter.get(carrier, TRACE_HEADER_KEY);
@@ -290,7 +295,8 @@ private static String parseShortTraceId(String xrayTraceId) {
     int secondDelimiter = xrayTraceId.indexOf(TRACE_ID_DELIMITER, firstDelimiter + 2);
     if (firstDelimiter != TRACE_ID_DELIMITER_INDEX_1
         || secondDelimiter == -1
-        || secondDelimiter > TRACE_ID_DELIMITER_INDEX_2) {
+        || secondDelimiter > TRACE_ID_DELIMITER_INDEX_2
+        || xrayTraceId.length() < secondDelimiter + 25) {
       return TraceId.getInvalid();
     }
 

aws-xray-propagator/src/main/java/io/opentelemetry/contrib/awsxray/propagator/AwsConfigurablePropagator.java renamed to aws-xray-propagator/src/main/java/io/opentelemetry/contrib/awsxray/propagator/internal/AwsConfigurablePropagator.java

@@ -3,9 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package io.opentelemetry.contrib.awsxray.propagator;
+package io.opentelemetry.contrib.awsxray.propagator.internal;
 
 import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.contrib.awsxray.propagator.AwsXrayPropagator;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigurablePropagatorProvider;