Update SDK to 1.17.0 (open-telemetry#6467)

* Update SDK to 1.17.0 * Fix * Update licenses * Spotless * license
helios · Oct 23, 2022 · fe0b086 · fe0b086
1 parent 96e6ac7
commit fe0b086
Show file tree

Hide file tree

Showing 35 changed files with 219 additions and 191 deletions.
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
@@ -12,7 +12,7 @@ val dependencyVersions = hashMapOf<String, String>()
 rootProject.extra["versions"] = dependencyVersions
 
 // this line is managed by .github/scripts/update-sdk-version.sh
-val otelVersion = "1.16.0"
+val otelVersion = "1.17.0"
 
 rootProject.extra["otelVersion"] = otelVersion
 

diff --git a/examples/distro/build.gradle b/examples/distro/build.gradle
@@ -21,8 +21,8 @@ subprojects {
   ext {
     versions = [
       // these lines are managed by .github/scripts/update-sdk-version.sh
-      opentelemetry              : "1.16.0",
-      opentelemetryAlpha         : "1.16.0-alpha",
+      opentelemetry              : "1.17.0",
+      opentelemetryAlpha         : "1.17.0-alpha",
 
       // these lines are managed by .github/scripts/update-version.sh
       opentelemetryJavaagent     : "1.17.0-SNAPSHOT",

diff --git a/examples/extension/build.gradle b/examples/extension/build.gradle
@@ -23,8 +23,8 @@ version '1.0'
 ext {
   versions = [
     // these lines are managed by .github/scripts/update-sdk-version.sh
-    opentelemetry              : "1.16.0",
-    opentelemetryAlpha         : "1.16.0-alpha",
+    opentelemetry              : "1.17.0",
+    opentelemetryAlpha         : "1.17.0-alpha",
 
     // these lines are managed by .github/scripts/update-version.sh
     opentelemetryJavaagent     : "1.17.0-SNAPSHOT",

diff --git a/...rnal/src/main/java/io/opentelemetry/instrumentation/api/appender/internal/LogEmitter.java b/...rnal/src/main/java/io/opentelemetry/instrumentation/api/appender/internal/LogEmitter.java
@@ -11,14 +11,14 @@
  * A {@link LogEmitter} is the entry point into a log pipeline.
  *
  * <p>Obtain a log builder via {@link #logBuilder()}, add properties using the setters, and emit it
- * via {@link LogBuilder#emit()}.
+ * via {@link LogRecordBuilder#emit()}.
  *
  * <p>This class is internal and is hence not for public use. Its APIs are unstable and can change
  * at any time.
  */
 @ThreadSafe
 public interface LogEmitter {
 
-  /** Return a new {@link LogBuilder} to emit a log. */
-  LogBuilder logBuilder();
+  /** Return a new {@link LogRecordBuilder} to emit a log. */
+  LogRecordBuilder logBuilder();
 }
diff --git a/...ion/api/appender/internal/LogBuilder.java → ...i/appender/internal/LogRecordBuilder.java b/...ion/api/appender/internal/LogBuilder.java → ...i/appender/internal/LogRecordBuilder.java
@@ -13,34 +13,34 @@
 /**
  * Used to construct and emit logs from a {@link LogEmitter}.
  *
- * <p>Obtain a {@link LogBuilder} via {@link LogEmitter#logBuilder()}, add properties using the
- * setters, and emit the log by calling {@link #emit()}.
+ * <p>Obtain a {@link LogRecordBuilder} via {@link LogEmitter#logBuilder()}, add properties using
+ * the setters, and emit the log by calling {@link #emit()}.
  *
  * <p>This class is internal and is hence not for public use. Its APIs are unstable and can change
  * at any time.
  */
-public interface LogBuilder {
+public interface LogRecordBuilder {
 
   /** Set the epoch timestamp using the timestamp and unit. */
-  LogBuilder setEpoch(long timestamp, TimeUnit unit);
+  LogRecordBuilder setEpoch(long timestamp, TimeUnit unit);
 
   /** Set the epoch timestamp using the instant. */
-  LogBuilder setEpoch(Instant instant);
+  LogRecordBuilder setEpoch(Instant instant);
 
   /** Set the context. */
-  LogBuilder setContext(Context context);
+  LogRecordBuilder setContext(Context context);
 
   /** Set the severity. */
-  LogBuilder setSeverity(Severity severity);
+  LogRecordBuilder setSeverity(Severity severity);
 
   /** Set the severity text. */
-  LogBuilder setSeverityText(String severityText);
+  LogRecordBuilder setSeverityText(String severityText);
 
   /** Set the body string. */
-  LogBuilder setBody(String body);
+  LogRecordBuilder setBody(String body);
 
   /** Set the attributes. */
-  LogBuilder setAttributes(Attributes attributes);
+  LogRecordBuilder setAllAttributes(Attributes attributes);
 
   /** Emit the log. */
   void emit();

diff --git a/.../src/main/java/io/opentelemetry/instrumentation/api/appender/internal/NoopLogEmitter.java b/.../src/main/java/io/opentelemetry/instrumentation/api/appender/internal/NoopLogEmitter.java
@@ -10,7 +10,7 @@ final class NoopLogEmitter implements LogEmitter {
   static final LogEmitter INSTANCE = new NoopLogEmitter();
 
   @Override
-  public LogBuilder logBuilder() {
-    return NoopLogBuilder.INSTANCE;
+  public LogRecordBuilder logBuilder() {
+    return NoopLogRecordBuilder.INSTANCE;
   }
 }
diff --git a/...api/appender/internal/NoopLogBuilder.java → ...pender/internal/NoopLogRecordBuilder.java b/...api/appender/internal/NoopLogBuilder.java → ...pender/internal/NoopLogRecordBuilder.java
@@ -10,42 +10,42 @@
 import java.time.Instant;
 import java.util.concurrent.TimeUnit;
 
-final class NoopLogBuilder implements LogBuilder {
+final class NoopLogRecordBuilder implements LogRecordBuilder {
 
-  static final LogBuilder INSTANCE = new NoopLogBuilder();
+  static final LogRecordBuilder INSTANCE = new NoopLogRecordBuilder();
 
   @Override
-  public LogBuilder setEpoch(long timestamp, TimeUnit unit) {
+  public LogRecordBuilder setEpoch(long timestamp, TimeUnit unit) {
     return this;
   }
 
   @Override
-  public LogBuilder setEpoch(Instant instant) {
+  public LogRecordBuilder setEpoch(Instant instant) {
     return this;
   }
 
   @Override
-  public LogBuilder setContext(Context context) {
+  public LogRecordBuilder setContext(Context context) {
     return this;
   }
 
   @Override
-  public LogBuilder setSeverity(Severity severity) {
+  public LogRecordBuilder setSeverity(Severity severity) {
     return this;
   }
 
   @Override
-  public LogBuilder setSeverityText(String severityText) {
+  public LogRecordBuilder setSeverityText(String severityText) {
     return this;
   }
 
   @Override
-  public LogBuilder setBody(String body) {
+  public LogRecordBuilder setBody(String body) {
     return this;
   }
 
   @Override
-  public LogBuilder setAttributes(Attributes attributes) {
+  public LogRecordBuilder setAllAttributes(Attributes attributes) {
     return this;
   }
 

diff --git a/...ain/java/io/opentelemetry/instrumentation/sdk/appender/internal/DelegatingLogEmitter.java b/...ain/java/io/opentelemetry/instrumentation/sdk/appender/internal/DelegatingLogEmitter.java
@@ -5,8 +5,8 @@
 
 package io.opentelemetry.instrumentation.sdk.appender.internal;
 
-import io.opentelemetry.instrumentation.api.appender.internal.LogBuilder;
 import io.opentelemetry.instrumentation.api.appender.internal.LogEmitter;
+import io.opentelemetry.instrumentation.api.appender.internal.LogRecordBuilder;
 
 final class DelegatingLogEmitter implements LogEmitter {
 
@@ -17,7 +17,7 @@ final class DelegatingLogEmitter implements LogEmitter {
   }
 
   @Override
-  public LogBuilder logBuilder() {
-    return new DelegatingLogBuilder(delegate.logBuilder());
+  public LogRecordBuilder logBuilder() {
+    return new DelegatingLogRecordBuilder(delegate.logRecordBuilder());
   }
 }
diff --git a/...pender/internal/DelegatingLogBuilder.java → .../internal/DelegatingLogRecordBuilder.java b/...pender/internal/DelegatingLogBuilder.java → .../internal/DelegatingLogRecordBuilder.java
@@ -7,58 +7,58 @@
 
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.context.Context;
-import io.opentelemetry.instrumentation.api.appender.internal.LogBuilder;
+import io.opentelemetry.instrumentation.api.appender.internal.LogRecordBuilder;
 import io.opentelemetry.instrumentation.api.appender.internal.Severity;
 import java.time.Instant;
 import java.util.concurrent.TimeUnit;
 
-final class DelegatingLogBuilder implements LogBuilder {
+final class DelegatingLogRecordBuilder implements LogRecordBuilder {
 
-  private final io.opentelemetry.sdk.logs.LogBuilder delegate;
+  private final io.opentelemetry.sdk.logs.LogRecordBuilder delegate;
 
-  DelegatingLogBuilder(io.opentelemetry.sdk.logs.LogBuilder delegate) {
+  DelegatingLogRecordBuilder(io.opentelemetry.sdk.logs.LogRecordBuilder delegate) {
     this.delegate = delegate;
   }
 
   @Override
-  public LogBuilder setEpoch(long timestamp, TimeUnit unit) {
+  public LogRecordBuilder setEpoch(long timestamp, TimeUnit unit) {
     delegate.setEpoch(timestamp, unit);
     return this;
   }
 
   @Override
-  public LogBuilder setEpoch(Instant instant) {
+  public LogRecordBuilder setEpoch(Instant instant) {
     delegate.setEpoch(instant);
     return this;
   }
 
   @Override
-  public LogBuilder setContext(Context context) {
+  public LogRecordBuilder setContext(Context context) {
     delegate.setContext(context);
     return this;
   }
 
   @Override
-  public LogBuilder setSeverity(Severity severity) {
+  public LogRecordBuilder setSeverity(Severity severity) {
     delegate.setSeverity(io.opentelemetry.sdk.logs.data.Severity.valueOf(severity.name()));
     return this;
   }
 
   @Override
-  public LogBuilder setSeverityText(String severityText) {
+  public LogRecordBuilder setSeverityText(String severityText) {
     delegate.setSeverityText(severityText);
     return this;
   }
 
   @Override
-  public LogBuilder setBody(String body) {
+  public LogRecordBuilder setBody(String body) {
     delegate.setBody(body);
     return this;
   }
 
   @Override
-  public LogBuilder setAttributes(Attributes attributes) {
-    delegate.setAttributes(attributes);
+  public LogRecordBuilder setAllAttributes(Attributes attributes) {
+    delegate.setAllAttributes(attributes);
     return this;
   }
 

diff --git a/.../opentelemetry/javaagent/instrumentation/guava/ExtensionAnnotationsGuavaWithSpanTest.java b/.../opentelemetry/javaagent/instrumentation/guava/ExtensionAnnotationsGuavaWithSpanTest.java
@@ -8,9 +8,9 @@
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.SettableFuture;
-import io.opentelemetry.extension.annotations.WithSpan;
 import io.opentelemetry.javaagent.instrumentation.otelannotations.AbstractTraced;
 
+@SuppressWarnings("deprecation") // testing instrumentation of deprecated class
 class ExtensionAnnotationsGuavaWithSpanTest extends BaseGuavaWithSpanTest {
 
   @Override
@@ -22,19 +22,19 @@ static final class Traced
       extends AbstractTraced<SettableFuture<String>, ListenableFuture<String>> {
 
     @Override
-    @WithSpan
+    @io.opentelemetry.extension.annotations.WithSpan
     protected SettableFuture<String> completable() {
       return SettableFuture.create();
     }
 
     @Override
-    @WithSpan
+    @io.opentelemetry.extension.annotations.WithSpan
     protected ListenableFuture<String> alreadySucceeded() {
       return Futures.immediateFuture("Value");
     }
 
     @Override
-    @WithSpan
+    @io.opentelemetry.extension.annotations.WithSpan
     protected ListenableFuture<String> alreadyFailed() {
       return Futures.immediateFailedFuture(FAILURE);
     }

diff --git a/...t/src/main/java/io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingHelper.java b/...t/src/main/java/io/opentelemetry/javaagent/instrumentation/jul/JavaUtilLoggingHelper.java
@@ -9,7 +9,7 @@
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.context.Context;
-import io.opentelemetry.instrumentation.api.appender.internal.LogBuilder;
+import io.opentelemetry.instrumentation.api.appender.internal.LogRecordBuilder;
 import io.opentelemetry.instrumentation.api.appender.internal.Severity;
 import io.opentelemetry.javaagent.bootstrap.AgentLogEmitterProvider;
 import io.opentelemetry.javaagent.bootstrap.internal.InstrumentationConfig;
@@ -40,22 +40,23 @@ public static void capture(Logger logger, LogRecord logRecord) {
     if (instrumentationName == null || instrumentationName.isEmpty()) {
       instrumentationName = "ROOT";
     }
-    LogBuilder builder =
+    LogRecordBuilder builder =
         AgentLogEmitterProvider.get().logEmitterBuilder(instrumentationName).build().logBuilder();
     mapLogRecord(builder, logRecord);
     builder.emit();
   }
 
   /**
-   * Map the {@link LogRecord} data model onto the {@link LogBuilder}. Unmapped fields include:
+   * Map the {@link LogRecord} data model onto the {@link LogRecordBuilder}. Unmapped fields
+   * include:
    *
    * <ul>
    *   <li>Fully qualified class name - {@link LogRecord#getSourceClassName()}
    *   <li>Fully qualified method name - {@link LogRecord#getSourceMethodName()}
    *   <li>Thread id - {@link LogRecord#getThreadID()}
    * </ul>
    */
-  private static void mapLogRecord(LogBuilder builder, LogRecord logRecord) {
+  private static void mapLogRecord(LogRecordBuilder builder, LogRecord logRecord) {
     // message
     String message = FORMATTER.formatMessage(logRecord);
     if (message != null) {
@@ -94,7 +95,7 @@ private static void mapLogRecord(LogBuilder builder, LogRecord logRecord) {
       attributes.put(SemanticAttributes.THREAD_ID, currentThread.getId());
     }
 
-    builder.setAttributes(attributes.build());
+    builder.setAllAttributes(attributes.build());
 
     // span context
     builder.setContext(Context.current());

diff --git a/...telemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/LoggingEventMapper.java b/...telemetry/javaagent/instrumentation/jbosslogmanager/appender/v1_1/LoggingEventMapper.java
@@ -11,7 +11,7 @@
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.context.Context;
-import io.opentelemetry.instrumentation.api.appender.internal.LogBuilder;
+import io.opentelemetry.instrumentation.api.appender.internal.LogRecordBuilder;
 import io.opentelemetry.instrumentation.api.appender.internal.Severity;
 import io.opentelemetry.instrumentation.api.internal.cache.Cache;
 import io.opentelemetry.javaagent.bootstrap.AgentLogEmitterProvider;
@@ -57,7 +57,7 @@ public void capture(Logger logger, ExtLogRecord record) {
       instrumentationName = "ROOT";
     }
 
-    LogBuilder builder =
+    LogRecordBuilder builder =
         AgentLogEmitterProvider.get().logEmitterBuilder(instrumentationName).build().logBuilder();
 
     String message = record.getFormattedMessage();
@@ -91,7 +91,7 @@ public void capture(Logger logger, ExtLogRecord record) {
       attributes.put(SemanticAttributes.THREAD_ID, currentThread.getId());
     }
 
-    builder.setAttributes(attributes.build());
+    builder.setAllAttributes(attributes.build());
 
     builder.setContext(Context.current());
 

diff --git a/...n/java/io/opentelemetry/javaagent/instrumentation/log4j/appender/v1_2/LogEventMapper.java b/...n/java/io/opentelemetry/javaagent/instrumentation/log4j/appender/v1_2/LogEventMapper.java
@@ -11,7 +11,7 @@
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.context.Context;
-import io.opentelemetry.instrumentation.api.appender.internal.LogBuilder;
+import io.opentelemetry.instrumentation.api.appender.internal.LogRecordBuilder;
 import io.opentelemetry.instrumentation.api.appender.internal.Severity;
 import io.opentelemetry.instrumentation.api.internal.cache.Cache;
 import io.opentelemetry.javaagent.bootstrap.AgentLogEmitterProvider;
@@ -63,7 +63,7 @@ public void capture(Category logger, Priority level, Object message, Throwable t
     if (instrumentationName == null || instrumentationName.isEmpty()) {
       instrumentationName = "ROOT";
     }
-    LogBuilder builder =
+    LogRecordBuilder builder =
         AgentLogEmitterProvider.get().logEmitterBuilder(instrumentationName).build().logBuilder();
 
     // message
@@ -98,7 +98,7 @@ public void capture(Category logger, Priority level, Object message, Throwable t
       attributes.put(SemanticAttributes.THREAD_ID, currentThread.getId());
     }
 
-    builder.setAttributes(attributes.build());
+    builder.setAllAttributes(attributes.build());
 
     // span context
     builder.setContext(Context.current());

diff --git a/...ain/java/io/opentelemetry/javaagent/instrumentation/log4j/appender/v2_17/Log4jHelper.java b/...ain/java/io/opentelemetry/javaagent/instrumentation/log4j/appender/v2_17/Log4jHelper.java
@@ -7,7 +7,7 @@
 
 import static java.util.Collections.emptyList;
 
-import io.opentelemetry.instrumentation.api.appender.internal.LogBuilder;
+import io.opentelemetry.instrumentation.api.appender.internal.LogRecordBuilder;
 import io.opentelemetry.instrumentation.log4j.appender.v2_17.internal.ContextDataAccessor;
 import io.opentelemetry.instrumentation.log4j.appender.v2_17.internal.LogEventMapper;
 import io.opentelemetry.javaagent.bootstrap.AgentLogEmitterProvider;
@@ -52,7 +52,7 @@ public static void capture(Logger logger, Level level, Message message, Throwabl
     if (instrumentationName == null || instrumentationName.isEmpty()) {
       instrumentationName = "ROOT";
     }
-    LogBuilder builder =
+    LogRecordBuilder builder =
         AgentLogEmitterProvider.get().logEmitterBuilder(instrumentationName).build().logBuilder();
     Map<String, String> contextData = ThreadContext.getImmutableContext();
     mapper.mapLogEvent(builder, message, level, throwable, contextData);