Skip to content

Commit 06b71b0

Browse files
authored
Tries to hone OSGi imports according to use (#1252)
It is my understanding that unless we shade something, we have to add internal import for the few utilities we use. Fixes #1248
1 parent 9286efa commit 06b71b0

File tree

21 files changed

+39
-30
lines changed

21 files changed

+39
-30
lines changed

brave-bom/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
<!-- use the same values in ../pom.xml -->
3737
<zipkin.version>2.21.7</zipkin.version>
38-
<zipkin-reporter.version>2.15.1</zipkin-reporter.version>
38+
<zipkin-reporter.version>2.15.2</zipkin-reporter.version>
3939
</properties>
4040

4141
<organization>

context/jfr/bnd.bnd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# We use brave.internal.Nullable, but nothing else internal.
1+
# We use brave.internal.Nullable, but it is not used at runtime.
22
Import-Package: \
33
!brave.internal*,\
44
*

context/log4j12/bnd.bnd

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
# We use brave.internal.Nullable and brave.internal.CorrelationContext
1+
# We use need to import to support brave.internal.CorrelationContext
2+
# brave.internal.Nullable is not used at runtime.
23
Import-Package: \
3-
!brave.internal*,\
4+
brave.internal;braveinternal=true,\
45
*
56
Export-Package: \
67
brave.context.log4j12

context/log4j2/bnd.bnd

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
# We use brave.internal.Nullable and brave.internal.CorrelationContext
1+
# We use need to import to support brave.internal.CorrelationContext
2+
# brave.internal.Nullable is not used at runtime.
23
Import-Package: \
3-
!brave.internal*,\
4+
brave.internal;braveinternal=true,\
45
*
56
Export-Package: \
67
brave.context.log4j2

context/slf4j/bnd.bnd

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
# We use brave.internal.Nullable and brave.internal.CorrelationContext
1+
# We use need to import to support brave.internal.CorrelationContext
2+
# brave.internal.Nullable is not used at runtime.
23
Import-Package: \
3-
!brave.internal*,\
4+
brave.internal;braveinternal=true,\
45
*
56
Export-Package: \
67
brave.context.slf4j

instrumentation/dubbo-rpc/bnd.bnd

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
# We use brave.internal.Nullable and brave.internal.Platform
1+
# We use need to import to support brave.internal.Platform
2+
# brave.internal.Nullable is not used at runtime.
23
Import-Package: \
3-
!brave.internal*,\
4+
brave.internal;braveinternal=true,\
45
*
56
Export-Package: \
67
brave.dubbo.rpc

instrumentation/dubbo/bnd.bnd

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
# We use brave.internal.Nullable and brave.internal.Platform
1+
# We use need to import to support brave.internal.Platform
2+
# brave.internal.Nullable is not used at runtime.
23
Import-Package: \
3-
!brave.internal*,\
4+
brave.internal;braveinternal=true,\
45
*
56
Export-Package: \
67
brave.dubbo

instrumentation/grpc/bnd.bnd

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
# We use brave.internal.Nullable,Platform,MapPropagationFields,PropagationFieldsFactory
1+
# We use need to import to support brave.internal.Platform,MapPropagationFields,PropagationFieldsFactory
2+
# brave.internal.Nullable is not used at runtime.
23
Import-Package: \
3-
!brave.internal*,\
4+
brave.internal;braveinternal=true,\
45
*
56
Export-Package: \
67
brave.grpc

instrumentation/http/bnd.bnd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# We use brave.internal.Nullable, but nothing else internal.
1+
# We use brave.internal.Nullable, but it is not used at runtime.
22
Import-Package: \
33
!brave.internal*,\
44
*

instrumentation/httpasyncclient/bnd.bnd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# We use brave.internal.Nullable, but nothing else internal.
1+
# We use brave.internal.Nullable, but it is not used at runtime.
22
Import-Package: \
33
!brave.internal*,\
44
*

0 commit comments

Comments
 (0)