v1.11.0 pre-release changes (#788)

* v1.11.0 pre-release changes

* bump one plugin version

CHANGELOG.md

@@ -8,6 +8,24 @@ and this repository adheres to [Semantic Versioning](https://semver.org/spec/v2.
 
 ## Unreleased
 
+## v1.11.0 - 2022-05-18
+
+### General
+
+- OpenTelemetry Java SDK and OpenTelemetry Instrumentation for Java dependencies have been updated to version 1.14.0.
+- Micrometer dependency has been updated to version 1.9.0.
+- SignalFx metrics exporter has been updated to version 1.0.19.
+
+### Bugfixes
+
+- Fixed a bug where multiple Profiler instances on a single host would generate temporary files with the same name.
+
+### Enhancements
+
+- Implemented support for the `splunk.realm` configuration property, which allows easy configuration of exporter
+  endpoints when sending data directly to the Splunk cloud.
+- Implemented internal stack trace filtering for the allocation profiler.
+
 ## v1.10.2 - 2022-05-12
 
 ### General

README.md

@@ -12,8 +12,8 @@
 
 <p align="center">
   <img alt="Stable" src="https://img.shields.io/badge/status-stable-informational?style=for-the-badge">
-  <a href="https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v1.13.1">
-    <img alt="OpenTelemetry Instrumentation for Java Version" src="https://img.shields.io/badge/otel-1.13.1-blueviolet?style=for-the-badge">
+  <a href="https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v1.14.0">
+    <img alt="OpenTelemetry Instrumentation for Java Version" src="https://img.shields.io/badge/otel-1.14.0-blueviolet?style=for-the-badge">
   </a>
   <a href="https://github.com/signalfx/gdi-specification/releases/tag/v1.2.0">
     <img alt="Splunk GDI specification" src="https://img.shields.io/badge/GDI-1.2.0-blueviolet?style=for-the-badge">
@@ -78,11 +78,6 @@ see [Migrate from the SignalFx Java Agent](https://docs.splunk.com/Observability
 
 <!-- Comments, spacing, empty and new lines in the section below are intentional, please do not modify them! -->
 <!--DEV_DOCS_WARNING-->
-<!--DEV_DOCS_WARNING_START-->
-The following documentation refers to the in-development version of `splunk-otel-java`. Docs for the latest version ([v1.10.2](https://github.com/signalfx/splunk-otel-java/releases/latest)) can be found [here](https://github.com/signalfx/splunk-otel-java/blob/v1.10.2/README.md).
-
----
-<!--DEV_DOCS_WARNING_END-->
 
 ## Requirements
 
@@ -164,11 +159,11 @@ To extend the instrumentation with the OpenTelemetry Instrumentation for Java,
 you have to use a compatible API version.
 
 <!-- IMPORTANT: do not change comments or break those lines below -->
-The Splunk Distribution of OpenTelemetry Java version <!--SPLUNK_VERSION-->1.10.2<!--SPLUNK_VERSION--> is compatible
+The Splunk Distribution of OpenTelemetry Java version <!--SPLUNK_VERSION-->1.11.0<!--SPLUNK_VERSION--> is compatible
 with:
 
-* OpenTelemetry API version <!--OTEL_VERSION-->1.13.0<!--OTEL_VERSION-->
-* OpenTelemetry Instrumentation for Java version <!--OTEL_INSTRUMENTATION_VERSION-->1.13.1<!--OTEL_INSTRUMENTATION_VERSION-->
+* OpenTelemetry API version <!--OTEL_VERSION-->1.14.0<!--OTEL_VERSION-->
+* OpenTelemetry Instrumentation for Java version <!--OTEL_INSTRUMENTATION_VERSION-->1.14.0<!--OTEL_INSTRUMENTATION_VERSION-->
 * Micrometer version 1.9.0
 
 ## Snapshot builds

buildSrc/build.gradle.kts

@@ -2,7 +2,7 @@ plugins {
   `kotlin-dsl`
 
   // When updating, update below in dependencies too
-  id("com.diffplug.spotless") version "6.3.0"
+  id("com.diffplug.spotless") version "6.4.2"
 }
 
 spotless {
@@ -24,8 +24,8 @@ repositories {
 dependencies {
   implementation(gradleApi())
 
-  implementation("com.diffplug.spotless:spotless-plugin-gradle:6.3.0")
-  implementation("io.opentelemetry.instrumentation:gradle-plugins:1.11.0-alpha")
+  implementation("com.diffplug.spotless:spotless-plugin-gradle:6.4.2")
+  implementation("io.opentelemetry.instrumentation:gradle-plugins:1.14.0-alpha")
   implementation("io.spring.gradle:dependency-management-plugin:1.0.11.RELEASE")
 
   // keep these versions in sync with settings.gradle.kts

buildSrc/src/main/kotlin/splunk.java-conventions.gradle.kts

@@ -16,8 +16,8 @@ repositories {
 val otelVersion = "1.14.0"
 val otelAlphaVersion = "1.14.0-alpha"
 val otelContribAlphaVersion = "1.13.0-alpha"
-val otelInstrumentationVersion = "1.14.0-SNAPSHOT"
-val otelInstrumentationAlphaVersion = "1.14.0-alpha-SNAPSHOT"
+val otelInstrumentationVersion = "1.14.0"
+val otelInstrumentationAlphaVersion = "1.14.0-alpha"
 val micrometerVersion = "1.9.0"
 
 // instrumentation version is used to compute Implementation-Version manifest attribute
@@ -27,23 +27,19 @@ extensions.configure<DependencyManagementExtension>("dependencyManagement") {
   dependencies {
     dependency("com.google.auto.service:auto-service:1.0.1")
     dependency("org.assertj:assertj-core:3.22.0")
-    dependency("org.awaitility:awaitility:4.1.1")
-    dependency("io.jaegertracing:jaeger-client:1.7.0")
-    dependency("com.signalfx.public:signalfx-java:1.0.18")
+    dependency("org.awaitility:awaitility:4.2.0")
+    dependency("io.jaegertracing:jaeger-client:1.8.0")
+    dependency("com.signalfx.public:signalfx-java:1.0.19")
 
     dependencySet("com.github.docker-java:3.2.11") {
       entry("docker-java-core")
       entry("docker-java-transport-httpclient5")
     }
-    dependencySet("com.google.protobuf:3.18.1") {
-      entry("protobuf-java")
-      entry("protobuf-java-util")
-    }
-    dependencySet("org.mockito:4.2.0") {
+    dependencySet("org.mockito:4.4.0") {
       entry("mockito-core")
       entry("mockito-junit-jupiter")
     }
-    dependencySet("org.slf4j:1.7.32") {
+    dependencySet("org.slf4j:1.7.36") {
       entry("slf4j-api")
       entry("slf4j-simple")
     }
@@ -85,13 +81,14 @@ extensions.configure<DependencyManagementExtension>("dependencyManagement") {
   }
 
   imports {
+    mavenBom("com.google.protobuf:protobuf-bom:3.20.0")
     mavenBom("com.squareup.okhttp3:okhttp-bom:4.9.3")
-    mavenBom("io.grpc:grpc-bom:1.41.0")
+    mavenBom("io.grpc:grpc-bom:1.45.1")
     mavenBom("io.micrometer:micrometer-bom:$micrometerVersion")
     mavenBom("io.opentelemetry:opentelemetry-bom-alpha:$otelAlphaVersion")
     mavenBom("io.opentelemetry:opentelemetry-bom:$otelVersion")
     mavenBom("org.junit:junit-bom:5.8.2")
-    mavenBom("org.testcontainers:testcontainers-bom:1.16.2")
+    mavenBom("org.testcontainers:testcontainers-bom:1.16.3")
   }
 }
 

custom/src/main/java/com/splunk/opentelemetry/SplunkConfiguration.java

@@ -17,13 +17,13 @@
 package com.splunk.opentelemetry;
 
 import com.google.auto.service.AutoService;
-import io.opentelemetry.javaagent.extension.config.ConfigPropertySource;
+import io.opentelemetry.javaagent.extension.config.ConfigCustomizer;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Function;
 
-@AutoService(ConfigPropertySource.class)
-public class SplunkConfiguration implements ConfigPropertySource {
+@AutoService(ConfigCustomizer.class)
+public class SplunkConfiguration implements ConfigCustomizer {
   public static final String SPLUNK_ACCESS_TOKEN = "splunk.access.token";
   public static final String OTEL_EXPORTER_JAEGER_ENDPOINT = "otel.exporter.jaeger.endpoint";
   public static final String PROFILER_ENABLED_PROPERTY = "splunk.profiler.enabled";
@@ -47,14 +47,15 @@ public SplunkConfiguration() {
   }
 
   @Override
-  public Map<String, String> getProperties() {
+  public Map<String, String> defaultProperties() {
     Map<String, String> config = new HashMap<>();
 
     config.put("otel.traces.sampler", "always_on");
 
     // by default no metrics are exported
     config.put("otel.metrics.exporter", "none");
 
+    // TODO: use the customize(Config) method for this instead
     String realm = getRealm();
     if (!SPLUNK_REALM_NONE.equals(realm)) {
       config.put("otel.exporter.otlp.traces.endpoint", "https://ingest." + realm + ".signalfx.com");
@@ -68,13 +69,13 @@ public Map<String, String> getProperties() {
 
     // instrumentation settings
 
-    // disable span links in messaging instrumentations
-    config.put("otel.instrumentation.common.experimental.suppress-messaging-receive-spans", "true");
-
     // disable logging instrumentations - we're not currently sending logs (yet)
     config.put("otel.instrumentation.java-util-logging.enabled", "false");
+    config.put("otel.instrumentation.jboss-logmanager.enabled", "false");
     config.put("otel.instrumentation.log4j-appender.enabled", "false");
     config.put("otel.instrumentation.logback-appender.enabled", "false");
+    // disable otel hikari instrumentation, we use our own for now
+    config.put("otel.instrumentation.hikaricp.enabled", "false");
     // disable otel micrometer instrumentation, we use our own for now
     config.put("otel.instrumentation.micrometer.enabled", "false");
     // disable oshi metrics too, just in case

custom/src/test/java/com/splunk/opentelemetry/SplunkConfigurationTest.java

@@ -72,6 +72,6 @@ private static Map<String, String> configuration(String envValue, String propert
     return new SplunkConfiguration(
             name -> SplunkConfiguration.SPLUNK_REALM_PROPERTY.equals(name) ? propertyValue : null,
             name -> "SPLUNK_REALM".equals(name) ? envValue : null)
-        .getProperties();
+        .defaultProperties();
   }
 }

deployments/cloudfoundry/buildpack/README.md

@@ -40,7 +40,7 @@ If you want to use a specific version of the Java agent in your application, you
 environment variable before application deployment, either using `cf set-env` or the `manifest.yml` file:
 
 ```sh
-$ cf set-env SPLUNK_OTEL_JAVA_VERSION 1.10.2
+$ cf set-env SPLUNK_OTEL_JAVA_VERSION 1.11.0
 ```
 
 By default, the [latest](https://github.com/signalfx/splunk-otel-java/releases/latest) available agent version is used.