hyperledger · atoulme · Jun 26, 2022 · Apr 3, 2022 · Jun 23, 2022 · Jun 24, 2022
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@
 
 ### Bug Fixes
 - Fixed a snapsync issue that can sometimes block the healing step [#3920](https://github.com/hyperledger/besu/pull/3920)
+- Upgrade OpenTelemetry to version 1.15.0 [#3675](https://github.com/hyperledger/besu/pull/3675)
 
 ## 22.4.3
 

diff --git a/...ance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/BesuNode.java b/...ance-tests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/BesuNode.java
@@ -127,6 +127,7 @@ public class BesuNode implements NodeConfiguration, RunnableNode, AutoCloseable
   private Optional<Integer> exitCode = Optional.empty();
   private Optional<PkiKeyStoreConfiguration> pkiKeyStoreConfiguration = Optional.empty();
   private final boolean isStrictTxReplayProtectionEnabled;
+  private final Map<String, String> environment;
 
   public BesuNode(
       final String name,
@@ -159,7 +160,8 @@ public BesuNode(
       final List<String> runCommand,
       final Optional<KeyPair> keyPair,
       final Optional<PkiKeyStoreConfiguration> pkiKeyStoreConfiguration,
-      final boolean isStrictTxReplayProtectionEnabled)
+      final boolean isStrictTxReplayProtectionEnabled,
+      final Map<String, String> environment)
       throws IOException {
     this.homeDirectory = dataPath.orElseGet(BesuNode::createTmpDataDirectory);
     this.isStrictTxReplayProtectionEnabled = isStrictTxReplayProtectionEnabled;
@@ -216,6 +218,7 @@ public BesuNode(
     this.isDnsEnabled = isDnsEnabled;
     privacyParameters.ifPresent(this::setPrivacyParameters);
     this.pkiKeyStoreConfiguration = pkiKeyStoreConfiguration;
+    this.environment = environment;
     LOG.info("Created BesuNode {}", this);
   }
 
@@ -794,4 +797,9 @@ public void verify(final Condition expected) {
   public void setExitCode(final int exitValue) {
     this.exitCode = Optional.of(exitValue);
   }
+
+  @Override
+  public Map<String, String> getEnvironment() {
+    return environment;
+  }
 }
diff --git a/...l/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ProcessBesuNodeRunner.java b/...l/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/node/ProcessBesuNodeRunner.java
@@ -419,6 +419,8 @@ public void startNode(final BesuNode node) {
             "JAVA_OPTS",
             "-Djava.security.properties="
                 + "acceptance-tests/tests/build/resources/test/acceptanceTesting.security");
+    // add additional environment variables
+    processBuilder.environment().putAll(node.getEnvironment());
     try {
       checkState(
           isNotAliveOrphan(node.getName()),

diff --git a/...a/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeConfiguration.java b/...a/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeConfiguration.java
@@ -30,6 +30,7 @@
 
 import java.nio.file.Path;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
 public class BesuNodeConfiguration {
@@ -65,6 +66,7 @@ public class BesuNodeConfiguration {
   private final Optional<KeyPair> keyPair;
   private final Optional<PkiKeyStoreConfiguration> pkiKeyStoreConfiguration;
   private final boolean strictTxReplayProtectionEnabled;
+  private final Map<String, String> environment;
 
   BesuNodeConfiguration(
       final String name,
@@ -97,7 +99,8 @@ public class BesuNodeConfiguration {
       final List<String> runCommand,
       final Optional<KeyPair> keyPair,
       final Optional<PkiKeyStoreConfiguration> pkiKeyStoreConfiguration,
-      final boolean strictTxReplayProtectionEnabled) {
+      final boolean strictTxReplayProtectionEnabled,
+      final Map<String, String> environment) {
     this.name = name;
     this.miningParameters = miningParameters;
     this.jsonRpcConfiguration = jsonRpcConfiguration;
@@ -129,6 +132,7 @@ public class BesuNodeConfiguration {
     this.keyPair = keyPair;
     this.pkiKeyStoreConfiguration = pkiKeyStoreConfiguration;
     this.strictTxReplayProtectionEnabled = strictTxReplayProtectionEnabled;
+    this.environment = environment;
   }
 
   public String getName() {
@@ -254,4 +258,8 @@ public Optional<PkiKeyStoreConfiguration> getPkiKeyStoreConfiguration() {
   public boolean isStrictTxReplayProtectionEnabled() {
     return strictTxReplayProtectionEnabled;
   }
+
+  public Map<String, String> getEnvironment() {
+    return environment;
+  }
 }
diff --git a/...yperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeConfigurationBuilder.java b/...yperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeConfigurationBuilder.java
@@ -44,7 +44,9 @@
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
 public class BesuNodeConfigurationBuilder {
@@ -85,6 +87,7 @@ public class BesuNodeConfigurationBuilder {
   private Optional<KeyPair> keyPair = Optional.empty();
   private Optional<PkiKeyStoreConfiguration> pkiKeyStoreConfiguration = Optional.empty();
   private Boolean strictTxReplayProtectionEnabled = false;
+  private Map<String, String> environment = new HashMap<>();
 
   public BesuNodeConfigurationBuilder() {
     // Check connections more frequently during acceptance tests to cut down on
@@ -478,6 +481,11 @@ public BesuNodeConfigurationBuilder strictTxReplayProtectionEnabled(
     return this;
   }
 
+  public BesuNodeConfigurationBuilder environment(final Map<String, String> environment) {
+    this.environment = environment;
+    return this;
+  }
+
   public BesuNodeConfiguration build() {
     return new BesuNodeConfiguration(
         name,
@@ -510,6 +518,7 @@ public BesuNodeConfiguration build() {
         runCommand,
         keyPair,
         pkiKeyStoreConfiguration,
-        strictTxReplayProtectionEnabled);
+        strictTxReplayProtectionEnabled,
+        environment);
   }
 }
diff --git a/...in/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeFactory.java b/...in/java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/BesuNodeFactory.java
@@ -88,7 +88,8 @@ public BesuNode create(final BesuNodeConfiguration config) throws IOException {
         config.getRunCommand(),
         config.getKeyPair(),
         config.getPkiKeyStoreConfiguration(),
-        config.isStrictTxReplayProtectionEnabled());
+        config.isStrictTxReplayProtectionEnabled(),
+        config.getEnvironment());
   }
 
   public BesuNode createMinerNode(

diff --git a/.../java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/NodeConfiguration.java b/.../java/org/hyperledger/besu/tests/acceptance/dsl/node/configuration/NodeConfiguration.java
@@ -18,6 +18,7 @@
 
 import java.net.URI;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
 public interface NodeConfiguration {
@@ -59,4 +60,6 @@ public interface NodeConfiguration {
   boolean isRevertReasonEnabled();
 
   List<String> getStaticNodes();
+
+  Map<String, String> getEnvironment();
 }
diff --git a/...ests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivacyNode.java b/...ests/dsl/src/main/java/org/hyperledger/besu/tests/acceptance/dsl/privacy/PrivacyNode.java
@@ -127,7 +127,8 @@ public PrivacyNode(
             List.of(),
             Optional.empty(),
             Optional.empty(),
-            besuConfig.isStrictTxReplayProtectionEnabled());
+            besuConfig.isStrictTxReplayProtectionEnabled(),
+            besuConfig.getEnvironment());
   }
 
   public void testEnclaveConnection(final List<PrivacyNode> otherNodes) {

diff --git a/acceptance-tests/tests/build.gradle b/acceptance-tests/tests/build.gradle
@@ -46,15 +46,16 @@ dependencies {
 
   testImplementation 'com.github.tomakehurst:wiremock-jre8-standalone'
   testImplementation 'commons-io:commons-io'
+  testImplementation 'io.grpc:grpc-all'
   testImplementation 'io.grpc:grpc-core'
   testImplementation 'io.grpc:grpc-netty'
   testImplementation 'io.grpc:grpc-stub'
-  testImplementation 'io.jaegertracing:jaeger-client'
-  testImplementation 'io.jaegertracing:jaeger-proto'
+  testImplementation 'io.opentelemetry:opentelemetry-extension-trace-propagators'
+  testImplementation 'io.opentelemetry.instrumentation:opentelemetry-okhttp-3.0'
   testImplementation 'io.netty:netty-all'
-  testImplementation 'io.opentelemetry.proto:opentelemetry-proto'
   testImplementation 'io.opentelemetry:opentelemetry-api'
   testImplementation 'io.opentelemetry:opentelemetry-exporter-otlp'
+  testImplementation 'io.opentelemetry.proto:opentelemetry-proto'
   testImplementation 'io.opentelemetry:opentelemetry-sdk'
   testImplementation 'io.opentelemetry:opentelemetry-sdk-trace'
   testImplementation 'io.opentracing.contrib:opentracing-okhttp3'

diff --git a/...ests/src/test/java/org/hyperledger/besu/tests/acceptance/OpenTelemetryAcceptanceTest.java b/...ests/src/test/java/org/hyperledger/besu/tests/acceptance/OpenTelemetryAcceptanceTest.java
@@ -26,15 +26,21 @@
 
 import java.time.Duration;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import com.google.common.io.Closer;
 import com.google.protobuf.ByteString;
 import io.grpc.Server;
 import io.grpc.Status;
 import io.grpc.netty.NettyServerBuilder;
 import io.grpc.stub.StreamObserver;
-import io.jaegertracing.Configuration;
+import io.opentelemetry.api.OpenTelemetry;
+import io.opentelemetry.context.propagation.ContextPropagators;
+import io.opentelemetry.context.propagation.TextMapPropagator;
+import io.opentelemetry.extension.trace.propagation.B3Propagator;
+import io.opentelemetry.instrumentation.okhttp.v3_0.OkHttpTelemetry;
 import io.opentelemetry.proto.collector.metrics.v1.ExportMetricsServiceRequest;
 import io.opentelemetry.proto.collector.metrics.v1.ExportMetricsServiceResponse;
 import io.opentelemetry.proto.collector.metrics.v1.MetricsServiceGrpc;
@@ -44,8 +50,9 @@
 import io.opentelemetry.proto.metrics.v1.ResourceMetrics;
 import io.opentelemetry.proto.trace.v1.ResourceSpans;
 import io.opentelemetry.proto.trace.v1.Span;
-import io.opentracing.Tracer;
-import io.opentracing.contrib.okhttp3.TracingCallFactory;
+import io.opentelemetry.sdk.OpenTelemetrySdk;
+import io.opentelemetry.sdk.trace.SdkTracerProvider;
+import io.opentelemetry.sdk.trace.samplers.Sampler;
 import okhttp3.Call;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
@@ -120,6 +127,7 @@ List<ResourceMetrics> getReceivedMetrics() {
 
   @Before
   public void setUp() throws Exception {
+    System.setProperty("root.log.level", "DEBUG");
     Server server =
         NettyServerBuilder.forPort(4317)
             .addService(fakeTracesCollector)
@@ -131,16 +139,26 @@ public void setUp() throws Exception {
     MetricsConfiguration configuration =
         MetricsConfiguration.builder()
             .protocol(MetricsProtocol.OPENTELEMETRY)
-            .enabled(true)
+            .pushEnabled(true)
             .port(0)
             .hostsAllowlist(singletonList("*"))
             .build();
+    Map<String, String> env = new HashMap<>();
+    env.put("OTEL_METRIC_EXPORT_INTERVAL", "1000");
+    env.put("OTEL_TRACES_SAMPLER", "always_on");
+    env.put("OTEL_EXPORTER_OTLP_ENDPOINT", "http://localhost:4317");
+    env.put("OTEL_EXPORTER_OTLP_INSECURE", "true");
+    env.put("OTEL_EXPORTER_OTLP_PROTOCOL", "grpc");
+    env.put("OTEL_BSP_SCHEDULE_DELAY", "1000");
+    env.put("OTEL_BSP_EXPORT_TIMEOUT", "3000");
+
     metricsNode =
         besu.create(
             new BesuNodeConfigurationBuilder()
                 .name("metrics-node")
                 .jsonRpcEnabled()
                 .metricsConfiguration(configuration)
+                .environment(env)
                 .build());
     cluster.start(metricsNode);
   }
@@ -170,11 +188,11 @@ public void traceReporting() {
           net.netVersion().verify(metricsNode);
           List<ResourceSpans> spans = fakeTracesCollector.getReceivedSpans();
           assertThat(spans.isEmpty()).isFalse();
-          Span internalSpan = spans.get(0).getInstrumentationLibrarySpans(0).getSpans(0);
+          Span internalSpan = spans.get(0).getScopeSpans(0).getSpans(0);
           assertThat(internalSpan.getKind()).isEqualTo(Span.SpanKind.SPAN_KIND_INTERNAL);
           ByteString parent = internalSpan.getParentSpanId();
           assertThat(parent.isEmpty()).isFalse();
-          Span serverSpan = spans.get(0).getInstrumentationLibrarySpans(0).getSpans(1);
+          Span serverSpan = spans.get(0).getScopeSpans(0).getSpans(1);
           assertThat(serverSpan.getKind()).isEqualTo(Span.SpanKind.SPAN_KIND_SERVER);
           ByteString rootSpanId = serverSpan.getParentSpanId();
           assertThat(rootSpanId.isEmpty()).isTrue();
@@ -184,23 +202,26 @@ public void traceReporting() {
   @Test
   public void traceReportingWithTraceId() {
     Duration timeout = Duration.ofSeconds(1);
-    OkHttpClient okClient =
-        new OkHttpClient.Builder()
-            .connectTimeout(timeout)
-            .readTimeout(timeout)
-            .writeTimeout(timeout)
-            .build();
     WaitUtils.waitFor(
         30,
         () -> {
-          // call the json RPC endpoint to generate a trace - with trace metadata of our own
-          Configuration config =
-              new Configuration("okhttp")
-                  .withSampler(
-                      Configuration.SamplerConfiguration.fromEnv().withType("const").withParam(1));
-
-          Tracer tracer = config.getTracer();
-          Call.Factory client = new TracingCallFactory(okClient, tracer);
+          OpenTelemetry openTelemetry =
+              OpenTelemetrySdk.builder()
+                  .setPropagators(
+                      ContextPropagators.create(
+                          TextMapPropagator.composite(B3Propagator.injectingSingleHeader())))
+                  .setTracerProvider(
+                      SdkTracerProvider.builder().setSampler(Sampler.alwaysOn()).build())
+                  .build();
+          Call.Factory client =
+              OkHttpTelemetry.builder(openTelemetry)
+                  .build()
+                  .newCallFactory(
+                      new OkHttpClient.Builder()
+                          .connectTimeout(timeout)
+                          .readTimeout(timeout)
+                          .writeTimeout(timeout)
+                          .build());
           Request request =
               new Request.Builder()
                   .url("http://localhost:" + metricsNode.getJsonRpcPort().get())
@@ -210,19 +231,22 @@ public void traceReportingWithTraceId() {
                           MediaType.get("application/json")))
                   .build();
           Response response = client.newCall(request).execute();
-          assertThat(response.code()).isEqualTo(200);
-          response.close();
-          List<ResourceSpans> spans = new ArrayList<>(fakeTracesCollector.getReceivedSpans());
-          fakeTracesCollector.getReceivedSpans().clear();
-          assertThat(spans.isEmpty()).isFalse();
-          Span internalSpan = spans.get(0).getInstrumentationLibrarySpans(0).getSpans(0);
-          assertThat(internalSpan.getKind()).isEqualTo(Span.SpanKind.SPAN_KIND_INTERNAL);
-          ByteString parent = internalSpan.getParentSpanId();
-          assertThat(parent.isEmpty()).isFalse();
-          Span serverSpan = spans.get(0).getInstrumentationLibrarySpans(0).getSpans(1);
-          assertThat(serverSpan.getKind()).isEqualTo(Span.SpanKind.SPAN_KIND_SERVER);
-          ByteString rootSpanId = serverSpan.getParentSpanId();
-          assertThat(rootSpanId.isEmpty()).isFalse();
+          try {
+            assertThat(response.code()).isEqualTo(200);
+            List<ResourceSpans> spans = new ArrayList<>(fakeTracesCollector.getReceivedSpans());
+            assertThat(spans.isEmpty()).isFalse();
+            Span internalSpan = spans.get(0).getScopeSpans(0).getSpans(0);
+            assertThat(internalSpan.getKind()).isEqualTo(Span.SpanKind.SPAN_KIND_INTERNAL);
+            ByteString parent = internalSpan.getParentSpanId();
+            assertThat(parent.isEmpty()).isFalse();
+            Span serverSpan = spans.get(0).getScopeSpans(0).getSpans(1);
+            assertThat(serverSpan.getKind()).isEqualTo(Span.SpanKind.SPAN_KIND_SERVER);
+            ByteString rootSpanId = serverSpan.getParentSpanId();
+            assertThat(rootSpanId.isEmpty()).isFalse();
+          } finally {
+            response.close();
+            fakeTracesCollector.getReceivedSpans().clear();
+          }
         });
   }
 }
diff --git a/gradle/versions.gradle b/gradle/versions.gradle
@@ -60,14 +60,12 @@ dependencyManagement {
     dependency 'info.picocli:picocli:4.6.3'
 
     dependencySet(group: 'io.grpc', version: '1.47.0') {
-      entry'grpc-core'
-      entry'grpc-netty'
-      entry'grpc-stub'
+      entry 'grpc-all'
+      entry 'grpc-core'
+      entry 'grpc-netty'
+      entry 'grpc-stub'
     }
 
-    dependency 'io.jaegertracing:jaeger-client:1.8.0'
-    dependency 'io.jaegertracing:jaeger-proto:0.7.0'
-
     dependency 'io.kubernetes:client-java:15.0.1'
 
     dependency 'io.netty:netty-all:4.1.78.Final'
@@ -76,14 +74,17 @@ dependencyManagement {
     dependency group: 'io.netty', name: 'netty-transport-native-kqueue', version:'4.1.78.Final', classifier: 'osx-x86_64'
     dependency 'io.netty:netty-transport-native-unix-common:4.1.78.Final'
 
-    dependency 'io.opentelemetry:opentelemetry-api:1.6.0'
-    dependency 'io.opentelemetry:opentelemetry-exporter-otlp-metrics:1.6.0-alpha'
-    dependency 'io.opentelemetry:opentelemetry-exporter-otlp:1.6.0'
-    dependency 'io.opentelemetry:opentelemetry-extension-trace-propagators:1.6.0'
-    dependency 'io.opentelemetry:opentelemetry-sdk-trace:1.6.0'
-    dependency 'io.opentelemetry:opentelemetry-sdk:1.6.0'
-    dependency 'io.opentelemetry:opentelemetry-semconv:1.6.0-alpha'
-    dependency 'io.opentelemetry.proto:opentelemetry-proto:0.13.0-alpha'
+    dependency 'io.opentelemetry:opentelemetry-api:1.15.0'
+    dependency 'io.opentelemetry:opentelemetry-exporter-otlp-metrics:1.14.0'
+    dependency 'io.opentelemetry:opentelemetry-exporter-otlp:1.15.0'
+    dependency 'io.opentelemetry:opentelemetry-extension-trace-propagators:1.15.0'
+    dependency 'io.opentelemetry.proto:opentelemetry-proto:0.16.0-alpha'
+    dependency 'io.opentelemetry:opentelemetry-sdk-metrics:1.15.0'
+    dependency 'io.opentelemetry:opentelemetry-sdk-trace:1.15.0'
+    dependency 'io.opentelemetry:opentelemetry-sdk:1.15.0'
+    dependency 'io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.15.0-alpha'
+    dependency 'io.opentelemetry:opentelemetry-semconv:1.15.0-alpha'
+    dependency 'io.opentelemetry.instrumentation:opentelemetry-okhttp-3.0:1.15.0-alpha'
 
     dependency 'io.opentracing.contrib:opentracing-okhttp3:3.0.0'
     dependency 'io.opentracing:opentracing-api:0.33.0'