From e999fa0d5a87e786749770640210bc1c8e09474a Mon Sep 17 00:00:00 2001
From: Anuraag Agrawal <anuraaga@gmail.com>
Date: Fri, 22 Apr 2022 07:43:55 +0900
Subject: [PATCH] Some fixes for compilation under java 18 (#4397)

---
 .../context/StrictContextStorage.java         |  4 +--
 exporters/jaeger-proto/build.gradle.kts       |  9 +++++
 .../jaeger-remote-sampler/build.gradle.kts    |  9 +++++
 .../DuplicateMetricStorageException.java      | 35 -------------------
 4 files changed, 20 insertions(+), 37 deletions(-)
 delete mode 100644 sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/state/DuplicateMetricStorageException.java

diff --git a/context/src/main/java/io/opentelemetry/context/StrictContextStorage.java b/context/src/main/java/io/opentelemetry/context/StrictContextStorage.java
index 87080f35a3..b02d33b4ae 100644
--- a/context/src/main/java/io/opentelemetry/context/StrictContextStorage.java
+++ b/context/src/main/java/io/opentelemetry/context/StrictContextStorage.java
@@ -216,10 +216,10 @@ final class StrictContextStorage implements ContextStorage, AutoCloseable {
     }
   }
 
+  // Don't care about serialization of this private class.
+  @SuppressWarnings("serial")
   static class CallerStackTrace extends Throwable {
 
-    private static final long serialVersionUID = 783294061323215387L;
-
     final String threadName = currentThread().getName();
     final long threadId = currentThread().getId();
     final Context context;
diff --git a/exporters/jaeger-proto/build.gradle.kts b/exporters/jaeger-proto/build.gradle.kts
index 08d2485b23..ab9825af1a 100644
--- a/exporters/jaeger-proto/build.gradle.kts
+++ b/exporters/jaeger-proto/build.gradle.kts
@@ -15,3 +15,12 @@ dependencies {
   compileOnly("io.grpc:grpc-protobuf")
   compileOnly("io.grpc:grpc-stub")
 }
+
+tasks {
+  compileJava {
+    with(options) {
+      // Generated code so can't control serialization.
+      compilerArgs.add("-Xlint:-serial")
+    }
+  }
+}
diff --git a/sdk-extensions/jaeger-remote-sampler/build.gradle.kts b/sdk-extensions/jaeger-remote-sampler/build.gradle.kts
index 0666a6b715..270de3c146 100644
--- a/sdk-extensions/jaeger-remote-sampler/build.gradle.kts
+++ b/sdk-extensions/jaeger-remote-sampler/build.gradle.kts
@@ -68,3 +68,12 @@ sourceSets {
     java.srcDir("$buildDir/generated/source/wire")
   }
 }
+
+tasks {
+  compileJava {
+    with(options) {
+      // Generated code so can't control serialization.
+      compilerArgs.add("-Xlint:-serial")
+    }
+  }
+}
diff --git a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/state/DuplicateMetricStorageException.java b/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/state/DuplicateMetricStorageException.java
deleted file mode 100644
index c1b0263ab0..0000000000
--- a/sdk/metrics/src/main/java/io/opentelemetry/sdk/metrics/internal/state/DuplicateMetricStorageException.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright The OpenTelemetry Authors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package io.opentelemetry.sdk.metrics.internal.state;
-
-import io.opentelemetry.sdk.metrics.internal.descriptor.MetricDescriptor;
-
-/**
- * There are multiple metrics defined with the same name/identity.
- *
- * <p>This class is internal and is hence not for public use. Its APIs are unstable and can change
- * at any time.
- */
-class DuplicateMetricStorageException extends IllegalArgumentException {
-  private static final long serialVersionUID = 1547329629200005982L;
-  private final MetricDescriptor existing;
-  private final MetricDescriptor conflict;
-
-  DuplicateMetricStorageException(
-      MetricDescriptor existing, MetricDescriptor next, String message) {
-    super(message + " Found previous metric: " + existing + ", cannot register metric: " + next);
-    this.existing = existing;
-    this.conflict = next;
-  }
-
-  public MetricDescriptor getExisting() {
-    return existing;
-  }
-
-  public MetricDescriptor getConflict() {
-    return conflict;
-  }
-}