Skip to content

Commit

Permalink
rel: prep release v1.5.2 (#433)
Browse files Browse the repository at this point in the history
## Which problem is this PR solving?

- release prep for v1.5.2

## Short description of the changes

- update releasing doc for how to find proto version in otel java, and
how to update in tests
- update version in root build.gradle to 1.5.2
- update otel version to 1.27.0 and proto version to 0.20.0 in
distrometadata
- update changelog for v1.5.2
- update readme with otel versions 1.27.0
- update test with new proto version

A docs PR has been prepped with the new release version, to be merged
once this release is out.
  • Loading branch information
JamieDanielson authored Jun 21, 2023
1 parent 254a38b commit f93f485
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 12 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# honeycomb-opentelemetry-java changelog

## [1.5.2] - 2023-06-21

### Maintenance

- maint(deps): bump versions.opentelemetry from 1.26.0 to 1.27.0 (#428)
- maint(deps): bump versions.opentelemetryJavaagent from 1.26.0 to 1.27.0 (#431)
- maint(deps): bump org.junit.jupiter:junit-jupiter-api from 5.9.2 to 5.9.3 (#429)
- maint(deps): bump io.grpc:grpc-netty-shaded from 1.55.1 to 1.56.0 (#430)
- maint: update licenses for new otel-java versions (#432)| [@JamieDanielson](https://github.com/JamieDanielson)

## [1.5.1] - 2023-06-06

### Maintenance
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ It makes getting started with OpenTelemetry and Honeycomb easier!

Latest release built with:

- [OpenTelemetry](https://github.com/open-telemetry/opentelemetry-java/releases/tag/v1.26.0) version 1.26.0
- [OpenTelemetry Java Agent](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v1.27.0) version 1.26.0
- [OpenTelemetry v1.27.0](https://github.com/open-telemetry/opentelemetry-java/releases/tag/v1.27.0)
- [OpenTelemetry Java Agent v1.27.0](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v1.27.0)

## Getting Started

Expand Down
7 changes: 5 additions & 2 deletions RELEASING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@

1. Prep public docs PR with the new version in data file `/honeycomb-opentelemetry-java/release.json`

1. Run `./gradlew generateLicenseReport` to ensure all project dependency licenses are correclty represented in this repository. If there are any changes, submit PR to update licenses.
1. Run `./gradlew generateLicenseReport` to ensure all project dependency licenses are correctly represented in this repository. If there are any changes, submit PR to update licenses.

1. Update the `project.version` in the root build.gradle file with the new release version. Snapshot version is one patch bump ahead of the new release (e.g. if we're releasing `1.0.0` then the corresponding snapshot would be `1.0.1`)

1. Update the version in `DistroMetadata.java` with the new release version
- When updating the OTel Agent/SDK version, update the OTLP version header in `DistroMetadata.java`
- When updating the OTel Agent/SDK version, update the OTLP version header as needed in `DistroMetadata.java`
- This can be found in upstream repo `/dependencyManagement/build.gradle.kts`

1. If OTLP proto version changes in previous step, update tests in `EnvironmentConfigurationTest.java`

1. Update the Changelog

Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ allprojects {
def tag = System.getenv("CIRCLE_TAG")
if (tag != null && tag.startsWith("v")) {
// circle tag means we're publishing a release version
project.version = "1.5.1"
project.version = "1.5.2"
} else {
project.version = "1.5.2-SNAPSHOT"
project.version = "1.5.3-SNAPSHOT"
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ public class DistroMetadata {
* with the version number and read it, but that isn't possible from the
* Java agent.
*/
public static final String VERSION_VALUE = "1.5.1";
public static final String VERSION_VALUE = "1.5.2";
public static final String VARIANT_FIELD = "honeycomb.distro.variant";
public static final String VARIANT_AGENT = "agent";
public static final String VARIANT_SDK = "sdk";
public static final String RUNTIME_VERSION_FIELD = "honeycomb.distro.runtime_version";
public static final String RUNTIME_VERSION_VALUE = System.getProperty("java.runtime.version");

public static final String OTLP_PROTO_VERSION_HEADER = "x-otlp-version";
public static final String OTLP_PROTO_VERSION_VALUE = "0.19.0";
public static final String OTLP_PROTO_VERSION_VALUE = "0.20.0";

/**
* Get Metadata as a map of strings to strings.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ public void test_enableOtlpTraces_sets_system_properties_for_legacy_key() {

EnvironmentConfiguration.enableOTLPTraces();
Assertions.assertEquals("https://api.honeycomb.io:443", System.getProperty("otel.exporter.otlp.traces.endpoint"));
Assertions.assertEquals("x-otlp-version=0.19.0,X-Honeycomb-Team=11111111111111111111111111111111,X-Honeycomb-Dataset=my-dataset", System.getProperty("otel.exporter.otlp.traces.headers"));
Assertions.assertEquals("x-otlp-version=0.20.0,X-Honeycomb-Team=11111111111111111111111111111111,X-Honeycomb-Dataset=my-dataset", System.getProperty("otel.exporter.otlp.traces.headers"));
}

@Test
Expand All @@ -154,7 +154,7 @@ public void test_enableOtlpTraces_sets_system_properties_for_non_legacy_key() {

EnvironmentConfiguration.enableOTLPTraces();
Assertions.assertEquals("https://api.honeycomb.io:443", System.getProperty("otel.exporter.otlp.traces.endpoint"));
Assertions.assertEquals("x-otlp-version=0.19.0,X-Honeycomb-Team=specialenvkey", System.getProperty("otel.exporter.otlp.traces.headers"));
Assertions.assertEquals("x-otlp-version=0.20.0,X-Honeycomb-Team=specialenvkey", System.getProperty("otel.exporter.otlp.traces.headers"));
}

@Test
Expand All @@ -165,7 +165,7 @@ public void test_enableOtlpMetrics_sets_system_properties() {
EnvironmentConfiguration.enableOTLPMetrics();
Assertions.assertEquals("otlp", System.getProperty("otel.metrics.exporter"));
Assertions.assertEquals("https://api.honeycomb.io:443", System.getProperty("otel.exporter.otlp.metrics.endpoint"));
Assertions.assertEquals("x-otlp-version=0.19.0,X-Honeycomb-Team=my-key,X-Honeycomb-Dataset=my-dataset", System.getProperty("otel.exporter.otlp.metrics.headers"));
Assertions.assertEquals("x-otlp-version=0.20.0,X-Honeycomb-Team=my-key,X-Honeycomb-Dataset=my-dataset", System.getProperty("otel.exporter.otlp.metrics.headers"));
}

// make sure OtlpTraces logic doesn't bleed into metrics; dataset still needed
Expand All @@ -177,7 +177,7 @@ public void test_enableOtlpMetrics_sets_system_properties_for_legacy_key() {
EnvironmentConfiguration.enableOTLPMetrics();
Assertions.assertEquals("otlp", System.getProperty("otel.metrics.exporter"));
Assertions.assertEquals("https://api.honeycomb.io:443", System.getProperty("otel.exporter.otlp.metrics.endpoint"));
Assertions.assertEquals("x-otlp-version=0.19.0,X-Honeycomb-Team=11111111111111111111111111111111,X-Honeycomb-Dataset=my-dataset", System.getProperty("otel.exporter.otlp.metrics.headers"));
Assertions.assertEquals("x-otlp-version=0.20.0,X-Honeycomb-Team=11111111111111111111111111111111,X-Honeycomb-Dataset=my-dataset", System.getProperty("otel.exporter.otlp.metrics.headers"));
}

@Test
Expand Down

0 comments on commit f93f485

Please sign in to comment.