Skip to content
This repository has been archived by the owner on Sep 4, 2022. It is now read-only.

Commit

Permalink
Merge pull request #9 from cisco-open/refactor-javaagent
Browse files Browse the repository at this point in the history
refactoed javaagent
  • Loading branch information
osherv committed May 11, 2022
2 parents 1be7385 + 183f0d0 commit 1bdcd80
Show file tree
Hide file tree
Showing 83 changed files with 926 additions and 4,222 deletions.
58 changes: 0 additions & 58 deletions .github/workflows/bors.yml

This file was deleted.

25 changes: 25 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: CI

on:
pull_request:
branches:
- main
push:
branches:
- main
jobs:
build-and-test:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2.3.4
with:
fetch-depth: 0

- name: Set up JDK 11 for running Gradle
uses: actions/setup-java@v2
with:
distribution: adopt
java-version: 11.0.11+9

- name: Build and test
run: ./gradlew build -x :smoke-tests:test --no-daemon
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -131,4 +131,4 @@ gradle-app.setting
!gradle-wrapper.jar

# Cache of project
.gradletasknamecache
.gradletasknamecache
2 changes: 0 additions & 2 deletions CODEOWNERS

This file was deleted.

27 changes: 20 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# otel-java

<p align="center">
<img alt="Stable" src="https://img.shields.io/badge/status-stable-informational?style=for-the-badge">
<a href="https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v1.13.0">
<img alt="OpenTelemetry Instrumentation for Java Version" src="https://img.shields.io/badge/otel-1.13.0-blueviolet?style=for-the-badge">
</a>
<a href="https://github.com/cisco-open/otel-java/actions/workflows/ci.yml">
<img alt="Build Status" src="https://img.shields.io/github/workflow/status/cisco-open/otel-java/Build?style=for-the-badge">
</a>
<a href="https://github.com/cisco-open/otel-java/releases">
<img alt="GitHub release (latest by date including)" src="https://img.shields.io/github/v/release/cisco-open/otel-java?style=for-the-badge">
</a>
</p>

![Trace](trace.png)

This package provides OpenTelemetry-compliant tracing to Java
Expand All @@ -25,7 +38,7 @@ applications for the collection of distributed tracing and performance metrics i

### Download the javaagent

Download the [latest version](https://cisco-java-sdk.s3.amazonaws.com/cisco-agent-1.0.0-all.jar)
Download the [latest version](https://github.com/cisco-open/otel-java/releases/download/latest/cisco-telescope-javaagent.jar)


### Library initialization
Expand Down Expand Up @@ -72,9 +85,9 @@ collector.yaml ...

exporters:
otlphttp:
traces_endpoint: https://production.cisco-udp.com/trace-collector:80
traces_endpoint: https://production.cisco-udp.com/trace-collector
headers:
authorization: <Your Telescope Token>
authorization: Bearer <Your Telescope Token>
compression: gzip


Expand All @@ -91,10 +104,10 @@ service:

```shell
export OTEL_TRACES_EXPORTER=otlp-http
export OTEL_EXPORTER_OTLP_PROTOCOL=http/protobuf
export OTEL_METRICS_EXPORTER=none
export OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=https://production.cisco-udp.com/trace-collector:80
export OTEL_EXPORTER_OTLP_TRACES_HEADERS=authorization='<Your Telescope Token>'
export OTEL_EXPORTER_OTLP_TRACES_ENDPOINT=https://production.cisco-udp.com/trace-collector
export OTEL_EXPORTER_OTLP_HEADERS="authorization=Bearer <Your Telescope Token>"

java -javaagent:./opentelemetry_javaagent.jar \
-jar <myapp>.jar
Expand Down Expand Up @@ -129,7 +142,7 @@ Open Telemetry defaults:
|OTEL_METRICS_EXPORTER | otel.metrics.exporter | None | By default, metrics are currently not supported|
|OTEL_INSTRUMENTATION_RUNTIME-METRICS_ENABLED | otel.instrumentation.runtime-metrics.enabled | None | By default, metrics are currently not supported|
|OTEL_TRACES_EXPORTER | otel.traces.exporter | otlp-http | Otlp over HTTP exporter|
|OTEL_EXPORTER_OTLP_ENDPOINT | otel.exporter.otlp.endpoint | https://production.cisco-udp.com/trace-collector:80 | The Cisco Otlp-gRPC collector URL path|
|OTEL_EXPORTER_OTLP_ENDPOINT | otel.exporter.otlp.endpoint | https://production.cisco-udp.com/trace-collector | The Cisco Otlp-gRPC collector URL path|

## Getting Help

Expand Down
17 changes: 0 additions & 17 deletions agent-core/build.gradle.kts

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 1bdcd80

Please sign in to comment.