Use bootstrap package provider (#176)

Signed-off-by: Pavol Loffay <[email protected]>

Author: pavolloffay

instrumentation/build.gradle.kts

@@ -52,8 +52,6 @@ tasks {
 
         mergeServiceFiles()
 
-        relocate("org.hypertrace.agent", "io.opentelemetry.javaagent.shaded.org.hypertrace.agent")
-
         relocate("com.fasterxml.jackson", "io.opentelemetry.javaagent.shaded.org.hypertrace.shaded.com.fasterxml.jackson")
         relocate("com.google", "io.opentelemetry.javaagent.shaded.org.hypertrace.shaded.com.google")
         relocate("google.protobuf", "io.opentelemetry.javaagent.shaded.org.hypertrace.shaded.google.protobuf")

javaagent/build.gradle.kts

@@ -32,11 +32,6 @@ tasks {
 
 
     shadowJar {
-        // shade to match with the package prefix for the classloader instrumentation
-        relocate("org.hypertrace.agent", "io.opentelemetry.javaagent.shaded.org.hypertrace.agent") {
-            exclude("org.hypertrace.agent.instrument.*")
-        }
-
         // config in javaagent-core uses protobuf and jackson
         // shade to the same location as OTEL, because the package prefix is used in classloader instrumentation
         // https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/master/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/Constants.java#L25

otel-extensions/src/main/java/org/hypertrace/agent/otel/extensions/HypertraceBootstrapPackagesProvider.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright The Hypertrace Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.hypertrace.agent.otel.extensions;
+
+import com.google.auto.service.AutoService;
+import io.opentelemetry.javaagent.spi.BootstrapPackagesProvider;
+import java.util.Arrays;
+import java.util.List;
+
+@AutoService(BootstrapPackagesProvider.class)
+public class HypertraceBootstrapPackagesProvider implements BootstrapPackagesProvider {
+
+  @Override
+  public List<String> getPackagePrefixes() {
+    return Arrays.asList("org.hypertrace.agent");
+  }
+}