-
Notifications
You must be signed in to change notification settings - Fork 784
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
WIP: Comsume proto files from git submodule and build them in a separate module #504
WIP: Comsume proto files from git submodule and build them in a separate module #504
Conversation
@bogdandrutu @songy23 could you please have a look? |
Configuration errors: 1 error occurred:
* In step 3 definition: Invalid step structure (expected string or map, got config.StepDescription) Please fix. |
proto/build.gradle
Outdated
dependencies { | ||
api project(':opentelemetry-api') | ||
|
||
implementation "com.google.protobuf:protobuf-java:${protobufVersion}", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These 2 can be defined in the libraries to be consistent with other dependencies.
If you rebase you will fix the android errors. |
@@ -108,6 +108,8 @@ subprojects { | |||
grpcVersion = '1.20.0' | |||
autoValueVersion = '1.6.2' | |||
opentracingVersion = '0.33.0' | |||
protobufVersion = '3.7.1' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
+1. Not all the artifacts will use protobufVersion
(i.e. the API itself), but this way we hopefully don't have to re-declare this version again and again ;)
…odule Signed-off-by: Pavol Loffay <ploffay@redhat.com>
Signed-off-by: Pavol Loffay <ploffay@redhat.com>
Signed-off-by: Pavol Loffay <ploffay@redhat.com>
0331f76
to
ca37c45
Compare
Codecov Report
@@ Coverage Diff @@
## master #504 +/- ##
============================================
- Coverage 78.55% 78.34% -0.21%
+ Complexity 561 560 -1
============================================
Files 65 65
Lines 1926 1926
Branches 188 188
============================================
- Hits 1513 1509 -4
- Misses 355 357 +2
- Partials 58 60 +2
Continue to review full report at Codecov.
|
Signed-off-by: Pavol Loffay <ploffay@redhat.com>
Signed-off-by: Pavol Loffay <ploffay@redhat.com>
Signed-off-by: Pavol Loffay <ploffay@redhat.com>
Signed-off-by: Pavol Loffay <ploffay@redhat.com>
I have submitted PR to proto repository to remove the gradle config and move files to the root directory open-telemetry/opentelemetry-proto#26 |
Signed-off-by: Pavol Loffay <ploffay@redhat.com>
@@ -0,0 +1,3 @@ | |||
[submodule "proto/src/main/proto"] | |||
path = proto/src/main/proto | |||
url = https://github.com/pavolloffay/opentelemetry-proto.git |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@bogdandrutu I have marked this PR as WIP with depends on open-telemetry/opentelemetry-proto#26.
Since this is merged I will create an issue to change to upsream repo once it's ready
Can someone advice on how to do Gradle build locally after this change? I tried error: package io.opentelemetry.proto.trace.v1 does not exist
import io.opentelemetry.proto.trace.v1.Span;
...
30 errors
FAILURE: Build failed with an exception. |
Use make |
Cool that worked. Created #507 to reflect this change in CONTRIBUTING.md. |
Resolves #232
Replaces #483
Depends on open-telemetry/opentelemetry-proto#26, after the merge I will change the GIT URL to point to the upstream.
WIP: because the git submodule is based on my fork of proto repository https://github.com/pavolloffay/opentelemetry-proto
Signed-off-by: Pavol Loffay ploffay@redhat.com