Fix proto generated files package for jaeger extension (#1993)

Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
open-telemetry · Nov 4, 2020 · 139fcf2 · 139fcf2
1 parent e5cf181
commit 139fcf2
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/...c/main/java/io/opentelemetry/sdk/extensions/trace/jaeger/sampler/JaegerRemoteSampler.java b/...c/main/java/io/opentelemetry/sdk/extensions/trace/jaeger/sampler/JaegerRemoteSampler.java
@@ -10,12 +10,12 @@
 import io.opentelemetry.api.common.ReadableAttributes;
 import io.opentelemetry.api.trace.Span.Kind;
 import io.opentelemetry.context.Context;
-import io.opentelemetry.exporters.jaeger.proto.api_v2.Sampling.PerOperationSamplingStrategies;
-import io.opentelemetry.exporters.jaeger.proto.api_v2.Sampling.SamplingStrategyParameters;
-import io.opentelemetry.exporters.jaeger.proto.api_v2.Sampling.SamplingStrategyResponse;
-import io.opentelemetry.exporters.jaeger.proto.api_v2.SamplingManagerGrpc;
-import io.opentelemetry.exporters.jaeger.proto.api_v2.SamplingManagerGrpc.SamplingManagerBlockingStub;
 import io.opentelemetry.sdk.common.DaemonThreadFactory;
+import io.opentelemetry.sdk.extensions.trace.jaeger.proto.api_v2.Sampling.PerOperationSamplingStrategies;
+import io.opentelemetry.sdk.extensions.trace.jaeger.proto.api_v2.Sampling.SamplingStrategyParameters;
+import io.opentelemetry.sdk.extensions.trace.jaeger.proto.api_v2.Sampling.SamplingStrategyResponse;
+import io.opentelemetry.sdk.extensions.trace.jaeger.proto.api_v2.SamplingManagerGrpc;
+import io.opentelemetry.sdk.extensions.trace.jaeger.proto.api_v2.SamplingManagerGrpc.SamplingManagerBlockingStub;
 import io.opentelemetry.sdk.trace.data.SpanData.Link;
 import io.opentelemetry.sdk.trace.samplers.Sampler;
 import io.opentelemetry.sdk.trace.samplers.SamplingResult;

diff --git a/...c/main/java/io/opentelemetry/sdk/extensions/trace/jaeger/sampler/PerOperationSampler.java b/...c/main/java/io/opentelemetry/sdk/extensions/trace/jaeger/sampler/PerOperationSampler.java
@@ -8,7 +8,7 @@
 import io.opentelemetry.api.common.ReadableAttributes;
 import io.opentelemetry.api.trace.Span.Kind;
 import io.opentelemetry.context.Context;
-import io.opentelemetry.exporters.jaeger.proto.api_v2.Sampling.OperationSamplingStrategy;
+import io.opentelemetry.sdk.extensions.trace.jaeger.proto.api_v2.Sampling.OperationSamplingStrategy;
 import io.opentelemetry.sdk.trace.data.SpanData.Link;
 import io.opentelemetry.sdk.trace.samplers.Sampler;
 import io.opentelemetry.sdk.trace.samplers.SamplingResult;

diff --git a/sdk-extensions/jaeger-remote-sampler/src/main/proto/jaeger/api_v2/sampling.proto b/sdk-extensions/jaeger-remote-sampler/src/main/proto/jaeger/api_v2/sampling.proto
@@ -3,13 +3,13 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-syntax="proto3";
+syntax = "proto3";
 
 package jaeger.api_v2;
 
 import "google/api/annotations.proto";
 
-option java_package = "io.opentelemetry.exporters.jaeger.proto.api_v2";
+option java_package = "io.opentelemetry.sdk.extensions.trace.jaeger.proto.api_v2";
 
 enum SamplingStrategyType {
   PROBABILISTIC = 0;
@@ -40,7 +40,7 @@ message SamplingStrategyResponse {
   SamplingStrategyType strategyType = 1;
   ProbabilisticSamplingStrategy probabilisticSampling = 2;
   RateLimitingSamplingStrategy rateLimitingSampling = 3;
-  PerOperationSamplingStrategies operationSampling =4;
+  PerOperationSamplingStrategies operationSampling = 4;
 }
 
 message SamplingStrategyParameters {
@@ -50,8 +50,8 @@ message SamplingStrategyParameters {
 service SamplingManager {
   rpc GetSamplingStrategy(SamplingStrategyParameters) returns (SamplingStrategyResponse) {
     option (google.api.http) = {
-            post: "/api/v2/samplingStrategy"
-            body: "*"
-        };
+      post: "/api/v2/samplingStrategy"
+      body: "*"
+    };
   }
 }
diff --git a/...st/java/io/opentelemetry/sdk/extensions/trace/jaeger/sampler/JaegerRemoteSamplerTest.java b/...st/java/io/opentelemetry/sdk/extensions/trace/jaeger/sampler/JaegerRemoteSamplerTest.java
@@ -17,11 +17,11 @@
 import io.grpc.inprocess.InProcessChannelBuilder;
 import io.grpc.inprocess.InProcessServerBuilder;
 import io.grpc.stub.StreamObserver;
-import io.opentelemetry.exporters.jaeger.proto.api_v2.Sampling;
-import io.opentelemetry.exporters.jaeger.proto.api_v2.Sampling.RateLimitingSamplingStrategy;
-import io.opentelemetry.exporters.jaeger.proto.api_v2.Sampling.SamplingStrategyParameters;
-import io.opentelemetry.exporters.jaeger.proto.api_v2.Sampling.SamplingStrategyType;
-import io.opentelemetry.exporters.jaeger.proto.api_v2.SamplingManagerGrpc;
+import io.opentelemetry.sdk.extensions.trace.jaeger.proto.api_v2.Sampling;
+import io.opentelemetry.sdk.extensions.trace.jaeger.proto.api_v2.Sampling.RateLimitingSamplingStrategy;
+import io.opentelemetry.sdk.extensions.trace.jaeger.proto.api_v2.Sampling.SamplingStrategyParameters;
+import io.opentelemetry.sdk.extensions.trace.jaeger.proto.api_v2.Sampling.SamplingStrategyType;
+import io.opentelemetry.sdk.extensions.trace.jaeger.proto.api_v2.SamplingManagerGrpc;
 import io.opentelemetry.sdk.trace.samplers.Sampler;
 import java.io.IOException;
 import java.util.concurrent.Callable;