Ignore otel context non-test warning

googleapis · May 4, 2024 · 9cf24ab · 9cf24ab
1 parent 0e61c7d
commit 9cf24ab
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/google-cloud-logging/pom.xml b/google-cloud-logging/pom.xml
@@ -21,10 +21,10 @@
       <groupId>io.opentelemetry</groupId>
       <artifactId>opentelemetry-api</artifactId>
     </dependency>
-<!--    <dependency>-->
-<!--      <groupId>io.opentelemetry</groupId>-->
-<!--      <artifactId>opentelemetry-context</artifactId>-->
-<!--    </dependency>-->
+    <dependency>
+      <groupId>io.opentelemetry</groupId>
+      <artifactId>opentelemetry-context</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -65,11 +65,12 @@
         <artifactId>opentelemetry-api</artifactId>
         <version>${opentelemetry.version}</version>
       </dependency>
-<!--      <dependency>-->
-<!--        <groupId>io.opentelemetry</groupId>-->
-<!--        <artifactId>opentelemetry-context</artifactId>-->
-<!--        <version>${opentelemetry.version}</version>-->
-<!--      </dependency>-->
+      <dependency>
+        <groupId>io.opentelemetry</groupId>
+        <artifactId>opentelemetry-context</artifactId>
+        <version>${opentelemetry.version}</version>
+        <optional>false</optional>
+      </dependency>
       <!-- END OpenTelemetry -->
       <dependency>
         <groupId>com.google.api.grpc</groupId>
@@ -179,6 +180,10 @@
           <artifactId>maven-dependency-plugin</artifactId>
           <configuration>
             <ignoredUnusedDeclaredDependencies>org.objenesis:objenesis</ignoredUnusedDeclaredDependencies>
+            <!-- ignore annotations for "non-test scoped" warnings -->
+            <ignoredNonTestScopedDependencies>
+              <ignoredNonTestScopedDependency>io.opentelemetry:opentelemetry-context</ignoredNonTestScopedDependency>
+            </ignoredNonTestScopedDependencies>
           </configuration>
         </plugin>
       </plugins>