Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
…y-java into updateContributingmd
  • Loading branch information
jack-berg committed Jul 8, 2024
2 parents 6e789a8 + 7b85775 commit a4bc84f
Show file tree
Hide file tree
Showing 63 changed files with 602 additions and 63 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ jobs:
RUN_JMH_BASED_TESTS: ${{ matrix.jmh-based-tests }}

- name: Check for diff
# The jApiCmp diff compares current to latest, which isn't appropriate for release branches
if: ${{ !startsWith(github.ref_name, 'release/') && !startsWith(github.base_ref, 'release/') }}
# The jApiCmp diff compares current to latest, which isn't appropriate for release branches, or for bot-generated PRs
if: ${{ !startsWith(github.ref_name, 'release/') && !startsWith(github.base_ref, 'release/') && (github.actor != 'opentelemetrybot') }}
run: |
# need to "git add" in case any generated files did not already exist
git add docs/apidiffs
Expand Down
70 changes: 35 additions & 35 deletions README.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ dependencies {
implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.0.1")
implementation("net.ltgt.gradle:gradle-nullaway-plugin:2.0.0")
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0")
implementation("org.owasp:dependency-check-gradle:9.2.0")
implementation("org.owasp:dependency-check-gradle:10.0.2")
implementation("ru.vyarus:gradle-animalsniffer-plugin:1.7.1")
}

Expand Down
2 changes: 1 addition & 1 deletion dependencyManagement/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ val DEPENDENCIES = listOf(
"nl.jqno.equalsverifier:equalsverifier:3.16.1",
"org.awaitility:awaitility:4.2.1",
"org.bouncycastle:bcpkix-jdk15on:1.70",
"org.codehaus.mojo:animal-sniffer-annotations:1.23",
"org.codehaus.mojo:animal-sniffer-annotations:1.24",
"org.jctools:jctools-core:4.0.5",
"org.junit-pioneer:junit-pioneer:1.9.1",
"org.mock-server:mockserver-netty:5.15.0:shaded",
Expand Down
2 changes: 2 additions & 0 deletions docs/apidiffs/1.40.0_vs_1.39.0/opentelemetry-api.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Comparing source compatibility of opentelemetry-api-1.40.0.jar against opentelemetry-api-1.39.0.jar
No changes.
2 changes: 2 additions & 0 deletions docs/apidiffs/1.40.0_vs_1.39.0/opentelemetry-context.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Comparing source compatibility of opentelemetry-context-1.40.0.jar against opentelemetry-context-1.39.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Comparing source compatibility of opentelemetry-exporter-common-1.40.0.jar against opentelemetry-exporter-common-1.39.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Comparing source compatibility of opentelemetry-exporter-logging-otlp-1.40.0.jar against opentelemetry-exporter-logging-otlp-1.39.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Comparing source compatibility of opentelemetry-exporter-logging-1.40.0.jar against opentelemetry-exporter-logging-1.39.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Comparing source compatibility of opentelemetry-exporter-otlp-common-1.40.0.jar against opentelemetry-exporter-otlp-common-1.39.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Comparing source compatibility of opentelemetry-exporter-otlp-1.40.0.jar against opentelemetry-exporter-otlp-1.39.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Comparing source compatibility of opentelemetry-exporter-sender-grpc-managed-channel-1.40.0.jar against opentelemetry-exporter-sender-grpc-managed-channel-1.39.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Comparing source compatibility of opentelemetry-exporter-sender-jdk-1.40.0.jar against opentelemetry-exporter-sender-jdk-1.39.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Comparing source compatibility of opentelemetry-exporter-sender-okhttp-1.40.0.jar against opentelemetry-exporter-sender-okhttp-1.39.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Comparing source compatibility of opentelemetry-exporter-zipkin-1.40.0.jar against opentelemetry-exporter-zipkin-1.39.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Comparing source compatibility of opentelemetry-extension-kotlin-1.40.0.jar against opentelemetry-extension-kotlin-1.39.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Comparing source compatibility of opentelemetry-extension-trace-propagators-1.40.0.jar against opentelemetry-extension-trace-propagators-1.39.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Comparing source compatibility of opentelemetry-opentracing-shim-1.40.0.jar against opentelemetry-opentracing-shim-1.39.0.jar
No changes.
2 changes: 2 additions & 0 deletions docs/apidiffs/1.40.0_vs_1.39.0/opentelemetry-sdk-common.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Comparing source compatibility of opentelemetry-sdk-common-1.40.0.jar against opentelemetry-sdk-common-1.39.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Comparing source compatibility of opentelemetry-sdk-extension-autoconfigure-spi-1.40.0.jar against opentelemetry-sdk-extension-autoconfigure-spi-1.39.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Comparing source compatibility of opentelemetry-sdk-extension-autoconfigure-1.40.0.jar against opentelemetry-sdk-extension-autoconfigure-1.39.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Comparing source compatibility of opentelemetry-sdk-extension-jaeger-remote-sampler-1.40.0.jar against opentelemetry-sdk-extension-jaeger-remote-sampler-1.39.0.jar
No changes.
2 changes: 2 additions & 0 deletions docs/apidiffs/1.40.0_vs_1.39.0/opentelemetry-sdk-logs.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Comparing source compatibility of opentelemetry-sdk-logs-1.40.0.jar against opentelemetry-sdk-logs-1.39.0.jar
No changes.
2 changes: 2 additions & 0 deletions docs/apidiffs/1.40.0_vs_1.39.0/opentelemetry-sdk-metrics.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Comparing source compatibility of opentelemetry-sdk-metrics-1.40.0.jar against opentelemetry-sdk-metrics-1.39.0.jar
No changes.
2 changes: 2 additions & 0 deletions docs/apidiffs/1.40.0_vs_1.39.0/opentelemetry-sdk-testing.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Comparing source compatibility of opentelemetry-sdk-testing-1.40.0.jar against opentelemetry-sdk-testing-1.39.0.jar
No changes.
2 changes: 2 additions & 0 deletions docs/apidiffs/1.40.0_vs_1.39.0/opentelemetry-sdk-trace.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Comparing source compatibility of opentelemetry-sdk-trace-1.40.0.jar against opentelemetry-sdk-trace-1.39.0.jar
No changes.
2 changes: 2 additions & 0 deletions docs/apidiffs/1.40.0_vs_1.39.0/opentelemetry-sdk.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Comparing source compatibility of opentelemetry-sdk-1.40.0.jar against opentelemetry-sdk-1.39.0.jar
No changes.
2 changes: 1 addition & 1 deletion docs/apidiffs/current_vs_latest/opentelemetry-api.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Comparing source compatibility of opentelemetry-api-1.41.0-SNAPSHOT.jar against opentelemetry-api-1.39.0.jar
Comparing source compatibility of opentelemetry-api-1.41.0-SNAPSHOT.jar against opentelemetry-api-1.40.0.jar
No changes.
2 changes: 1 addition & 1 deletion docs/apidiffs/current_vs_latest/opentelemetry-context.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Comparing source compatibility of opentelemetry-context-1.41.0-SNAPSHOT.jar against opentelemetry-context-1.39.0.jar
Comparing source compatibility of opentelemetry-context-1.41.0-SNAPSHOT.jar against opentelemetry-context-1.40.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Comparing source compatibility of opentelemetry-exporter-common-1.41.0-SNAPSHOT.jar against opentelemetry-exporter-common-1.39.0.jar
Comparing source compatibility of opentelemetry-exporter-common-1.41.0-SNAPSHOT.jar against opentelemetry-exporter-common-1.40.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Comparing source compatibility of opentelemetry-exporter-logging-otlp-1.41.0-SNAPSHOT.jar against opentelemetry-exporter-logging-otlp-1.39.0.jar
Comparing source compatibility of opentelemetry-exporter-logging-otlp-1.41.0-SNAPSHOT.jar against opentelemetry-exporter-logging-otlp-1.40.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Comparing source compatibility of opentelemetry-exporter-logging-1.41.0-SNAPSHOT.jar against opentelemetry-exporter-logging-1.39.0.jar
Comparing source compatibility of opentelemetry-exporter-logging-1.41.0-SNAPSHOT.jar against opentelemetry-exporter-logging-1.40.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Comparing source compatibility of opentelemetry-exporter-otlp-common-1.41.0-SNAPSHOT.jar against opentelemetry-exporter-otlp-common-1.39.0.jar
Comparing source compatibility of opentelemetry-exporter-otlp-common-1.41.0-SNAPSHOT.jar against opentelemetry-exporter-otlp-common-1.40.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Comparing source compatibility of opentelemetry-exporter-otlp-1.41.0-SNAPSHOT.jar against opentelemetry-exporter-otlp-1.39.0.jar
Comparing source compatibility of opentelemetry-exporter-otlp-1.41.0-SNAPSHOT.jar against opentelemetry-exporter-otlp-1.40.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Comparing source compatibility of opentelemetry-exporter-sender-grpc-managed-channel-1.41.0-SNAPSHOT.jar against opentelemetry-exporter-sender-grpc-managed-channel-1.39.0.jar
Comparing source compatibility of opentelemetry-exporter-sender-grpc-managed-channel-1.41.0-SNAPSHOT.jar against opentelemetry-exporter-sender-grpc-managed-channel-1.40.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Comparing source compatibility of opentelemetry-exporter-sender-jdk-1.41.0-SNAPSHOT.jar against opentelemetry-exporter-sender-jdk-1.39.0.jar
Comparing source compatibility of opentelemetry-exporter-sender-jdk-1.41.0-SNAPSHOT.jar against opentelemetry-exporter-sender-jdk-1.40.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Comparing source compatibility of opentelemetry-exporter-sender-okhttp-1.41.0-SNAPSHOT.jar against opentelemetry-exporter-sender-okhttp-1.39.0.jar
Comparing source compatibility of opentelemetry-exporter-sender-okhttp-1.41.0-SNAPSHOT.jar against opentelemetry-exporter-sender-okhttp-1.40.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Comparing source compatibility of opentelemetry-exporter-zipkin-1.41.0-SNAPSHOT.jar against opentelemetry-exporter-zipkin-1.39.0.jar
Comparing source compatibility of opentelemetry-exporter-zipkin-1.41.0-SNAPSHOT.jar against opentelemetry-exporter-zipkin-1.40.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Comparing source compatibility of opentelemetry-extension-kotlin-1.41.0-SNAPSHOT.jar against opentelemetry-extension-kotlin-1.39.0.jar
Comparing source compatibility of opentelemetry-extension-kotlin-1.41.0-SNAPSHOT.jar against opentelemetry-extension-kotlin-1.40.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Comparing source compatibility of opentelemetry-extension-trace-propagators-1.41.0-SNAPSHOT.jar against opentelemetry-extension-trace-propagators-1.39.0.jar
Comparing source compatibility of opentelemetry-extension-trace-propagators-1.41.0-SNAPSHOT.jar against opentelemetry-extension-trace-propagators-1.40.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Comparing source compatibility of opentelemetry-opentracing-shim-1.41.0-SNAPSHOT.jar against opentelemetry-opentracing-shim-1.39.0.jar
Comparing source compatibility of opentelemetry-opentracing-shim-1.41.0-SNAPSHOT.jar against opentelemetry-opentracing-shim-1.40.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Comparing source compatibility of opentelemetry-sdk-common-1.41.0-SNAPSHOT.jar against opentelemetry-sdk-common-1.39.0.jar
Comparing source compatibility of opentelemetry-sdk-common-1.41.0-SNAPSHOT.jar against opentelemetry-sdk-common-1.40.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Comparing source compatibility of opentelemetry-sdk-extension-autoconfigure-spi-1.41.0-SNAPSHOT.jar against opentelemetry-sdk-extension-autoconfigure-spi-1.39.0.jar
Comparing source compatibility of opentelemetry-sdk-extension-autoconfigure-spi-1.41.0-SNAPSHOT.jar against opentelemetry-sdk-extension-autoconfigure-spi-1.40.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Comparing source compatibility of opentelemetry-sdk-extension-autoconfigure-1.41.0-SNAPSHOT.jar against opentelemetry-sdk-extension-autoconfigure-1.39.0.jar
Comparing source compatibility of opentelemetry-sdk-extension-autoconfigure-1.41.0-SNAPSHOT.jar against opentelemetry-sdk-extension-autoconfigure-1.40.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Comparing source compatibility of opentelemetry-sdk-extension-jaeger-remote-sampler-1.41.0-SNAPSHOT.jar against opentelemetry-sdk-extension-jaeger-remote-sampler-1.39.0.jar
Comparing source compatibility of opentelemetry-sdk-extension-jaeger-remote-sampler-1.41.0-SNAPSHOT.jar against opentelemetry-sdk-extension-jaeger-remote-sampler-1.40.0.jar
No changes.
2 changes: 1 addition & 1 deletion docs/apidiffs/current_vs_latest/opentelemetry-sdk-logs.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Comparing source compatibility of opentelemetry-sdk-logs-1.41.0-SNAPSHOT.jar against opentelemetry-sdk-logs-1.39.0.jar
Comparing source compatibility of opentelemetry-sdk-logs-1.41.0-SNAPSHOT.jar against opentelemetry-sdk-logs-1.40.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Comparing source compatibility of opentelemetry-sdk-metrics-1.41.0-SNAPSHOT.jar against opentelemetry-sdk-metrics-1.39.0.jar
Comparing source compatibility of opentelemetry-sdk-metrics-1.41.0-SNAPSHOT.jar against opentelemetry-sdk-metrics-1.40.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Comparing source compatibility of opentelemetry-sdk-testing-1.41.0-SNAPSHOT.jar against opentelemetry-sdk-testing-1.39.0.jar
Comparing source compatibility of opentelemetry-sdk-testing-1.41.0-SNAPSHOT.jar against opentelemetry-sdk-testing-1.40.0.jar
No changes.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Comparing source compatibility of opentelemetry-sdk-trace-1.41.0-SNAPSHOT.jar against opentelemetry-sdk-trace-1.39.0.jar
Comparing source compatibility of opentelemetry-sdk-trace-1.41.0-SNAPSHOT.jar against opentelemetry-sdk-trace-1.40.0.jar
No changes.
2 changes: 1 addition & 1 deletion docs/apidiffs/current_vs_latest/opentelemetry-sdk.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Comparing source compatibility of opentelemetry-sdk-1.41.0-SNAPSHOT.jar against opentelemetry-sdk-1.39.0.jar
Comparing source compatibility of opentelemetry-sdk-1.41.0-SNAPSHOT.jar against opentelemetry-sdk-1.40.0.jar
No changes.
2 changes: 2 additions & 0 deletions exporters/otlp/profiles/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,6 @@ otelJava.moduleName.set("io.opentelemetry.exporter.otlp.profiles")

dependencies {
api(project(":sdk:common"))

annotationProcessor("com.google.auto.value:auto-value")
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.exporter.otlp.internal.data;

import com.google.auto.value.AutoValue;
import io.opentelemetry.exporter.otlp.profiles.AttributeUnitData;
import javax.annotation.concurrent.Immutable;

/**
* Auto value implementation of {@link AttributeUnitData}, which represents a mapping between
* Attribute Keys and Units.
*
* <p>This class is internal and is hence not for public use. Its APIs are unstable and can change
* at any time.
*/
@Immutable
@AutoValue
public abstract class ImmutableAttributeUnitData implements AttributeUnitData {

/**
* Returns a new AttributeUnitData mapping the given key to the given unit.
*
* @return a new AttributeUnitData mapping the given key to the given unit.
*/
public static AttributeUnitData create(long attributeKey, long unitIndex) {
return new AutoValue_ImmutableAttributeUnitData(attributeKey, unitIndex);
}

ImmutableAttributeUnitData() {}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.exporter.otlp.internal.data;

import com.google.auto.value.AutoValue;
import io.opentelemetry.exporter.otlp.profiles.FunctionData;
import javax.annotation.concurrent.Immutable;

/**
* Auto value implementation of {@link FunctionData}, which describes a code function.
*
* <p>This class is internal and is hence not for public use. Its APIs are unstable and can change
* at any time.
*/
@Immutable
@AutoValue
public abstract class ImmutableFunctionData implements FunctionData {

/**
* Returns a new FunctionData describing the given function characteristics.
*
* @return a new FunctionData describing the given function characteristics.
*/
public static FunctionData create(
long nameIndex, long systemNameIndex, long filenameIndex, long startLine) {
return new AutoValue_ImmutableFunctionData(
nameIndex, systemNameIndex, filenameIndex, startLine);
}

ImmutableFunctionData() {}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.exporter.otlp.internal.data;

import com.google.auto.value.AutoValue;
import io.opentelemetry.exporter.otlp.profiles.LabelData;
import javax.annotation.concurrent.Immutable;

/**
* Auto value implementation of {@link LabelData}, which provides additional context for a sample.
*
* <p>This class is internal and is hence not for public use. Its APIs are unstable and can change
* at any time.
*/
@Immutable
@AutoValue
public abstract class ImmutableLabelData implements LabelData {

/**
* Returns a new LabelData describing the given context for a sample.
*
* @return a new LabelData describing the given context for a sample.
*/
public static LabelData create(long keyIndex, long strIndex, long num, long numUnitIndex) {
return new AutoValue_ImmutableLabelData(keyIndex, strIndex, num, numUnitIndex);
}

ImmutableLabelData() {}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/*
* Copyright The OpenTelemetry Authors
* SPDX-License-Identifier: Apache-2.0
*/

package io.opentelemetry.exporter.otlp.internal.data;

import com.google.auto.value.AutoValue;
import io.opentelemetry.exporter.otlp.profiles.LineData;
import javax.annotation.concurrent.Immutable;

/**
* Auto value implementation of {@link LineData}, which details a specific line in a source code,
* linked to a function.
*
* <p>This class is internal and is hence not for public use. Its APIs are unstable and can change
* at any time.
*/
@Immutable
@AutoValue
public abstract class ImmutableLineData implements LineData {

/**
* Returns a new LineData describing the given details a specific line in a source code.
*
* @return a new LineData describing the given details a specific line in a source code.
*/
public static LineData create(long functionIndex, long line, long column) {
return new AutoValue_ImmutableLineData(functionIndex, line, column);
}

ImmutableLineData() {}
}
Loading

0 comments on commit a4bc84f

Please sign in to comment.