Merge branch 'main' into source-otel-sdk-confi-from-system-out-and-env

Author: cyrille-leclerc

.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/component_owners.yml

@@ -41,6 +41,11 @@ components:
     - sfriberg
   jmx-metrics:
     - breedx-splk
+    - sylvainjuge
+  jmx-scraper:
+    - breedx-splk
+    - robsunday
+    - sylvainjuge
   maven-extension:
     - cyrille-leclerc
     - kenfinnigan
@@ -51,6 +56,7 @@ components:
   processors:
     - LikeTheSalad
     - breedx-splk
+    - jack-berg
   prometheus-collector:
     - jkwatson
   resource-providers:
@@ -61,6 +67,7 @@ components:
     - jeanbisutti
   samplers:
     - trask
+    - jack-berg
   static-instrumenter:
     - anosek-an
   kafka-exporter:
@@ -74,3 +81,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

@@ -8,12 +8,13 @@
       "matchPackageNames": [
         "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha",
         "io.opentelemetry.semconv:opentelemetry-semconv",
-        "io.opentelemetry.semconv:opentelemetry-semconv-incubating"
+        "io.opentelemetry.semconv:opentelemetry-semconv-incubating",
+        "io.opentelemetry.proto: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
-      // (but there's never any stable version of these artifacts so this logic doesn't apply)
+      // (TODO remove once the artifacts above release stable versions)
       "ignoreUnstable": false
     },
     {
@@ -28,6 +29,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 +52,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"],
@@ -73,6 +85,13 @@
       "matchPackagePrefixes": ["org.openjdk.jmc"],
       "matchUpdateTypes": ["major"],
       "enabled": false
+    },
+    {
+      // pinned version for compatibility
+      "matchFileNames": ["jmx-scraper/test-webapp/build.gradle.kts"],
+      "matchPackagePrefixes": ["jakarta.servlet:"],
+      "matchCurrentVersion": "5.0.0",
+      "enabled": false
     }
   ]
 }

.github/workflows/build.yml

@@ -153,7 +153,7 @@ jobs:
           GPG_PASSWORD: ${{ secrets.GPG_PASSWORD }}
 
   required-status-check:
-    if: github.event_name == 'pull_request'
+    if: github.event_name == 'pull_request' && always()
     needs:
       - build
       - integration-test

CHANGELOG.md

@@ -2,6 +2,89 @@
 
 ## Unreleased
 
+## Version 1.41.0 (2024-11-21)
+
+### Inferred spans
+
+- Allow customization of parent-override behavior
+  ([#1533](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1533))
+
+### Telemetry processors
+
+- Add LogRecordProcessor to record event log records as span events
+  ([#1551](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1551))
+
+## Version 1.40.0 (2024-10-18)
+
+### AWS X-Ray SDK support
+
+- Ensure all XRay Sampler functionality is under ParentBased logic
+  ([#1488](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1488))
+
+### GCP Resources
+
+- Add gcr job support
+  ([#1462](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1462))
+
+### Inferred spans
+
+- Rename param and description to proper value
+  ([#1486](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1486))
+
+### JFR connection
+
+- Fix wrong parameter sent to JFR DiagnosticCommand
+  ([#1492](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1492))
+
+### Span stack traces
+
+- Support autoconfigure
+  ([#1499](https://github.com/open-telemetry/opentelemetry-java-contrib/pull/1499))
+
+## 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

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
 
@@ -69,8 +84,8 @@ Maintainers ([@open-telemetry/java-contrib-maintainers](https://github.com/orgs/
 Emeritus maintainers:
 
 - [Mateusz Rzeszutek](https://github.com/mateuszrzeszutek)
-- [Nikita Salnikov-Tarnovski](https://github.com/iNikem), Splunk
-- [Ryan Fitzpatrick](https://github.com/rmfitzpatrick), Splunk
+- [Nikita Salnikov-Tarnovski](https://github.com/iNikem)
+- [Ryan Fitzpatrick](https://github.com/rmfitzpatrick)
 
 Learn more about roles in the [community repository](https://github.com/open-telemetry/community/blob/main/guides/contributor/membership.md).
 

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

@@ -7,8 +7,8 @@
 
 import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CLOUD_PLATFORM;
 import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CLOUD_PROVIDER;
-import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudPlatformValues.AWS_ELASTIC_BEANSTALK;
-import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudProviderValues.AWS;
+import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudPlatformIncubatingValues.AWS_ELASTIC_BEANSTALK;
+import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudProviderIncubatingValues.AWS;
 import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.SERVICE_INSTANCE_ID;
 import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.SERVICE_NAMESPACE;
 import static io.opentelemetry.semconv.ServiceAttributes.SERVICE_VERSION;

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

@@ -10,7 +10,7 @@
 import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CLOUD_PLATFORM;
 import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CLOUD_PROVIDER;
 import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CLOUD_REGION;
-import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudPlatformValues.AWS_EC2;
+import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.CloudPlatformIncubatingValues.AWS_EC2;
 import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.HOST_ID;
 import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.HOST_IMAGE_ID;
 import static io.opentelemetry.contrib.aws.resource.IncubatingAttributes.HOST_NAME;
@@ -89,7 +89,7 @@ static Resource buildResource(String endpoint) {
     String hostname = fetchHostname(hostnameUrl, token);
 
     AttributesBuilder attrBuilders = Attributes.builder();
-    attrBuilders.put(CLOUD_PROVIDER, IncubatingAttributes.CloudProviderValues.AWS);
+    attrBuilders.put(CLOUD_PROVIDER, IncubatingAttributes.CloudProviderIncubatingValues.AWS);
     attrBuilders.put(CLOUD_PLATFORM, AWS_EC2);
 
     try (JsonParser parser = JSON_FACTORY.createParser(identity)) {