Update OpenTelemetry/Instrumentation to 1.24.0/1.24.0. (#155)

* Update OpenTelemetry/Instrumentation to 1.24.0/1.24.0.
lightstep · Mar 27, 2023 · 125c4db · 125c4db
1 parent 705590c
commit 125c4db
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,7 @@
 <a name="Pending Release"></a>
 ## [Pending Release](https://github.com/lightstep/otel-launcher-java/compare/1.22.0...main)
+* Use OpenTelemetry Java API/SDK version 1.24.0
+* Use OpenTelemetry Java Instrumentation version 1.24.0
 
 <a name="1.22.0"></a>
 ## [1.22.0](https://github.com/lightstep/otel-launcher-java/compare/1.21.0...1.22.0)

diff --git a/agent/pom.xml b/agent/pom.xml
@@ -59,7 +59,7 @@
                     <Agent-Class>com.lightstep.opentelemetry.agent.LightstepBootstrap</Agent-Class>
                     <Premain-Class>com.lightstep.opentelemetry.agent.LightstepBootstrap
                     </Premain-Class>
-                    <Implementation-Version>1.22.1</Implementation-Version>
+                    <Implementation-Version>1.24.0</Implementation-Version>
                     <Can-Redefine-Classes>true</Can-Redefine-Classes>
                     <Can-Retransform-Classes>true</Can-Retransform-Classes>
                   </manifestEntries>

diff --git a/common/src/main/java/com/lightstep/opentelemetry/common/VariablesConverter.java b/common/src/main/java/com/lightstep/opentelemetry/common/VariablesConverter.java
@@ -156,7 +156,7 @@ public static void setSystemProperties(Configuration configuration, boolean isAg
         System.setProperty("otel.exporter.otlp.metrics.temporality.preference", configuration.metricsTemporality);
       }
       // Enable by default expo histogram aggregation.
-      System.setProperty("otel.exporter.otlp.metrics.default.histogram.aggregation", "exponential_bucket_histogram");
+      System.setProperty("otel.exporter.otlp.metrics.default.histogram.aggregation", "base2_exponential_bucket_histogram");
 
       System.setProperty("otel.metrics.exporter", "otlp");
     } else {

diff --git a/...er/src/test/java/com/lightstep/opentelemetry/launcher/OpenTelemetryConfigurationTest.java b/...er/src/test/java/com/lightstep/opentelemetry/launcher/OpenTelemetryConfigurationTest.java
@@ -7,6 +7,7 @@
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.api.OpenTelemetry;
 import io.opentelemetry.api.logs.GlobalLoggerProvider;
+import io.opentelemetry.api.events.GlobalEventEmitterProvider;
 import io.opentelemetry.context.propagation.TextMapPropagator;
 import io.opentelemetry.extension.trace.propagation.B3Propagator;
 import java.util.List;
@@ -18,9 +19,11 @@ public class OpenTelemetryConfigurationTest {
   @Before
   public void before() {
     GlobalOpenTelemetry.resetForTest();
-    // Need to reset GlobalLoggerProvider as it's not part of the main API yet
+    // Need to reset GlobalLoggerProvider/GlobalEventEmitterProvider as
+    // they are not part of the main API yet
     // BUT it is used/set by default using the autoconfiguration artifact.
     GlobalLoggerProvider.resetForTest();
+    GlobalEventEmitterProvider.resetForTest();
     System.clearProperty("otel.propagators");
   }
 

diff --git a/pom.xml b/pom.xml
@@ -24,8 +24,8 @@
     <maven.compiler.target>1.8</maven.compiler.target>
     <project.build.resourceEncoding>UTF-8</project.build.resourceEncoding>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <opentelemetry.version>1.22.0</opentelemetry.version>
-    <opentelemetry.instrumentation.version>1.22.1</opentelemetry.instrumentation.version>
+    <opentelemetry.version>1.24.0</opentelemetry.version>
+    <opentelemetry.instrumentation.version>1.24.0</opentelemetry.instrumentation.version>
     <powermock.version>2.0.7</powermock.version>
     <maven-source-plugin.version>3.2.0</maven-source-plugin.version>
     <maven-javadoc-plugin.version>3.3.1</maven-javadoc-plugin.version>